libgweather: update to 3.32.0.

srcpkgs/libgweather/patches/conditionalize-gir.patch

@@ -1,10 +1,8 @@
-Source: maxice8
+diff --git libgweather/meson.build libgweather/meson.build
-Upstream: not upstreamable in this condition, feel free to tidy it up and send it
+index 301e7e8..7da6a4e 100644
-Reason: allows cross-compilation
-
 --- libgweather/meson.build
 +++ libgweather/meson.build
-@@ -65,26 +65,28 @@ lib_libgweather = shared_library('gweather-3',
+@@ -65,29 +65,31 @@ lib_libgweather = shared_library('gweather-3',
    install: true,
  )
  
@@ -18,17 +16,13 @@ Reason: allows cross-compilation
 -  identifier_prefix: 'GWeather',
 -  export_packages: 'gweather-3.0',
 -  header: 'libgweather/gweather.h',
--  extra_args: ['--warn-all'],
+-  extra_args: [
+-    '--warn-all',
+-    '-DGWEATHER_COMPILATION',
+-  ],
 -  install: true,
 -)
--
++if get_option('introspection')
--libgweather_dep = declare_dependency(
--  sources: [gweather_enum_types[1], gweather_gir],
--  dependencies: deps_libgweather,
--  link_with: lib_libgweather,
--  include_directories: root_inc,
--)
-+if get_option('enable_gir')
 +  gweather_gir = gnome.generate_gir(lib_libgweather,
 +    sources: introspection_sources,
 +    dependencies: deps_libgweather,
@@ -39,10 +33,19 @@ Reason: allows cross-compilation
 +    identifier_prefix: 'GWeather',
 +    export_packages: 'gweather-3.0',
 +    header: 'libgweather/gweather.h',
-+    extra_args: ['--warn-all'],
++    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,
@@ -53,9 +56,9 @@ Reason: allows cross-compilation
  
  if enable_vala
    gnome.generate_vapi('gweather-3.0',
-@@ -97,31 +99,33 @@ endif
+@@ -102,31 +104,33 @@ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
- 
+               '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
- test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir())]
+               '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
  
 -executable('test_locations',
 -  ['test_locations.c'],
@@ -67,24 +70,6 @@ Reason: allows cross-compilation
 -  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)
--
--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)
 +if get_option('test')
 +  executable('test_locations',
 +    ['test_locations.c'],
@@ -96,14 +81,30 @@ Reason: allows cross-compilation
 +    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,
@@ -115,13 +116,15 @@ Reason: allows cross-compilation
 +    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('enable_gir', type: 'boolean', value: false,
++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')

srcpkgs/libgweather/patches/fix-gir-cross.patch

@@ -1,17 +0,0 @@
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index c32261e..f7dff20 100644
---- libgweather/meson.build
-+++ libgweather/meson.build
-@@ -76,7 +76,10 @@ if get_option('enable_gir')
-     identifier_prefix: 'GWeather',
-     export_packages: 'gweather-3.0',
-     header: 'libgweather/gweather.h',
--    extra_args: ['--warn-all'],
-+    extra_args: [
-+      '--warn-all',
-+      '-DGWEATHER_COMPILATION',
-+    ],
-     install: true,
-   )
-   
-

srcpkgs/libgweather/template

@@ -1,11 +1,11 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.28.3
+version=3.32.0
-revision=2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_vala=$(vopt_if vala true false)
- -Denable_gir=$(vopt_if gir true false) -Dtest=false
+ -Dintrospection=$(vopt_if gir true false) -Dtest=false
  -Dzoneinfo_dir=/usr/share/zoneinfo"
 hostmakedepends="glib-devel intltool pkg-config $(vopt_if vala vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d30e0111bfc504f3e9609f878c89e26c856907f5732e7c30d3bf9f0a04e6f7
+checksum=de9a2b392a8b27e012ed80bb9c950085692cd8e898c367c092df15f964a91d13
 
 build_options="gir vala"