diff options
author | 2012-02-09 17:36:03 +0100 | |
---|---|---|
committer | 2012-02-09 17:36:03 +0100 | |
commit | e848b6da22f21071726b527f725aa89fa0658f3f (patch) | |
tree | daa3a12794c769f38c92be02d332e821a505008b | |
parent | fix systemd symlinks (diff) | |
download | keruspe-e848b6da22f21071726b527f725aa89fa0658f3f.tar.gz keruspe-e848b6da22f21071726b527f725aa89fa0658f3f.tar.bz2 keruspe-e848b6da22f21071726b527f725aa89fa0658f3f.zip |
fix gsd
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
4 files changed, 47 insertions, 28 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index b2838960..16c7e95f 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,3 +1,4 @@ -AUX 0001-Make-colord-optional.patch 4478 RMD160 529706d5972e815187d7d6569637ccdabc3daade SHA1 8e4a1a65d04f14c0b8c21f783579f48757502445 SHA256 4385e27c12e881e79b838668308eb38c46ef6f170c91534b3c81b91e675b5728 -AUX 0002-Disable-wacom.patch 1395 RMD160 052c221717981b6276c0636946c5f4e28ef9dbba SHA1 84ab2cc737aa24c1cf771536729a140479583b33 SHA256 801e92ecdb5cc4e32cd39a5fc8e73bd5ec69e4338f50d6d98bdb1aa1f4bca9eb +AUX 0001-Make-colord-optional.patch 4495 RMD160 0f2b9b49db8722515f673b0fb329de4fb921d0cd SHA1 3831173c79ccebb7d1c3cba7dd6f099061db914d SHA256 362fa496dbb137695b25d26da25b6c45858058f05bc698b9397b528a60ed7ef0 +AUX 0002-Disable-wacom.patch 1472 RMD160 cd373d1f2467daf6c87cfbbe1fc417a169410e74 SHA1 5d1063695905109612a1f1139907265a5229d7af SHA256 dae077b44e9caea32a93ab9c89c09ed7fb934cf824891125536c35c9bac38b2a +AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133 EBUILD gnome-settings-daemon-9999-r1.ebuild 3512 RMD160 23d8205e06151842af123c496592cd5c346d8d0c SHA1 d5638f1f60f54b94194adc4c8fa4a31f9ee9aee8 SHA256 736aa9f4e28b94a69e4f1748da2bb26b6cc099aaa1bf753bc836653d8b1cc68e diff --git a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch b/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch index ce7a15af..586addfa 100644 --- a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch +++ b/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch @@ -1,8 +1,12 @@ -From b935fd8c7e0452b96e35712054a86899652bb7a4 Mon Sep 17 00:00:00 2001 -From: Julien Durillon <julien.durillon@gmail.com> -Date: Mon, 23 Jan 2012 15:50:20 +0100 +From 43cb1cd0f1a944b1668688c88dd565a1a61232c3 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Thu, 27 Oct 2011 23:30:41 -0400 Subject: [PATCH 1/2] Make colord optional +Conflicts: + + configure.ac + plugins/Makefile.am --- configure.ac | 38 ++++++++++++++++++++++++++++++++------ data/Makefile.am | 7 ++++++- @@ -10,10 +14,10 @@ Subject: [PATCH 1/2] Make colord optional 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index a07d422..63f1158 100644 +index 357f832..5b8e2af 100644 --- a/configure.ac +++ b/configure.ac -@@ -99,6 +99,38 @@ dnl --------------------------------------------------------------------------- +@@ -93,6 +93,38 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) dnl --------------------------------------------------------------------------- @@ -21,18 +25,18 @@ index a07d422..63f1158 100644 +dnl --------------------------------------------------------------------------- +build_color=false +AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value ++ AC_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [case "${enableval}" in ++ yes) WANT_COLOR=yes ;; ++ no) WANT_COLOR=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; ++ esac], ++ [WANT_COLOR=yes]) dnl Default value + +if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -+ build_color=true ++ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++ build_color=true +fi +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") + @@ -44,15 +48,15 @@ index a07d422..63f1158 100644 +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3, + [have_libcanberra=true -+ AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used)], -+ [have_libcanberra=false]) ++ AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used])], ++ [have_libcanberra=false]) +AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xtrue") + +dnl --------------------------------------------------------------------------- dnl - Check for LCMS2 dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no) -@@ -196,12 +228,6 @@ dnl --------------------------------------------------------------------------- +@@ -190,12 +222,6 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra]) dnl --------------------------------------------------------------------------- @@ -116,5 +120,5 @@ index 2b7566a..31fcb74 100644 enabled_plugins += updates else -- -1.7.9.rc2 +1.7.9.106.g2a2aa.dirty diff --git a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch index 6ffcf585..6256bf1d 100644 --- a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch +++ b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch @@ -1,18 +1,19 @@ -From 9e97002b4c9149c480ce996071cba9c058a7546a Mon Sep 17 00:00:00 2001 -From: Julien Durillon <julien.durillon@gmail.com> -Date: Mon, 23 Jan 2012 15:51:36 +0100 -Subject: [PATCH 2/2] remove wacom support +From dc457ad59773bc60e6d5f9414447b76c6a20fb48 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Mon, 12 Dec 2011 14:38:16 +0100 +Subject: [PATCH 2/2] Disable wacom +Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> --- configure.ac | 6 ------ plugins/Makefile.am | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 63f1158..d73e5d9 100644 +index 5b8e2af..a38add6 100644 --- a/configure.ac +++ b/configure.ac -@@ -227,12 +227,6 @@ dnl --------------------------------------------------------------------------- +@@ -221,12 +221,6 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra]) @@ -38,5 +39,5 @@ index 31fcb74..e40d9b9 100644 xsettings \ $(NULL) -- -1.7.9.rc2 +1.7.9.106.g2a2aa.dirty diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch new file mode 100644 index 00000000..a87a3d9b --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c +index 80f664a..c9a29fb 100644 +--- a/plugins/mouse/gsd-mouse-manager.c ++++ b/plugins/mouse/gsd-mouse-manager.c +@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state) + + args[0] = "syndaemon"; + args[1] = "-i"; +- args[2] = "2.0"; ++ args[2] = "0.5"; + args[3] = "-K"; + args[4] = "-R"; + args[5] = NULL; |