update to version 3.22.0

3 files changed, 86 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f6a0a484e14..325f192e841b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,21 @@
 pkgbase = gsettings-desktop-schemas-ubuntu
 	pkgdesc = Shared GSettings schemas for the desktop
-	pkgver = 3.20.0
+	pkgver = 3.22.0
 	pkgrel = 1
-	url = http://live.gnome.org/
-	install = gsettings-desktop-schemas.install
+	url = https://www.gnome.org/
 	arch = any
 	license = GPL
-	makedepends = intltool
 	makedepends = gobject-introspection
+	makedepends = intltool
 	depends = glib2
-	provides = gsettings-desktop-schemas=3.20.0
+	provides = gsettings-desktop-schemas=3.22.0
 	conflicts = gsettings-desktop-schemas
-	source = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/3.20/gsettings-desktop-schemas-3.20.0.tar.xz
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_3.18.1-1ubuntu1.debian.tar.xz
-	source = git_revert_background_key_removal.patch
-	source = git_revert_menu_icon_key_removal.patch
-	source = git_revert_notifications_key_removal.patch
-	source = ubuntu_lock-on-suspend.patch
-	sha512sums = 559baf477be9f728c5fea24232218ec4ff17ac97a6db166749fbca4dc1d3995e79824dc977cae5aa10b2197aa9c0e65b884f5c1cb446db109bc15dafe456f7a1
-	sha512sums = 593cbd34d5456ba8790ebd8c600216081f159f754c44969c1cde4f4057044bea53054b260b2f660d8dfc15b344e33f0f7382f336d5ed660047cf8a797c101ab7
-	sha512sums = 423c81fefb2eb1580d703499baee449e0dfe88b0d8bb3cbc5815c2668e859f0334bb352d0f58ba312c7fc3257fd8a78f0935c834429b3c7d3986ee5996b5ae5a
-	sha512sums = cae6c01833043d9d7d889561a6afb7bae5f9186603552e1277b6a8f792148bd585ac19aac41253223cdeeba4d031f51984ac126fae9c02ceca396cb69e4db75f
-	sha512sums = 2af269c096d9f15a7e91440a97ee69d08e778b498fd835194d5abca02630bc7a5dcb2c8a2ad3ae21e95b40cbcf0cd6773f34aeb9a2655d25f4b59d231f478b1d
-	sha512sums = 301830b3f9c9f2aac9e44ea2e2305cfc9d4864f3bd6ac4c5824ce12de45c72329ddca303adfb7948063acbb7ff892b0970767b1b552aff00834c517f25af2c8c
+	source = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_3.22.0-1ubuntu1.debian.tar.xz
+	source = 0001-Revert-schemas-Scroll-method-key-changes.patch
+	sha512sums = 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
+	sha512sums = e71dc5c3b01ecb8156aebe260d450c0f35aa6816a6b3acc43298a5e2e0f9134f8bdef6b19992d31f80d7d5333eec43d125b5c95ca1781dfd13d099ab0745bee4
+	sha512sums = 942ea2fa67aa5d5a08bcf7e1fafce4cd4dc49eb536746a948546b46a08578d8422056b32d57d8e552cc2daa42b3493a0cc9a007fb0a36f6d32e85b1443bc94b5
 
 pkgname = gsettings-desktop-schemas-ubuntu
 
diff --git a/0001-Revert-schemas-Scroll-method-key-changes.patch b/0001-Revert-schemas-Scroll-method-key-changes.patch
new file mode 100644
index 000000000000..689cced60cff
--- /dev/null
+++ b/0001-Revert-schemas-Scroll-method-key-changes.patch
@@ -0,0 +1,48 @@
+From 59b9003f551d19d87c429149eae7e36fce1175df Mon Sep 17 00:00:00 2001
+From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+Date: Sat, 14 May 2016 19:30:20 -0400
+Subject: [PATCH] Revert "schemas: Scroll method key changes"
+
+This reverts commit 656aca6942c8417ddb3216063b97b7a1336076c9.
+---
+ headers/gdesktop-enums.h                             | 7 +++++++
+ schemas/org.gnome.desktop.peripherals.gschema.xml.in | 5 +++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
+index 2ddca49..8386f61 100644
+--- a/headers/gdesktop-enums.h
++++ b/headers/gdesktop-enums.h
+@@ -164,6 +164,13 @@ typedef enum
+ 
+ typedef enum
+ {
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED,
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING,
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING
++} GDesktopTouchpadScrollMethod;
++
++typedef enum
++{
+   G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT,
+   G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT,
+   G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE
+diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
+index 9f109ef..2e6567a 100644
+--- a/schemas/org.gnome.desktop.peripherals.gschema.xml.in
++++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
+@@ -8,6 +8,11 @@
+     <child name="touchscreen" schema="org.gnome.desktop.peripherals.touchscreen"/>
+   </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" path="/org/gnome/desktop/peripherals/touchpad/">
++    <key name="scroll-method" enum="org.gnome.desktop.GDesktopTouchpadScrollMethod">
++      <default>'two-finger-scrolling'</default>
++      <summary>Select the touchpad scroll method</summary>
++      <description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", "two-finger-scrolling".</description>
++    </key>
+     <key name="edge-scrolling-enabled" type="b">
+       <default>true</default>
+       <summary>Whether edge scrolling is enabled</summary>
+-- 
+2.8.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 3a7db838e0c4..06278d8ce0c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,59 @@
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 # Maintainer: Michael Healy <horsemanoffaith@gmail.com>
+# Original Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net>
 
 # vercheck-pkgbuild: auto
-# vercheck-ubuntu: name=${pkgname%-*}, repo=xenial
+# vercheck-ubuntu: name=${pkgname%-*}, repo=zesty
 # vercheck-archlinux: name=${pkgname%-*}, repo=extra, arch=x86_64
-# vercheck-gnome: name=${pkgname%-*}, majorver=3.19
+# vercheck-gnome: name=${pkgname%-*}, majorver=3.22
 
 pkgname=gsettings-desktop-schemas-ubuntu
+_ubuntu_ver=3.22.0
 _ubuntu_rel=1ubuntu1
-_ubuntu_ver=3.18.1
-pkgver=3.20.0
+pkgver=3.22.0
 pkgrel=1
 pkgdesc="Shared GSettings schemas for the desktop"
 arch=(any)
-url="http://live.gnome.org/"
+url="https://www.gnome.org/"
 license=(GPL)
 depends=(glib2)
-makedepends=(intltool gobject-introspection)
+makedepends=(gobject-introspection intltool)
 provides=("${pkgname%-*}=${pkgver}")
 conflicts=("${pkgname%-*}")
-install=${pkgname%-*}.install
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz"
         "https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz"
-        git_revert_background_key_removal.patch
-        git_revert_menu_icon_key_removal.patch
-        git_revert_notifications_key_removal.patch
-        ubuntu_lock-on-suspend.patch)
-sha512sums=('559baf477be9f728c5fea24232218ec4ff17ac97a6db166749fbca4dc1d3995e79824dc977cae5aa10b2197aa9c0e65b884f5c1cb446db109bc15dafe456f7a1'
-            '593cbd34d5456ba8790ebd8c600216081f159f754c44969c1cde4f4057044bea53054b260b2f660d8dfc15b344e33f0f7382f336d5ed660047cf8a797c101ab7'
-            '423c81fefb2eb1580d703499baee449e0dfe88b0d8bb3cbc5815c2668e859f0334bb352d0f58ba312c7fc3257fd8a78f0935c834429b3c7d3986ee5996b5ae5a'
-            'cae6c01833043d9d7d889561a6afb7bae5f9186603552e1277b6a8f792148bd585ac19aac41253223cdeeba4d031f51984ac126fae9c02ceca396cb69e4db75f'
-            '2af269c096d9f15a7e91440a97ee69d08e778b498fd835194d5abca02630bc7a5dcb2c8a2ad3ae21e95b40cbcf0cd6773f34aeb9a2655d25f4b59d231f478b1d'
-            '301830b3f9c9f2aac9e44ea2e2305cfc9d4864f3bd6ac4c5824ce12de45c72329ddca303adfb7948063acbb7ff892b0970767b1b552aff00834c517f25af2c8c')
+        0001-Revert-schemas-Scroll-method-key-changes.patch)
+sha512sums=('653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1'
+            'e71dc5c3b01ecb8156aebe260d450c0f35aa6816a6b3acc43298a5e2e0f9134f8bdef6b19992d31f80d7d5333eec43d125b5c95ca1781dfd13d099ab0745bee4'
+            '942ea2fa67aa5d5a08bcf7e1fafce4cd4dc49eb536746a948546b46a08578d8422056b32d57d8e552cc2daa42b3493a0cc9a007fb0a36f6d32e85b1443bc94b5')
 
 prepare() {
-  cd "${pkgname%-*}-${pkgver}"
+    cd "${pkgname%-*}-${pkgver}"
 
-  # Apply Ubuntu's patches
+    patch -p1 -i ../0001-Revert-schemas-Scroll-method-key-changes.patch
 
-  sed -i '/git_revert_notifications_key_removal.patch/d' ../debian/patches/series
+    # Apply Ubuntu's patches
 
-#  for i in $(grep -v '#' ../debian/patches/series); do
-#    msg "Applying ${i} ..."
-#    patch -p1 -i "../debian/patches/${i}"
-#  done
+    sed -i '/legacy-scroll-method.patch/d' ../debian/patches/series
 
-  patch -p1 -i ../git_revert_background_key_removal.patch
-  patch -p1 -i ../git_revert_menu_icon_key_removal.patch
-  patch -p1 -i ../git_revert_notifications_key_removal.patch
-  patch -p1 -i ../ubuntu_lock-on-suspend.patch
+    for i in $(grep -v '#' ../debian/patches/series); do
+        msg "Applying ${i} ..."
+        patch -p1 -i "../debian/patches/${i}"
+    done
 }
 
 build() {
-  cd "${pkgname%-*}-${pkgver}"
+    cd "${pkgname%-*}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-schemas-compile
-  make
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+        --disable-schemas-compile
+    make
 }
 
 package() {
-  cd "${pkgname%-*}-${pkgver}"
+    cd "${pkgname%-*}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+    make DESTDIR="${pkgdir}" install
 }