diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-18 06:19:59 +0000 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-18 06:19:59 +0000 |
commit | 4f71364bfdd243e636ca50c9e8be049adb95cef5 (patch) | |
tree | 80b66c01a1c7850107a95460dd7481b7a93dcbcc /gnome-base | |
parent | QA - bug #379629 (diff) | |
download | historical-4f71364bfdd243e636ca50c9e8be049adb95cef5.tar.gz historical-4f71364bfdd243e636ca50c9e8be049adb95cef5.tar.bz2 historical-4f71364bfdd243e636ca50c9e8be049adb95cef5.zip |
Bump to 3.0.2, from gnome overlay for GNOME 3, dropped keywords: bug 379657
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'gnome-base')
12 files changed, 371 insertions, 14 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 873086431bcc..a84edb579d97 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -8,14 +8,25 @@ AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 RMD160 b8afdaa2b5df38ca AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1e95cfc9ffcfe3b8cd294ee712 SHA1 b069adce19b7286e410beae4b9909ecc13485d2e SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 +DIST gnome-control-center-3.0.2.tar.bz2 4567179 RMD160 e1903c84d7f6a6662a6386e7110773ba789f634b SHA1 c0d5d203e25bc1829e25780b125efb3d9a4e741f SHA256 477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896 EBUILD gnome-control-center-2.32.1-r1.ebuild 2693 RMD160 c3151bef6177468e0ae577777e19d44c78321a38 SHA1 f7803e1b1dcd73bf481c2e14c1313cc717c592a1 SHA256 1153905bad1a7d5987d74f59dd134d49c2e787699f9b3267af63fe2b9c9b773f -EBUILD gnome-control-center-2.32.1.ebuild 2117 RMD160 62c92dcd7b3212d22d89cc8f4b9c313d65c86846 SHA1 e35c9d37519c29b0b15e0a7e5f1c064e5e7d9383 SHA256 de77af5e26583975b071acd43adcc8eadbe7c51009af7ff98224087aa169c3a9 -MISC ChangeLog 52552 RMD160 0664d9ff1994bddd4e5eda0ce12ccf137e2e74ee SHA1 68f21ecf136fe430a92bece3003beea19804b998 SHA256 8bb274942d54a87e08e5f235b402bacb65a28280a330ffd3bb22b152ae55cb08 -MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +EBUILD gnome-control-center-3.0.2-r2.ebuild 3140 RMD160 c28823a5ef2095a04a3dd2ab9a324c1cb4dbfb69 SHA1 dbc71cd95a2a4675f4848083e78561b8c90a9147 SHA256 3d7e355cbaceaab28857b273d8ac6011316fb5799665135414d74358a52bcd99 +MISC ChangeLog 52809 RMD160 92c1889d8352387f88b748a2d77fc277cbf4f25c SHA1 8bbe08202ba7e62faa977fe3218c7c1d5f6fcfd4 SHA256 022c3519d9d0ee96ecbc938cdab1dbcb3011588833e2f8b125c4351a2b5998bd +MISC metadata.xml 432 RMD160 ca0967b543d638817a2516a6104e792afa87539e SHA1 1f62656bbef63f5a89f78ac2c264bc6569441b81 SHA256 c39726081beb40c71a16163367bc95daf005268814a4eb0182563821176e5f76 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk28SaYACgkQuQc30/atMkBhlgCdGHNRAiWGU0GRcmYa4wFv9KON -+T4AnRV1Ey9j5Wh/ptpvfA08hfEObQu2 -=usnM +iQIcBAEBAgAGBQJOTK+PAAoJEO/kOhxWD91k+ksP/RNwgkLAKhbcHE0UXsHTjbqo +atTB6kW4HYEcs8UjPKUSYbxLYbUUaCOiCxWdxbM9cv76Iq01CquV8VxZAXnRqIMp +bOzic+XEdCHgKl1CyQmUW8aWbSrOsPwgvGaFGjWw65OJYcLTPN4CMlLWaHIVIhYM +0ThVTggeZ4bnhtpZHlIIRwB0xzg0FZ5PkpKcNb54kns5nd1Bk8FCsgSm1JGyTZIX +XMg04fKzirj82kcNTdRcWgTSbrepgVjfVlr4cSm2i8AZAnbg5eULz1t6cEXIJU/B +biDgk2j3T+h1qFqCqzI9H9TJdx+KVFd5cfTHIw1h2OV3MetAsnShozNYiPjxk+hb +nDvE5gYFNJHrUwBGbZQMd8E41o30wYOS7Ehl7bD+uk65aTtIDBcjB1o8GEGEmH72 +j4sl4Vp8IGGmMfXwjrUvFYP4XQFQ22NAzZ/ykKDOyTIs3w2KSPf4bdZlVgsLMvO+ +m9gYYya/sBgF1g3M4dKgKtVj/6DsWq+chBKXB+WHaKD5PY/FffigVrpTOQJKkN70 +jWluuns5p+6hiBV2XbnUzjLp+l6bsOabh5D9yRe94BkV7iGt94x2JyfJLPM8peUT +GIyrED48p+jpFJ42kSj6MQ+t2d4/+ZwUrm0DXtFW+My5jEADmHQbXdLx7cVSxyT/ +00eHadDc6o+OpZaShkk/ +=mLgg -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index 1d2aa9a60d8a..dda8a71a2147 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.84 2011/08/13 17:24:03 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.85 2011/08/18 06:19:59 nirbheek Exp $ + +*gnome-settings-daemon-3.0.2-r2 (18 Aug 2011) + + 18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + +gnome-settings-daemon-3.0.2-r2.ebuild, + +files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch, + +files/gnome-settings-daemon-3.0.2-keygrab-defines.patch, + +files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch, + +files/gnome-settings-daemon-3.0.2-keygrab-pause.patch, + +files/gnome-settings-daemon-3.0.2-keygrab-range.patch, + +files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch, + +files/gnome-settings-daemon-3.0.2-wacom-touch.patch, metadata.xml: + Bump to 3.0.2, from gnome overlay for GNOME 3, dropped keywords: bug 379657 13 Aug 2011; Raúl Porcel <armin76@gentoo.org> gnome-settings-daemon-2.32.1-r1.ebuild: diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 317d12252338..b375cb943bf6 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -7,18 +7,37 @@ AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 RMD160 90aee270093da76 AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 RMD160 36120e9451f49045450fa17bf1fb3e304ce39e23 SHA1 680e13a75c296ddb899cb7637682e89ae19d09b5 SHA256 9d56379de2c2cc83ffd4c40f7ab4c913647fefc54a1978ca0c5a4300bf3abec2 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f9748fc86654d4f9a90a85c1c1537 SHA1 b8606ac345e367619838466d5883c0595cd6bcc8 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9 AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 RMD160 1ec1582c3e1565e128c8124510a0d9f10432a9fc SHA1 10c05a986f34147d2b17c2c20a5910ac13633c0e SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0 +AUX gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch 1172 RMD160 e8313bf240937688948166ee0cce93ce013b7c63 SHA1 387cdae77b3a905bd6133d0f0807842b2c763a97 SHA256 c7ac7734e691216882656d46d16ff5f795548a8ad1cf53cc1dd7ff48089d9f5a +AUX gnome-settings-daemon-3.0.2-keygrab-defines.patch 1305 RMD160 80ad4327cabbbe5a5011b9114674683fc4eaef67 SHA1 40b7a7f5279875d5960701d159a3d1b11b8cb32e SHA256 e5aad4c5c8c4f62eec1fe76aa52eda4f484cd94f6822970de4597f601aac0a50 +AUX gnome-settings-daemon-3.0.2-keygrab-function-keys.patch 1702 RMD160 8bd705d64c1c9bad443e4ca83f409daf57a7e059 SHA1 c49cc8c848d0a591fe5883329bb82b05fe47b272 SHA256 427f888d5e610ba3cad52ec233fed2c9ed0955d38b4b0f2f4c4b2290ef25a35b +AUX gnome-settings-daemon-3.0.2-keygrab-pause.patch 980 RMD160 eeef9f17f28f38340cc44defb9a464a774319539 SHA1 df67d52e217c6c0eec6afe13e1c039176b600033 SHA256 9836f0dc097ed6741d14c6c19aa24a1e626b7baac3a018e2b053e7fd6dbba8b0 +AUX gnome-settings-daemon-3.0.2-keygrab-range.patch 978 RMD160 5a050d53a32abcbb03a72c9209facce768782d28 SHA1 09013258f42ab7fddcdbde91f3d478a1f2a506b8 SHA256 1c4162a8e7167009c8a5cfca89b3e7769db9432540af0cf5f05a31f1d72fd044 +AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133 +AUX gnome-settings-daemon-3.0.2-wacom-touch.patch 1550 RMD160 1e32eb1d347a9b273acd881f934be43cf6e33f78 SHA1 59cd418d36841d40db9461f414dbef87d9ee23cd SHA256 b8c474e480443646fa77ead806b3097c7cfdc6e6442e1d0a1d560606459b7d17 DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 +DIST gnome-settings-daemon-3.0.2.tar.bz2 1578597 RMD160 a396bfe8e422586c572315981ecd7e82e629f105 SHA1 a1d617eb58edaeb2c57364b074fc1040f2317c65 SHA256 f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec EBUILD gnome-settings-daemon-2.32.1-r1.ebuild 3591 RMD160 3d91cd33364bd59ca926b4fdb6b1fdece9d82a9d SHA1 00711d2b3c20db7e18145d7b489e851b5e053b80 SHA256 5ad01f7f5881f324f1461de088a8413e1933b42a47c82bf2e65a3b2c9ad33677 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3799 RMD160 7a6c2be5590e3014da838ea27a0f22e1e8c88bb6 SHA1 aa967f377fe486dad24c71dc4bc4329acfa9d502 SHA256 c2697f9b2b3565fdce9c614bb141beb286028da0b83401b530e5c1514f3ebf4e EBUILD gnome-settings-daemon-2.32.1.ebuild 3221 RMD160 936a84871290b091dc7c1f65d92b5c06eb9f5dd5 SHA1 23efa449f73333872e8934f7eea743b2567fe18b SHA256 d1de887b4510cc37998a44b51f7ce880af0cf02d72e917f09c604e3cc9e3b31e -MISC ChangeLog 15908 RMD160 488114dd9a0e1e4f61f41c5b0b136cd5ae38c758 SHA1 88b12a13961af62e21eb523183b94df51d760038 SHA256 32b91fc72cfe0a0217c3756b49f271313c13d0e9872a6f63fd6d6426c8b5da64 -MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +EBUILD gnome-settings-daemon-3.0.2-r2.ebuild 3126 RMD160 78493456e8a7c3ebff3d741cd113b61fbed12a8f SHA1 4b9164b1ea70919c8b125be76354540ed4e593c6 SHA256 4270fcc60ed88fee525f26e74ed1592f7326fdf477e9751a65434d6112a1550d +MISC ChangeLog 16575 RMD160 65ba8567b5d57f973b9551770edbb06d44983d30 SHA1 eca11ed0cd060459e8972ccb6807df62d99d2c83 SHA256 31c9b8fcdf54672734e610ebcc8b2d64da77f0fd49b000790d3ea15381361d56 +MISC metadata.xml 417 RMD160 ec68875dd7934f7c5942ebe62b3bfb7412634465 SHA1 67c601bc9e178119b993401039a09deb1a3a1589 SHA256 6e2368a5b5adfd0480d81653e86f85d028df905b4ebd7d243115d0467b351f4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GszkACgkQuQc30/atMkDYSACdEOuPKCRT8hEl/2U0EmFdH10K -/xAAoJRG09dsp1KeTM+Rt7Z3+1PPROk9 -=Sw3N +iQIcBAEBAgAGBQJOTK8VAAoJEO/kOhxWD91kl3YP/0xXfMwWtFQ7dEoaV9TVfgyA +l0XaqUMKg6VIc/b3UyiUApY1fG5RPtMYntIgA9alP5whOxjpQbShKjvJup298Rwp +i1m2Gz2SXI5hF00BIn4hOfQVynmkseEBIb0X/M1HIW127/PZagRuQuTFeq+/WqAm +iKIktvry9S+gg55dTlYvg4ifk6cnmEOGSv2kceyQxyk2dM1TPYNwe6AGNCfaUiuP +MqSYLQ4XdzsDNlFvXNBsQE0bDtazg5oGn1GjSM7mPT33/HvogD2wz0mDlBh+Q8V3 +ze88leKNzTqANSrCEWRtJv8hcAENNoNh4IcgHHemYa1brj0cbkFHqp0LJX9ZT4YB +c3VMV8KPQUC8AGTmKo/IT0z8SkZknReHwXW6kDk+/YvZA6Nj7jQsEUjWUxtrOtL0 +HX70NOBKglXiyWDNC70mF6LfDiDWBV1maMwYE6w8vNTZ31po5nmYL3F83c+z2/hP +0c8CB01zzJjJc1ttDDOIWi+qiroaWT/tLUekQs/fObbda6/stWKReZMbVRYwF6dj +er/8y2shOzqNhgoLpEPewGBkXQfDDicb/+Z4eyvAkpsNvqltKB0xg2MU7bxeSTXF +F21xYeoGjK+r3Dbx/HEPzzeTFG8NXfuPJn66Y2V4BTbrqrRGyiK1r1a7gVZPos0+ +pnKUaIrv+RWNxKt3qOeh +=D1/M -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch new file mode 100644 index 000000000000..23146b6a5e10 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch @@ -0,0 +1,29 @@ +From 33efc3649aa75fc77e4f1521031992376131d507 Mon Sep 17 00:00:00 2001 +From: Chris Coulson <chris.coulson@canonical.com> +Date: Wed, 13 Jul 2011 11:58:29 +0200 +Subject: [PATCH 01/11] common: Fix grabbing of multimedia keys + +--- + plugins/common/gsd-keygrab.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 70fde7a..1d50a22 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -146,9 +146,9 @@ grab_key_unsafe (Key *key, + * (which are useful to grab without a modifier). + */ + if ((modifiers & gsd_used_mods) == 0 && +- (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) || +- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) || +- key->keysym == GDK_KEY_Pause)) { ++ !IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) && ++ !IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) && ++ key->keysym != GDK_KEY_Pause) { + GString *keycodes; + + keycodes = g_string_new (""); +-- +1.7.6 + diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch new file mode 100644 index 000000000000..84d6d6beceab --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch @@ -0,0 +1,36 @@ +From afceb3e697934780b487db1e11e21fb23cbe9e28 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 01 Jul 2011 12:28:51 +0000 +Subject: common: Use defines instead of variables for ranges + +Seeing as those won't ever change. +--- +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 464f6e8..17e287c 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -42,8 +42,10 @@ static GdkModifierType gsd_ignored_mods = 0; + static GdkModifierType gsd_used_mods = 0; + + /* Taken from a comment in XF86keysym.h */ +-static guint gsd_unmodified_keysym_min = 0x10080001; +-static guint gsd_unmodified_keysym_max = 0x1008FFFF; ++#define XF86KEYS_RANGE_MIN 0x10080001 ++#define XF86KEYS_RANGE_MAX 0x1008FFFF ++ ++#define IN_RANGE(x, min, max) (x >= min && x <= max) + + static void + setup_modifiers (void) +@@ -141,8 +143,7 @@ grab_key_unsafe (Key *key, + * a modifier). + */ + if ((modifiers & gsd_used_mods) == 0 && +- ((key->keysym < gsd_unmodified_keysym_min) || +- (key->keysym > gsd_unmodified_keysym_max))) { ++ (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) { + GString *keycodes; + + keycodes = g_string_new (""); +-- +cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch new file mode 100644 index 000000000000..6603f7e22173 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch @@ -0,0 +1,44 @@ +From bc6561d2b2adbe39e928528dfaba2d129b143952 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 01 Jul 2011 12:32:30 +0000 +Subject: common: Fix function keys not being grabbed + +Because they were unmodified, and we tried to avoid screwing +up the user's keymaps for those. + +Bug was introduced in 469145ff59fe2a65d603cfeb5011427dc0f7c36b + +https://bugzilla.gnome.org/show_bug.cgi?id=649222 +--- +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 17e287c..31c1ba6 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -45,6 +45,9 @@ static GdkModifierType gsd_used_mods = 0; + #define XF86KEYS_RANGE_MIN 0x10080001 + #define XF86KEYS_RANGE_MAX 0x1008FFFF + ++#define FKEYS_RANGE_MIN GDK_KEY_F1 ++#define FKEYS_RANGE_MAX GDK_KEY_F35 ++ + #define IN_RANGE(x, min, max) (x >= min && x <= max) + + static void +@@ -139,11 +142,12 @@ grab_key_unsafe (Key *key, + /* If key doesn't have a usable modifier, we don't want + * to grab it, since the user might lose a useful key. + * +- * The exception is the XFree86 keys (which are useful to grab without +- * a modifier). ++ * The exception is the XFree86 keys and the Function keys ++ * (which are useful to grab without a modifier). + */ + if ((modifiers & gsd_used_mods) == 0 && +- (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) { ++ IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) && ++ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) { + GString *keycodes; + + keycodes = g_string_new (""); +-- +cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch new file mode 100644 index 000000000000..a5fc2d3abd84 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch @@ -0,0 +1,25 @@ +From 65a5ca27a24a2d5a59797d13f305b13026794fc2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 01 Jul 2011 12:39:45 +0000 +Subject: common: Allow the "Pause" key to be used + +That'd be the "Pause"/"PrtScreen" key, not AudioPause. + +https://bugzilla.gnome.org/show_bug.cgi?id=653524 +--- +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 304c8c2..70fde7a 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -147,7 +147,8 @@ grab_key_unsafe (Key *key, + */ + if ((modifiers & gsd_used_mods) == 0 && + (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) || +- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) { ++ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) || ++ key->keysym == GDK_KEY_Pause)) { + GString *keycodes; + + keycodes = g_string_new (""); +-- +cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch new file mode 100644 index 000000000000..7a2f3052b021 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch @@ -0,0 +1,24 @@ +From 74631cb8e0950c7a648df53195377b0c96a09008 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 01 Jul 2011 12:38:50 +0000 +Subject: common: Fix keys range check + +That could never happen... +--- +diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c +index 31c1ba6..304c8c2 100644 +--- a/plugins/common/gsd-keygrab.c ++++ b/plugins/common/gsd-keygrab.c +@@ -146,8 +146,8 @@ grab_key_unsafe (Key *key, + * (which are useful to grab without a modifier). + */ + if ((modifiers & gsd_used_mods) == 0 && +- IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) && +- IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) { ++ (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) || ++ IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) { + GString *keycodes; + + keycodes = g_string_new (""); +-- +cgit v0.9 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 000000000000..a87a3d9b9777 --- /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; diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch new file mode 100644 index 000000000000..977b38ce40b1 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch @@ -0,0 +1,32 @@ +From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed, 25 May 2011 02:50:15 +0000 +Subject: 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 <peter.hutterer@who-t.net> + +https://bugzilla.gnome.org/show_bug.cgi?id=651020 +--- +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.</_description> + </key> + <key name="touch" type="b"> +- <default>false</default> ++ <default>true</default> + <_summary>Wacom touch feature</_summary> +- <_description>Enable this to only move the cursor when the user touches the tablet.</_description> ++ <_description>Enable this to move the cursor when the user touches the tablet.</_description> + </key> + <key name="tablet-pc-button" type="b"> + <default>false</default> +-- +cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild new file mode 100644 index 000000000000..cc6eb10cc0d7 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild,v 1.1 2011/08/18 06:19:59 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="http://www.gnome.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev" + +# Latest gsettings-desktop-schemas is needed due to commit e8d1de92 +COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.26.0:2 + >=x11-libs/gtk+-2.99.3:3 + >=gnome-base/gconf-2.6.1:2 + >=gnome-base/libgnomekbd-2.91.1 + >=gnome-base/gnome-desktop-2.91.5:3 + >=gnome-base/gsettings-desktop-schemas-0.1.7.1 + media-fonts/cantarell + media-libs/fontconfig + + >=x11-libs/libnotify-0.6.1 + x11-libs/libXi + x11-libs/libXext + x11-libs/libXxf86misc + >=x11-libs/libxklavier-5.0 + >=media-sound/pulseaudio-0.9.16 + media-libs/libcanberra[gtk3] + + cups? ( >=net-print/cups-1.4[dbus] ) + packagekit? ( + dev-libs/glib:2 + || ( sys-fs/udev[gudev] + sys-fs/udev[extras] ) + >=app-admin/packagekit-base-0.6.4 + >=sys-power/upower-0.9.1 ) + policykit? ( + >=sys-auth/polkit-0.97 + >=sys-apps/dbus-1.1.2 ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + udev? ( || ( sys-fs/udev[gudev] + sys-fs/udev[extras] ) )" +# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly +RDEPEND="${COMMON_DEPEND} + gnome-base/dconf + >=x11-themes/gnome-themes-standard-2.91 + >=x11-themes/gnome-icon-theme-2.91 + >=x11-themes/gnome-icon-theme-symbolic-2.91 + !<gnome-base/gnome-control-center-2.22" +DEPEND="${COMMON_DEPEND} + cups? ( sys-apps/sed ) + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + x11-proto/inputproto + x11-proto/xproto" + +pkg_setup() { + # README is empty + DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" + G2CONF="${G2CONF} + --disable-static + --disable-schemas-compile + --enable-gconf-bridge + $(use_enable cups) + $(use_enable debug) + $(use_enable debug more-warnings) + $(use_enable packagekit) + $(use_enable policykit polkit) + $(use_enable smartcard smartcard-support) + $(use_enable udev gudev)" +} + +src_prepare() { + # Patch from upstream git, will be in next release + epatch "${FILESDIR}/${P}-wacom-touch.patch" + # Patches for various keyboard shortcut bugs, will be in next release + epatch "${FILESDIR}/${P}-keygrab-"{defines,function-keys,range,pause}.patch + # bug #375087 + epatch "${FILESDIR}/${P}-keygrab-broken-logic.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=621836 + # Apparently this change severely affects touchpad usability for some + # people, so revert it if USE=short-touchpad-timeout. + # Revisit if/when upstream adds a setting for customizing the timeout. + use short-touchpad-timeout && + epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch" + + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + + echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf + doenvd 51gsettings-dconf || die "doenvd failed" +} diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml index da6fd63d0085..9a1d039357a9 100644 --- a/gnome-base/gnome-settings-daemon/metadata.xml +++ b/gnome-base/gnome-settings-daemon/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>gnome</herd> + <herd>gnome</herd> + <use> + <flag name="packagekit">Enable support for the distro-neutral package + manager GUI <pkg>app-admin/packagekit</pkg></flag> + <flag name="short-touchpad-timeout">Change the touchpad timeout so that + it's effective for slow typists</flag> + </use> </pkgmetadata> |