[arch-commits] Commit in libgweather/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, March 30, 2022 @ 20:27:13
  Author: heftig
Revision: 441016

archrelease: copy trunk to extra-x86_64

Added:
  libgweather/repos/extra-x86_64/PKGBUILD
    (from rev 441014, libgweather/trunk/PKGBUILD)
  libgweather/repos/extra-x86_64/disable-metar-test.diff
    (from rev 441014, libgweather/trunk/disable-metar-test.diff)
Deleted:
  libgweather/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   90 ++++++++++++++++++++++++++--------------------
 disable-metar-test.diff |   12 ++++++
 2 files changed, 63 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-30 20:27:13 UTC (rev 441015)
+++ PKGBUILD	2022-03-30 20:27:13 UTC (rev 441016)
@@ -1,39 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libgweather
-pkgver=40.0+r87+g80e5a652
-pkgrel=1
-pkgdesc="Location and timezone database and weather-lookup library"
-url="https://wiki.gnome.org/Projects/LibGWeather"
-arch=(x86_64)
-license=(LGPL)
-depends=(libsoup gtk3 geocode-glib dconf)
-makedepends=(gobject-introspection vala git gtk-doc glade meson python-gobject)
-provides=(libgweather-3.so)
-_commit=80e5a652405a7c492b252c5196460caa0b05793d  # libgweather-3
-source=("git+https://gitlab.gnome.org/GNOME/libgweather.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/\.beta/beta/;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  arch-meson $pkgname build -D gtk_doc=true
-  meson compile -C build
-}
-
-check() {
-  # Test fails without fr_FR.UTF-8 locale
-  meson test -C build --print-errorlogs || :
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}

Copied: libgweather/repos/extra-x86_64/PKGBUILD (from rev 441014, libgweather/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-30 20:27:13 UTC (rev 441016)
@@ -0,0 +1,51 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libgweather
+pkgver=40.0+r87+g80e5a652
+pkgrel=2
+pkgdesc="Location and timezone database and weather-lookup library"
+url="https://wiki.gnome.org/Projects/LibGWeather"
+arch=(x86_64)
+license=(LGPL)
+depends=(libsoup gtk3 geocode-glib dconf)
+makedepends=(gobject-introspection vala git gtk-doc glade meson python-gobject)
+checkdepends=(python-pylint)
+options=(debug)
+_commit=80e5a652405a7c492b252c5196460caa0b05793d  # libgweather-3
+source=("git+https://gitlab.gnome.org/GNOME/libgweather.git#commit=$_commit"
+        disable-metar-test.diff)
+sha256sums=('SKIP'
+            'f64afeebdca41198e16a040379e2d6f02ef07784d5ef4d15df381d2c065f588a')
+
+pkgver() {
+  cd libgweather
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd libgweather
+
+  # Avoid test failure without fr_FR.UTF-8 locale
+  git cherry-pick -n 237addd5c02f70c654b69f6697c502590594ae20
+
+  # Disable metar test, depends on unstable online service
+  git apply -3 ../disable-metar-test.diff
+}
+
+build() {
+  arch-meson libgweather build -D gtk_doc=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  provides=(libgweather-3.so)
+
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et:

Copied: libgweather/repos/extra-x86_64/disable-metar-test.diff (from rev 441014, libgweather/trunk/disable-metar-test.diff)
===================================================================
--- disable-metar-test.diff	                        (rev 0)
+++ disable-metar-test.diff	2022-03-30 20:27:13 UTC (rev 441016)
@@ -0,0 +1,12 @@
+diff --git i/libgweather/test_libgweather.c w/libgweather/test_libgweather.c
+index b10c1f16..d09aaed6 100644
+--- i/libgweather/test_libgweather.c
++++ w/libgweather/test_libgweather.c
+@@ -899,7 +899,6 @@ main (int argc, char *argv[])
+ 	g_test_add_func ("/weather/no-code-serialize", test_no_code_serialize);
+ 	g_test_add_func ("/weather/timezones", test_timezones);
+ 	g_test_add_func ("/weather/airport_distance_sanity", test_airport_distance_sanity);
+-	g_test_add_func ("/weather/metar_weather_stations", test_metar_weather_stations);
+ 	g_test_add_func ("/weather/utc_sunset", test_utc_sunset);
+ 	g_test_add_func ("/weather/weather-loop-use-after-free", test_weather_loop_use_after_free);
+ 	/* Modifies environment, so needs to run last */