removed an unneeded patch

3 files changed, 4 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 325f192e841b..18318117983f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gsettings-desktop-schemas-ubuntu
 	pkgdesc = Shared GSettings schemas for the desktop
 	pkgver = 3.22.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gnome.org/
 	arch = any
 	license = GPL
@@ -12,10 +12,8 @@ pkgbase = gsettings-desktop-schemas-ubuntu
 	conflicts = gsettings-desktop-schemas
 	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
deleted file mode 100644
index 689cced60cff..000000000000
--- a/0001-Revert-schemas-Scroll-method-key-changes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 06278d8ce0c3..1fb9301f8ce8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=gsettings-desktop-schemas-ubuntu
 _ubuntu_ver=3.22.0
 _ubuntu_rel=1ubuntu1
 pkgver=3.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Shared GSettings schemas for the desktop"
 arch=(any)
 url="https://www.gnome.org/"
@@ -23,21 +23,15 @@ makedepends=(gobject-introspection intltool)
 provides=("${pkgname%-*}=${pkgver}")
 conflicts=("${pkgname%-*}")
 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"
-        0001-Revert-schemas-Scroll-method-key-changes.patch)
+        "https://launchpad.net/ubuntu/+archive/primary/+files/gsettings-desktop-schemas_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz")
 sha512sums=('653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1'
-            'e71dc5c3b01ecb8156aebe260d450c0f35aa6816a6b3acc43298a5e2e0f9134f8bdef6b19992d31f80d7d5333eec43d125b5c95ca1781dfd13d099ab0745bee4'
-            '942ea2fa67aa5d5a08bcf7e1fafce4cd4dc49eb536746a948546b46a08578d8422056b32d57d8e552cc2daa42b3493a0cc9a007fb0a36f6d32e85b1443bc94b5')
+            'e71dc5c3b01ecb8156aebe260d450c0f35aa6816a6b3acc43298a5e2e0f9134f8bdef6b19992d31f80d7d5333eec43d125b5c95ca1781dfd13d099ab0745bee4')
 
 prepare() {
     cd "${pkgname%-*}-${pkgver}"
 
-    patch -p1 -i ../0001-Revert-schemas-Scroll-method-key-changes.patch
-
     # Apply Ubuntu's patches
 
-    sed -i '/legacy-scroll-method.patch/d' ../debian/patches/series
-
     for i in $(grep -v '#' ../debian/patches/series); do
         msg "Applying ${i} ..."
         patch -p1 -i "../debian/patches/${i}"