From 6919b6e5950a92aae9eeda2d4f4dd692f054b050 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 25 Aug 2011 16:12:00 +0100 Subject: [PATCH] Remove obsolete patches --- ...atetime-Fix-setting-NTP-on-Fedora-15.patch | 27 -------------- ...ys-Fix-crash-when-keybindings-change.patch | 28 --------------- ...om-enable-wacom-touch-key-by-default.patch | 36 ------------------- gnome-settings-daemon.spec | 4 --- 4 files changed, 95 deletions(-) delete mode 100644 0001-datetime-Fix-setting-NTP-on-Fedora-15.patch delete mode 100644 0001-media-keys-Fix-crash-when-keybindings-change.patch delete mode 100644 0001-wacom-enable-wacom-touch-key-by-default.patch diff --git a/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch b/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch deleted file mode 100644 index d78e1eb..0000000 --- a/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2c748a6d841dc2b673df975b28ebffcbe76b4bce Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 28 Apr 2011 15:51:13 +0100 -Subject: [PATCH] datetime: Fix setting NTP on Fedora 15 - -https://bugzilla.gnome.org/show_bug.cgi?id=648556 ---- - plugins/datetime/gsd-datetime-mechanism.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/plugins/datetime/gsd-datetime-mechanism.c b/plugins/datetime/gsd-datetime-mechanism.c -index 2c43a4a..6ea8d83 100644 ---- a/plugins/datetime/gsd-datetime-mechanism.c -+++ b/plugins/datetime/gsd-datetime-mechanism.c -@@ -745,7 +745,8 @@ gsd_datetime_mechanism_set_using_ntp (GsdDatetimeMechanism *mechanism, - return FALSE; - - if (g_file_test ("/sbin/chkconfig", G_FILE_TEST_EXISTS)) /* Fedora */ -- cmd = g_strconcat ("/sbin/chkconfig --level 2345 ntpd ", using_ntp ? "on" : "off", NULL); -+ /* We omit --level 2345 so that systemd doesn't try to use the SysV init scripts */ -+ cmd = g_strconcat ("/sbin/chkconfig ntpd ", using_ntp ? "on" : "off", NULL); - else if (g_file_test ("/usr/sbin/update-rc.d", G_FILE_TEST_EXISTS)) /* Debian */ - cmd = g_strconcat ("/usr/sbin/update-rc.d ntp ", using_ntp ? "enable" : "disable", NULL); - else { --- -1.7.4.4 - diff --git a/0001-media-keys-Fix-crash-when-keybindings-change.patch b/0001-media-keys-Fix-crash-when-keybindings-change.patch deleted file mode 100644 index 4c6742c..0000000 --- a/0001-media-keys-Fix-crash-when-keybindings-change.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89b4b516edfd5ec19f8987d63624c28fc2f30f8f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 16 Feb 2011 16:26:45 +0000 -Subject: [PATCH] media-keys: Fix crash when keybindings change - -We need to skip over hard-coded keys which don't have a -key name. ---- - plugins/media-keys/gsd-media-keys-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 1c1b2cf..7d42f49 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -292,6 +292,9 @@ update_kbd_cb (GSettings *settings, - - /* Find the key that was modified */ - for (i = 0; i < HANDLED_KEYS; i++) { -+ /* Skip over hard-coded keys */ -+ if (keys[i].settings_key == NULL) -+ continue; - if (strcmp (key, keys[i].settings_key) == 0) { - char *tmp; - Key *key; --- -1.7.4 - diff --git a/0001-wacom-enable-wacom-touch-key-by-default.patch b/0001-wacom-enable-wacom-touch-key-by-default.patch deleted file mode 100644 index 16085ef..0000000 --- a/0001-wacom-enable-wacom-touch-key-by-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 25 May 2011 12:50:15 +1000 -Subject: [PATCH] wacom: enable wacom touch key by default. - -This was caused by a misunderstanding of the touch behaviour. -This key enables/disables the touch part of the tablet altogether, not the -behaviour of touch while using the pen. Hence the erroneous default, we -really don't want to disable touch on most tablets by default. - -Signed-off-by: Peter Hutterer - -https://bugzilla.gnome.org/show_bug.cgi?id=651020 ---- - ...ings-daemon.peripherals.wacom.gschema.xml.in.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in -index 738b26a..4554d62 100644 ---- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in -+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in -@@ -23,9 +23,9 @@ - <_description>Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and 'ccw' for 90 degree counterclockwise. - - -- false -+ true - <_summary>Wacom touch feature -- <_description>Enable this to only move the cursor when the user touches the tablet. -+ <_description>Enable this to move the cursor when the user touches the tablet. - - - false --- -1.7.5.1 - diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index a14e694..54a1eac 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -38,9 +38,7 @@ BuildRequires: upower-devel BuildRequires: libgudev1-devel BuildRequires: nss-devel -Patch0: 0001-datetime-Fix-setting-NTP-on-Fedora-15.patch Patch1: 0001-updates-deal-with-absence-of-gnome-session-gracefull.patch -Patch2: 0001-wacom-enable-wacom-touch-key-by-default.patch Patch3: 0001-wacom-invert-TPCButton-setting.patch %description @@ -59,9 +57,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .sysv %patch1 -p1 -b .updates-crash -%patch2 -p1 -b .wacom-touch-key %patch3 -p1 -b .wacom-invert-tpcbutton autoreconf -i -f