From 04f2dd0b4dc86782ceee2cdd5de5990738251708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 16 Oct 2019 14:35:23 +0200 Subject: [PATCH] libgweather: update to 3.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- common/shlibs | 2 +- .../patches/conditionalize-gir.patch | 130 ------------------ srcpkgs/libgweather/template | 4 +- 3 files changed, 3 insertions(+), 133 deletions(-) delete mode 100644 srcpkgs/libgweather/patches/conditionalize-gir.patch diff --git a/common/shlibs b/common/shlibs index d86c0dc96db..30354e9542c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1177,7 +1177,7 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.17 gnome-desktop-3.28.0_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.15 libgweather-3.28.0_1 +libgweather-3.so.16 libgweather-3.34.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 diff --git a/srcpkgs/libgweather/patches/conditionalize-gir.patch b/srcpkgs/libgweather/patches/conditionalize-gir.patch deleted file mode 100644 index 2d134bf88f6..00000000000 --- a/srcpkgs/libgweather/patches/conditionalize-gir.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git libgweather/meson.build libgweather/meson.build -index 301e7e8..7da6a4e 100644 ---- libgweather/meson.build -+++ libgweather/meson.build -@@ -65,29 +65,31 @@ lib_libgweather = shared_library('gweather-3', - install: true, - ) - --gweather_gir = gnome.generate_gir(lib_libgweather, -- sources: introspection_sources, -- dependencies: deps_libgweather, -- nsversion: '3.0', -- namespace: 'GWeather', -- includes: ['GObject-2.0', 'Gtk-3.0'], -- symbol_prefix: 'gweather', -- identifier_prefix: 'GWeather', -- export_packages: 'gweather-3.0', -- header: 'libgweather/gweather.h', -- extra_args: [ -- '--warn-all', -- '-DGWEATHER_COMPILATION', -- ], -- install: true, --) -+if get_option('introspection') -+ gweather_gir = gnome.generate_gir(lib_libgweather, -+ sources: introspection_sources, -+ dependencies: deps_libgweather, -+ nsversion: '3.0', -+ namespace: 'GWeather', -+ includes: ['GObject-2.0', 'Gtk-3.0'], -+ symbol_prefix: 'gweather', -+ identifier_prefix: 'GWeather', -+ export_packages: 'gweather-3.0', -+ header: 'libgweather/gweather.h', -+ extra_args: [ -+ '--warn-all', -+ '-DGWEATHER_COMPILATION', -+ ], -+ install: true, -+ ) - --libgweather_dep = declare_dependency( -- sources: [gweather_enum_types[1], gweather_gir], -- dependencies: deps_libgweather, -- link_with: lib_libgweather, -- include_directories: root_inc, --) -+ libgweather_dep = declare_dependency( -+ sources: [gweather_enum_types[1], gweather_gir], -+ dependencies: deps_libgweather, -+ link_with: lib_libgweather, -+ include_directories: root_inc, -+ ) -+endif - - if enable_vala - gnome.generate_vapi('gweather-3.0', -@@ -102,31 +104,33 @@ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()), - '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()), - '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())] - --executable('test_locations', -- ['test_locations.c'], -- c_args: test_cargs, -- dependencies: libgweather_dep, -- install: false) --executable('test_locations_utc', -- ['test_locations_utc.c'], -- c_args: test_cargs, -- dependencies: libgweather_dep, -- install: false) -+if get_option('test') -+ executable('test_locations', -+ ['test_locations.c'], -+ c_args: test_cargs, -+ dependencies: libgweather_dep, -+ install: false) -+ executable('test_locations_utc', -+ ['test_locations_utc.c'], -+ c_args: test_cargs, -+ dependencies: libgweather_dep, -+ install: false) - --exe = executable('test_libgweather', -- ['test_libgweather.c'], -- c_args: test_cargs, -- dependencies: libgweather_dep, -- install: false) --test('test_named_timezones', exe) -+ exe = executable('test_libgweather', -+ ['test_libgweather.c'], -+ c_args: test_cargs, -+ dependencies: libgweather_dep, -+ install: false) -+ test('test_named_timezones', exe) - --executable('test_metar', -- ['test_metar.c', gweather_c_sources], -- c_args: test_cargs, -- dependencies: libgweather_dep, -- install: false) --executable('test_sun_moon', -- ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'], -- c_args: test_cargs, -- dependencies: libgweather_dep, -- install: false) -+ executable('test_metar', -+ ['test_metar.c', gweather_c_sources], -+ c_args: test_cargs, -+ dependencies: libgweather_dep, -+ install: false) -+ executable('test_sun_moon', -+ ['test_sun_moon.c', 'weather-sun.c', 'weather-moon.c'], -+ c_args: test_cargs, -+ dependencies: libgweather_dep, -+ install: false) -+endif -diff --git meson_options.txt meson_options.txt -index 19b2c6a..3025a5f 100644 ---- meson_options.txt -+++ meson_options.txt -@@ -8,3 +8,7 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value - description: 'Install vala bindings') - option('gtk_doc', type: 'boolean', value: false, - description: 'Whether to generate the API reference') -+option('introspection', type: 'boolean', value: false, -+ description: 'Whether to generate gobject introspection data') -+option('test', type: 'boolean', value: false, -+ description: 'Whether to build test executables') diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 25f1cd3aee0..45a4f54e370 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,6 +1,6 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.32.2 +version=3.34.0 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=28ed5ff00d6faf1dc885c4252a538e43ff3f614fcf6a0f20c3b63604295d3c02 +checksum=02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9 build_options="gir vala" build_options_default="gir vala"