update to version 3.22.1

2 files changed, 57 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 008213cbe6c0..06be23699251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,45 @@
 pkgbase = gnome-settings-daemon-ubuntu
-	pkgdesc = The GNOME Settings daemon with Ubuntu's patches
-	pkgver = 3.20.1
+	pkgdesc = GNOME Settings Daemon
+	pkgver = 3.22.1
 	pkgrel = 1
-	url = http://www.gnome.org
+	url = https://git.gnome.org/browse/gnome-settings-daemon
 	arch = i686
 	arch = x86_64
 	groups = gnome
 	groups = unity
 	license = GPL
+	makedepends = docbook-xsl
+	makedepends = git
+	makedepends = gnome-common
 	makedepends = intltool
-	makedepends = xf86-input-wacom
 	makedepends = libxslt
-	makedepends = docbook-xsl
-	makedepends = python2
+	makedepends = python
+	makedepends = xf86-input-wacom
 	depends = dconf
+	depends = geoclue2
+	depends = geocode-glib
 	depends = gnome-desktop
 	depends = gsettings-desktop-schemas-ubuntu
+	depends = gtk3-print-backends
 	depends = libcanberra-pulse
+	depends = libgudev
+	depends = libgweather
 	depends = libnotify
+	depends = librsvg
 	depends = libsystemd
 	depends = libwacom
+	depends = nss
 	depends = pulseaudio
 	depends = pulseaudio-alsa
 	depends = upower
-	depends = librsvg
-	depends = libgweather
-	depends = geocode-glib
-	depends = geoclue2
-	depends = nss
-	depends = libgudev
-	provides = gnome-settings-daemon=3.20.1
+	provides = gnome-settings-daemon=3.22.1
 	conflicts = gnome-settings-daemon
-	options = !emptydirs
-	source = http://ftp.gnome.org/pub/gnome/sources/gnome-settings-daemon/3.20/gnome-settings-daemon-3.20.1.tar.xz
-	source = http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-settings-daemon/gnome-settings-daemon_3.20.1-2ubuntu1~ubuntu16.04.1.debian.tar.xz
-	sha512sums = 4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84
-	sha512sums = 8eb04cf39ad83c8ed1a1b5d280021f19fe87723be387d5569f1f85bf882f366c7bf8a42870726d91408b28d3b7b39011797eb06b625650123128936b73bf8eee
+	source = git://git.gnome.org/gnome-settings-daemon#commit=3ee42193f8772b5eb39b0b5a4d175b00abce033d
+	source = git://git.gnome.org/libgnome-volume-control
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_3.22.1-0ubuntu2.debian.tar.xz
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = c1e270e5a1eb89d929d7a5d6b5e538bee3798c64e66ad31b722dd857e80ea288095f6d74867c64708366e151a64ed1607c2584d75c578491cafcc1bf6c170e28
 
 pkgname = gnome-settings-daemon-ubuntu
 
diff --git a/PKGBUILD b/PKGBUILD
index 53687d9f45c4..df919ba365e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,36 @@
+# Maintainer: Michael Healy <horsemanoffaith@gmail.com>
 # Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 # Original Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: thn81 <root@scrat>
 
 # vercheck-pkgbuild: auto
-# vercheck-ubuntu: name=${pkgname%-*}, repo=xenial
+# vercheck-ubuntu: name=${pkgname%-*}, repo=yakkety
 # vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64
-# vercheck-gnome: name=${pkgname%-*}, majorver=3.20
+# vercheck-gnome: name=${pkgname%-*}, majorver=3.22
 # vercheck-ppa: name=${pkgname%-*}, url=ppa:gnome3-team/gnome3-staging
 
 pkgname=gnome-settings-daemon-ubuntu
-_use_ppa=true
-_ppa_rel=2ubuntu1~ubuntu16.04.1
-_ppa_ver=3.20.1
-#_ubuntu_rel=0ubuntu3.1
-#_ubuntu_ver=3.18.2
-pkgver=3.20.1
+_use_ppa=false
+#_ppa_rel=2ubuntu1~ubuntu16.04.1
+#_ppa_ver=3.20.1
+_ubuntu_rel=0ubuntu2
+#_ubuntu_ver=3.22.1
+pkgver=3.22.1
 pkgrel=1
-pkgdesc="The GNOME Settings daemon with Ubuntu's patches"
+pkgdesc="GNOME Settings Daemon"
+url="https://git.gnome.org/browse/gnome-settings-daemon"
 arch=(i686 x86_64)
-url="http://www.gnome.org"
 license=(GPL)
-depends=(dconf gnome-desktop gsettings-desktop-schemas-ubuntu libcanberra-pulse
-         libnotify libsystemd libwacom pulseaudio pulseaudio-alsa upower librsvg
-         libgweather geocode-glib geoclue2 nss libgudev)
-makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python2)
+depends=(dconf geoclue2 geocode-glib gnome-desktop gsettings-desktop-schemas-ubuntu
+	gtk3-print-backends libcanberra-pulse libgudev libgweather libnotify librsvg 
+	libsystemd libwacom nss pulseaudio pulseaudio-alsa upower)
+makedepends=(docbook-xsl git gnome-common intltool libxslt python xf86-input-wacom)
 groups=(gnome unity)
 provides=("gnome-settings-daemon=${pkgver}")
 conflicts=(gnome-settings-daemon)
-options=(!emptydirs)
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz"
-)
+_commit=3ee42193f8772b5eb39b0b5a4d175b00abce033d  # tags/GNOME_SETTINGS_DAEMON_3_22_1^0
+source=("git://git.gnome.org/gnome-settings-daemon#commit=${_commit}"
+        "git://git.gnome.org/libgnome-volume-control")
 
 if [[ "${_use_ppa}" == "true" ]]; then
     source+=("http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-settings-daemon/gnome-settings-daemon_${_ppa_ver:-${pkgver}}-${_ppa_rel}.debian.tar.xz")
@@ -37,23 +38,33 @@ else
     source+=("https://launchpad.net/ubuntu/+archive/primary/+files/gnome-settings-daemon_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz")
 fi
 
-sha512sums=('4d8ec7c8d508a0dead00c08ef591c9814bf1c33d0016626c6cd5153bd2aad601ea1146b0e5617465ee276b44d8d622b664817a83e045cece69c2be76c5e33a84'
-            '8eb04cf39ad83c8ed1a1b5d280021f19fe87723be387d5569f1f85bf882f366c7bf8a42870726d91408b28d3b7b39011797eb06b625650123128936b73bf8eee')
+sha512sums=('SKIP'
+            'SKIP'
+            'c1e270e5a1eb89d929d7a5d6b5e538bee3798c64e66ad31b722dd857e80ea288095f6d74867c64708366e151a64ed1607c2584d75c578491cafcc1bf6c170e28')
+
+pkgver() {
+    cd "${pkgname%-*}"
+    git describe --tags | sed 's/^GNOME_SETTINGS_DAEMON_//;s/_/./g;s/-/+/g'
+}
 
 prepare() {
-    cd "${pkgname%-*}-${pkgver}"
+    cd "${pkgname%-*}"
+
+    git submodule init
+    git config --local submodule."panels/media-keys/gvc".url "${srcdir}/libgnome-volume-control"
+    git submodule update
 
     # Apply Ubuntu's patches
     patch -p1 -i ../debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch
     patch -p1 -i ../debian/patches/ubuntu-lid-close-suspend.patch
     patch -p1 -i ../debian/patches/revert_background_dropping.patch
     patch -p1 -i ../debian/patches/revert-gsettings-removals.patch
+
+    NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-    cd "${pkgname%-*}-${pkgver}"
-
-    autoreconf -vfi
+    cd "${pkgname%-*}"
 
     ./configure \
         --prefix=/usr \
@@ -69,6 +80,6 @@ build() {
 }
 
 package() {
-    cd "${pkgname%-*}-${pkgver}"
+    cd "${pkgname%-*}"
     make DESTDIR="${pkgdir}" install
 }