From ea06bfd66cd6044cdc96bfeab5ae1d4a3de8a3d6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 30 Jan 2017 00:38:03 -0300 Subject: gnome-weather-3.20.2-2.nonprism1: bump to Arch's revision --- nonprism/gnome-weather/PKGBUILD | 27 +++++++----- nonprism/gnome-weather/nonprism.patch | 82 ++--------------------------------- 2 files changed, 20 insertions(+), 89 deletions(-) diff --git a/nonprism/gnome-weather/PKGBUILD b/nonprism/gnome-weather/PKGBUILD index 498de87a7..946fa8a92 100644 --- a/nonprism/gnome-weather/PKGBUILD +++ b/nonprism/gnome-weather/PKGBUILD @@ -1,34 +1,41 @@ -# $Id: PKGBUILD 273833 2016-08-16 00:34:55Z heftig $ +# $Id: PKGBUILD 287540 2017-01-26 20:52:06Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) # Maintainer: André Silva pkgname=gnome-weather pkgver=3.20.2 -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 pkgdesc="Access current weather conditions and forecasts, without geoclue2 support" url="https://wiki.gnome.org/Apps/Weather" arch=(any) license=(GPL) -depends=(gtk3 gjs libgweather) -makedepends=(intltool gobject-introspection) +depends=(gtk3 gjs libgweather gnome-desktop) +makedepends=(intltool gobject-introspection autoconf-archive appstream-glib git) groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz +_commit=dc0de147404ca887471990c54f6cd94afe27dcd2 # tags/3.20.2^0 +source=("git+https://git.gnome.org/browse/gnome-weather#commit=$_commit" nonprism.patch) -sha256sums=('7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b' - 'ab22a9be5d7a3b1dcaf0fb91febc9f60dfaf1f2c1abfde309da5aa15de6580e8') +sha256sums=('SKIP' + '310d0d1b61e4d791abe6670418ae53d10595f0e7a772d3e73ab59a454385d8be') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} prepare() { - cd $pkgname-$pkgver + cd $pkgname patch -p1 -i $srcdir/nonprism.patch + NOCONFIGURE=1 ./autogen.sh } build() { - cd $pkgname-$pkgver + cd $pkgname ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install } diff --git a/nonprism/gnome-weather/nonprism.patch b/nonprism/gnome-weather/nonprism.patch index ec4e39001..3b4c4cfac 100644 --- a/nonprism/gnome-weather/nonprism.patch +++ b/nonprism/gnome-weather/nonprism.patch @@ -1,81 +1,5 @@ -diff --git a/configure b/configure -index 9fd3c40..1baa86e 100755 ---- a/configure -+++ b/configure -@@ -3720,7 +3720,6 @@ if test -n "$DEPS_CFLAGS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= \$GJS_MIN_VERSION - gweather-3.0 >= 3.17.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gdk-3.0 -@@ -3729,7 +3728,6 @@ if test -n "$DEPS_CFLAGS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2") 2>&5 - ac_status=$? -@@ -3741,7 +3739,6 @@ if test -n "$DEPS_CFLAGS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -@@ -3761,7 +3758,6 @@ if test -n "$DEPS_LIBS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= \$GJS_MIN_VERSION - gweather-3.0 >= 3.17.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gdk-3.0 -@@ -3770,7 +3766,6 @@ if test -n "$DEPS_LIBS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2") 2>&5 - ac_status=$? -@@ -3782,7 +3777,6 @@ if test -n "$DEPS_LIBS"; then - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -@@ -3811,7 +3805,6 @@ fi - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2" 2>&1` - else -@@ -3821,7 +3814,6 @@ fi - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2" 2>&1` - fi -@@ -3834,7 +3826,6 @@ fi - glib-2.0 - gobject-2.0 - gtk+-3.0 >= 3.11.4 -- libgeoclue-2.0 >= 2.3.1 - gjs-1.0 >= $GJS_MIN_VERSION - gweather-3.0 >= 3.17.2) were not met: - diff --git a/configure.ac b/configure.ac -index f5810bd..d3d20a5 100644 +index f5810bd5d..d3d20a540 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,6 @@ PKG_CHECK_MODULES([DEPS], [gdk-3.0 @@ -87,7 +11,7 @@ index f5810bd..d3d20a5 100644 gweather-3.0 >= 3.17.2]) diff --git a/data/org.gnome.Weather.Application.desktop.in b/data/org.gnome.Weather.Application.desktop.in -index 3cd54ba..9d59b46 100644 +index 3cd54ba2e..9d59b4699 100644 --- a/data/org.gnome.Weather.Application.desktop.in +++ b/data/org.gnome.Weather.Application.desktop.in @@ -8,4 +8,3 @@ DBusActivatable=true @@ -96,7 +20,7 @@ index 3cd54ba..9d59b46 100644 _Keywords=Weather;Forecast; -_X-Geoclue-Reason=Allows weather information to be displayed for your location. diff --git a/src/app/currentLocationController.js b/src/app/currentLocationController.js -index c070598..10b436d 100644 +index c070598b3..10b436d54 100644 --- a/src/app/currentLocationController.js +++ b/src/app/currentLocationController.js @@ -20,16 +20,9 @@ const GLib = imports.gi.GLib; -- cgit v1.2.3