[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-06-14  6:36 Nirbheek Chauhan
  0 siblings, 0 replies; 20+ messages in thread
From: Nirbheek Chauhan @ 2011-06-14  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     cf9f0032e3e12803e51814640a37c5ba441e8080
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 20:03:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 05:59:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf9f0032

gnome-base/gnome-settings-daemon-3.0.2 : touchpad timeout, udev[extras] fix

Add short-touchpad-timeout USE flag to allow reverting to 0.5 second syndaemon
timeout (like in GNOME 2) because the current 2.0 second timeout apparently
severely affects touchpad usability for some people (thanks to shiznix_ on
IRC for the report). See https://bugzilla.gnome.org/show_bug.cgi?id=621836
for details.
Also, add a patch from upstream git fixing wacom tablet touch functionality,
and update for new udev USE flags (see bug #348472).

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...tings-daemon-3.0.2-short-touchpad-timeout.patch |   13 ++++++++
 .../gnome-settings-daemon-3.0.2-wacom-touch.patch  |   32 ++++++++++++++++++++
 .../gnome-settings-daemon-3.0.2.ebuild             |   23 ++++++++++++--
 .../gnome-settings-daemon-9999.ebuild              |    6 ++-
 4 files changed, 68 insertions(+), 6 deletions(-)

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 0000000..a87a3d9
--- /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 0000000..977b38c
--- /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.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
index 95407ec..dadd8e0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit smartcard +udev"
+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
@@ -45,14 +45,16 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
 		dev-libs/glib:2
-		sys-fs/udev[extras]
+		|| ( sys-fs/udev[gudev]
+			sys-fs/udev[extras] )
 		>=app-portage/packagekit-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[extras] )"
+	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}
 	>=x11-themes/gnome-themes-standard-2.91
@@ -83,6 +85,19 @@ pkg_setup() {
 		$(use_enable udev gudev)"
 }
 
+src_prepare() {
+	# Patch from upstream git, will be in next release
+	epatch "${FILESDIR}/${P}-wacom-touch.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

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 95407ec..2804d7b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -45,14 +45,16 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
 		dev-libs/glib:2
-		sys-fs/udev[extras]
+		|| ( sys-fs/udev[gudev]
+			sys-fs/udev[extras] )
 		>=app-portage/packagekit-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[extras] )"
+	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}
 	>=x11-themes/gnome-themes-standard-2.91



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-07-12  0:19 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2011-07-12  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     037849ea90a1086bfa376aaa19de1592a262ef6d
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 00:18:10 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 00:18:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=037849ea

gnome-base/gnome-settings-daemon: 3.0.2 → 3.0.2-r1

Add patches from upstream git fixing various bugs in keyboard
shortcut settings.

---
 ...ome-settings-daemon-3.0.2-keygrab-defines.patch |   36 ++++++++++++++++
 ...ttings-daemon-3.0.2-keygrab-function-keys.patch |   44 ++++++++++++++++++++
 ...gnome-settings-daemon-3.0.2-keygrab-pause.patch |   25 +++++++++++
 ...gnome-settings-daemon-3.0.2-keygrab-range.patch |   24 +++++++++++
 ...build => gnome-settings-daemon-3.0.2-r1.ebuild} |    2 +
 5 files changed, 131 insertions(+), 0 deletions(-)

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 0000000..84d6d6b
--- /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 0000000..6603f7e
--- /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 0000000..a5fc2d3
--- /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 0000000..7a2f305
--- /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/gnome-settings-daemon-3.0.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild
similarity index 95%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild
index ffedca2..cfa827a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild
@@ -89,6 +89,8 @@ pkg_setup() {
 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
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-07-13 15:53 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2011-07-13 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     3546f7e080b2d2b4383c3728472f283453535d67
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 13 15:41:27 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 13 15:51:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3546f7e0

gnome-base/gnome-settings-daemon: 3.0.2-r1 → 3.0.2-r2, fixes multimedia keys

Brown-paper-bag patch to reverse the logic in multimedia key grabbing.
Fixes bug #375087. Thanks to Albert W. Hopkins <marduk <AT> python.net> for
reporting the issue.

---
 ...ettings-daemon-3.0.2-keygrab-broken-logic.patch |   29 ++++++++++++++++++++
 ...build => gnome-settings-daemon-3.0.2-r2.ebuild} |    2 +
 2 files changed, 31 insertions(+), 0 deletions(-)

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 0000000..23146b6
--- /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/gnome-settings-daemon-3.0.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild
similarity index 97%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild
index cfa827a..c1e266a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild
@@ -91,6 +91,8 @@ src_prepare() {
 	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



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-10-04  8:56 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2011-10-04  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     9c13b094f3cb7caa1c393812b9ce60333a4516c9
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 05:58:02 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct  4 08:02:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c13b094

gnome-base/gnome-settings-daemon: do not treat DPMS failure as fatal

Do not fail to start power plugin if clearing DPMS timeouts failed
(clearing the timeouts appears to always fail under nvidia-drivers).

Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660859

---
 .../gnome-settings-daemon-3.2.0-dpms-failure.patch |   30 ++++++++++++++++++++
 ...build => gnome-settings-daemon-3.2.0-r3.ebuild} |    4 ++
 2 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch
new file mode 100644
index 0000000..01bd093
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-dpms-failure.patch
@@ -0,0 +1,30 @@
+From a8d56d910350346008aca54b98e10c318f29050f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Tue, 4 Oct 2011 00:45:17 -0400
+Subject: [PATCH] Power: failing to clear DPMS timeouts should not be fatal
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660859
+---
+ plugins/power/gsd-power-manager.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index ae7cfb3..56934d5 100644
+--- a/plugins/power/gsd-power-manager.c
++++ b/plugins/power/gsd-power-manager.c
+@@ -3446,8 +3446,10 @@ gsd_power_manager_start (GsdPowerManager *manager,
+         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+                                              GNOME_RR_DPMS_ON,
+                                              error);
+-        if (!ret)
+-                return FALSE;
++        if (!ret) {
++                g_warning ("Failed set DPMS mode: %s", (*error)->message);
++                g_clear_error (error);
++        }
+ 
+         /* coldplug the engine */
+         engine_coldplug (manager);
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild
similarity index 95%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild
index 9dc285c..efffa70 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r3.ebuild
@@ -107,6 +107,10 @@ src_prepare() {
 	# fixing loading color profiles at startup
 	epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch"
 
+	# Do not fail to start the power plugin if clearing DPMS timeouts failed
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660859
+	epatch "${FILESDIR}/${PN}-3.2.0-dpms-failure.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.



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-10-28  5:28 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2011-10-28  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     dd3ad295b1a9f48c00617a7c53c6699168f62523
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 03:36:45 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 03:36:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd3ad295

gnome-base/gnome-settings-daemon: make colord optional

As discussed on IRC with Nirbheek. This will make gnome-3.2 easier to
unmask.

---
 ...ome-settings-daemon-3.2.1-optional-colord.patch |   95 ++++++++++++++++++++
 .../gnome-settings-daemon-3.2.1.ebuild             |   11 ++-
 2 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
new file mode 100644
index 0000000..98afbec
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
@@ -0,0 +1,95 @@
+From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 27 Oct 2011 23:30:41 -0400
+Subject: [PATCH] Make colord optional
+
+---
+ configure.ac        |   20 +++++++++++++++++++-
+ data/Makefile.am    |    7 ++++++-
+ plugins/Makefile.am |    7 ++++++-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe74674..f1a8547 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for colord
+ dnl ---------------------------------------------------------------------------
+-PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
++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
++
++if test x$WANT_COLOR = xyes; then
++      PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
++      build_color=true
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++
++AC_SUBST(COLORD_CFLAGS)
++AC_SUBST(COLORD_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for libcanberra
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 43ba27c..1f3bbef 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
+ 	org.gnome.settings-daemon.plugins.gschema.xml			\
+ 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+ 
++if BUILD_COLOR
++gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
++endif
++
+ if HAVE_PACKAGEKIT
+ gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
+ else
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 5e26811..d2404ab 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -24,6 +23,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_GCONF_BRIDGE
+ enabled_plugins += gconf
+ else
+-- 
+1.7.7.1
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
index 9c6f67f..4be6b2d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063
@@ -47,9 +47,9 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	x11-libs/libXfixes
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
-	>=x11-misc/colord-0.1.13
 	>=media-sound/pulseaudio-0.9.16
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
 		|| ( sys-fs/udev[gudev]
@@ -91,6 +91,7 @@ pkg_setup() {
 		--disable-schemas-compile
 		--enable-gconf-bridge
 		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
@@ -115,6 +116,10 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+	eautoreconf
+
 	gnome2_src_prepare
 }
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2011-10-29 19:56 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2011-10-29 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     6de2125684379e4611fc972e9ea671e48e4f5685
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:54:07 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:54:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6de21256

gnome-base/gnome-settings-daemon: moved 3.2.1 to gx86 + qa

---
 ...emon-3.2.0-color-unbreak-loading-profiles.patch |   41 ------
 .../gnome-settings-daemon-3.2.1-WEXITSTATUS.patch  |   21 ---
 .../gnome-settings-daemon-3.2.1.ebuild             |  135 --------------------
 .../gnome-settings-daemon-9999.ebuild              |    2 +-
 4 files changed, 1 insertions(+), 198 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
deleted file mode 100644
index 370cfc5..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e46d34f5bd9b0260a204d5f8a9d23c747b61923f Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Mon, 3 Oct 2011 10:02:34 -0400
-Subject: [PATCH] color: unbreak loading profiles at startup
-
-A recent commit broke color profile loading at startup if the profile
-directory exists already. Fix this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660790
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backported to 3.2]
----
- plugins/color/gcm-profile-store.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 3dde406..f8b0889 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -445,13 +445,14 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
-         /* get Linux per-user profiles */
-         path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
-         ret = gcm_profile_store_mkdir_with_parents (path, &error);
--        if (!ret) {
-+        if (!ret &&
-+            !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-                 g_warning ("failed to create directory on startup: %s", error->message);
--                g_error_free (error);
-         } else {
-                 gcm_profile_store_search_path (profile_store, path, 0);
-         }
-         g_free (path);
-+        g_clear_error (&error);
- 
-         /* get per-user profiles from obsolete location */
-         path = g_build_filename (g_get_home_dir (), ".color", "icc", NULL);
--- 
-1.7.7
-

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
deleted file mode 100644
index 2c3e59f..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9b141728c889a6d2f88767655661318e3d8d82da Mon Sep 17 00:00:00 2001
-From: Malcolm Lewis <malcolmlewis@opensuse.org>
-Date: Mon, 17 Oct 2011 16:43:06 +0000
-Subject: power: Fix "undefined symbol: WEXITSTATUS" error.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662020
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 010d14a..3f10c22 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-+#include <sys/wait.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
deleted file mode 100644
index 4be6b2d..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
-
-# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
-# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
-# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-# upower-0.9.11 needed for UpSleepKind
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.14: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-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-0.9.16
-	>=sys-power/upower-0.9.11
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	>=media-sound/pulseaudio-0.9.16
-
-	colord? ( >=x11-misc/colord-0.1.13 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	packagekit? (
-		|| ( sys-fs/udev[gudev]
-			sys-fs/udev[extras] )
-		>=app-admin/packagekit-base-0.6.12 )
-	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
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-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
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3"
-# xproto-7.0.15 needed for power plugin
-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/kbproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-gconf-bridge
-		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
-		$(use_enable colord color)
-		$(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() {
-	# Upstream patch to fix undefined symbol, will be in next release
-	epatch "${FILESDIR}/${P}-WEXITSTATUS.patch"
-
-	# Backport patch from git master branch (not in gnome-3-2 branch yet)
-	# fixing loading color profiles at startup
-	epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.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"
-
-	# Make colord optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
-
-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/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index d1f9a64..53eed8e 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 		>=app-admin/packagekit-base-0.6.12 )
 	policykit? (
 		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2 )
+		>=sys-apps/dbus-1.1.2[X] )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
 	udev? ( || ( sys-fs/udev[gudev]
 		sys-fs/udev[extras] ) )"



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2012-03-26  8:20 Nirbheek Chauhan
  0 siblings, 0 replies; 20+ messages in thread
From: Nirbheek Chauhan @ 2012-03-26  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2244ea955f012fde263d0b7793b646e57d558456
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 06:12:41 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2244ea95

Add gnome-base/gnome-settings-daemon-3.3.92

---
 ...ome-settings-daemon-3.2.1-optional-colord.patch |   95 ---------------
 ...ttings-daemon-3.3.92-optional-color-wacom.patch |  127 ++++++++++++++++++++
 ....ebuild => gnome-settings-daemon-3.3.92.ebuild} |   58 +++++----
 .../gnome-settings-daemon-9999.ebuild              |   58 +++++----
 4 files changed, 191 insertions(+), 147 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
deleted file mode 100644
index 98afbec..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
-Subject: [PATCH] Make colord optional
-
----
- configure.ac        |   20 +++++++++++++++++++-
- data/Makefile.am    |    7 ++++++-
- plugins/Makefile.am |    7 ++++++-
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe74674..f1a8547 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
- dnl ---------------------------------------------------------------------------
- dnl - Check for colord
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+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
-+
-+if test x$WANT_COLOR = xyes; then
-+      PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 43ba27c..1f3bbef 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
-@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if BUILD_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 5e26811..d2404ab 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -24,6 +23,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- 
-1.7.7.1
-

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
new file mode 100644
index 0000000..6af221d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
@@ -0,0 +1,127 @@
+diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
+--- gnome-settings-daemon-3.3.92//configure.ac	2012-03-19 14:23:38.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//configure.ac	2012-03-25 11:36:35.833356226 +0530
+@@ -194,13 +194,39 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_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])
++       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue")
++
++AC_SUBST(COLORD_CFLAGS)
++AC_SUBST(COLORD_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++AC_ARG_ENABLE([wacom],
++  AS_HELP_STRING([--disable-wacom],
++                 [turn off wacom plugin]),
++       [with_wacom=$enableval],
++       [with_wacom=no]) dnl Default value
++
++if test x$with_wacom = xyes; then
++       PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xtrue")
++
++AC_SUBST(WACOM_CFLAGS)
++AC_SUBST(WACOM_LIBS)
+ 
+ dnl ==============================================
+ dnl PackageKit section
+diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
+--- gnome-settings-daemon-3.3.92//data/Makefile.am	2012-03-16 22:59:35.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//data/Makefile.am	2012-03-25 11:39:24.548364338 +0530
+@@ -11,16 +11,20 @@
+ 	org.gnome.settings-daemon.plugins.gschema.xml			\
+ 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+ 
++if WITH_COLOR
++gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
++endif
++
+ if HAVE_PACKAGEKIT
+ gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
+ else
+@@ -33,6 +37,12 @@
+ all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
+ endif
+ 
++if WITH_WACOM
++gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++endif
++
+ @INTLTOOL_XML_NOMERGE_RULE@
+ 
+ @GSETTINGS_RULES@
+diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
+--- gnome-settings-daemon-3.3.92//plugins/Makefile.am	2012-03-16 22:59:35.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am	2012-03-25 11:37:47.296359651 +0530
+@@ -6,7 +6,6 @@
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+ 	power		\
+@@ -15,13 +14,18 @@
+ 	media-keys	\
+ 	mouse		\
+ 	sound		\
+-	wacom		\
+ 	xrandr		\
+ 	xsettings	\
+ 	$(NULL)
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
+@@ -46,5 +50,11 @@
+ disabled_plugins += print-notifications
+ endif
+ 
++if WITH_WACOM
++enabled_plugins += wacom
++else
++disabled_plugins += wacom
++endif
++
+ SUBDIRS = common $(enabled_plugins)
+ DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
similarity index 69%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
index 53eed8e..f7bbc6a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,48 +19,47 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
++udev" #wacom
 
-# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
-# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-# upower-0.9.11 needed for UpSleepKind
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gconf-2.6.1:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
+	>=gnome-base/gnome-desktop-3.3.92:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-0.9.16
 	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXtst
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
-	>=x11-misc/colord-0.1.13
 	>=media-sound/pulseaudio-0.9.16
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		|| ( sys-fs/udev[gudev]
-			sys-fs/udev[extras] )
+		sys-fs/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
-	policykit? (
-		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2[X] )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( || ( sys-fs/udev[gudev]
-		sys-fs/udev[extras] ) )"
+	smartcard? (
+		sys-fs/udev[gudev] 
+		>=dev-libs/nss-3.11.2 )
+	udev? ( sys-fs/udev[gudev] )"
+# Needs libwacom
+#	wacom? ( x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -86,18 +85,20 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	# TODO: systemd support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--enable-gconf-bridge
-		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		--disable-systemd
+		$(use_enable colord color)
 		$(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)"
+		# TODO: libwacom is needem
+		#$(use_enable wacom)
 }
 
 src_prepare() {
@@ -108,6 +109,11 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 53eed8e..f7bbc6a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,48 +19,47 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
++udev" #wacom
 
-# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
-# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-# upower-0.9.11 needed for UpSleepKind
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gconf-2.6.1:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
+	>=gnome-base/gnome-desktop-3.3.92:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-0.9.16
 	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXtst
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
-	>=x11-misc/colord-0.1.13
 	>=media-sound/pulseaudio-0.9.16
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		|| ( sys-fs/udev[gudev]
-			sys-fs/udev[extras] )
+		sys-fs/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
-	policykit? (
-		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2[X] )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( || ( sys-fs/udev[gudev]
-		sys-fs/udev[extras] ) )"
+	smartcard? (
+		sys-fs/udev[gudev] 
+		>=dev-libs/nss-3.11.2 )
+	udev? ( sys-fs/udev[gudev] )"
+# Needs libwacom
+#	wacom? ( x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -86,18 +85,20 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	# TODO: systemd support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--enable-gconf-bridge
-		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		--disable-systemd
+		$(use_enable colord color)
 		$(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)"
+		# TODO: libwacom is needem
+		#$(use_enable wacom)
 }
 
 src_prepare() {
@@ -108,6 +109,11 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 }
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2012-04-06  8:38 Alexandre Restovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Restovtsev @ 2012-04-06  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     3a4a482651f7d7d9e5a00efba702074c492d273f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 08:24:47 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 08:38:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a4a4826

gnome-base/gnome-settings-daemon: 3.3.92 → 3.4.0

Now with systemd and wacom support.

---
 ...ttings-daemon-3.4.0-optional-color-wacom.patch} |   12 +++++-----
 ...2.ebuild => gnome-settings-daemon-3.4.0.ebuild} |   23 ++++++++++---------
 .../gnome-settings-daemon-9999.ebuild              |   23 ++++++++++---------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
similarity index 94%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
index 6af221d..045b4d6 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
@@ -12,14 +12,14 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.
 +       [with_color=$enableval],
 +       [with_color=yes]) dnl Default value
 +
-+if test x$WANT_COLOR = xyes; then
++if test x$with_color = xyes; then
 +       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled])
 +fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue")
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
 +
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
  
  dnl ---------------------------------------------------------------------------
  dnl - wacom
@@ -36,7 +36,7 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.
 +       PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
 +       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
 +fi
-+AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xtrue")
++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes")
 +
 +AC_SUBST(WACOM_CFLAGS)
 +AC_SUBST(WACOM_LIBS)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
similarity index 89%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
index f7bbc6a..1a3a652 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
-+udev" #wacom
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
@@ -57,9 +56,10 @@ COMMON_DEPEND="
 	smartcard? (
 		sys-fs/udev[gudev] 
 		>=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[gudev] )"
-# Needs libwacom
-#	wacom? ( x11-drivers/xf86-input-wacom )"
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
 	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -89,16 +91,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--disable-systemd
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
-		$(use_enable udev gudev)"
-		# TODO: libwacom is needem
-		#$(use_enable wacom)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
 }
 
 src_prepare() {
@@ -110,7 +111,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
 
 	eautoreconf
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index f7bbc6a..1a3a652 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
-+udev" #wacom
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
@@ -57,9 +56,10 @@ COMMON_DEPEND="
 	smartcard? (
 		sys-fs/udev[gudev] 
 		>=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[gudev] )"
-# Needs libwacom
-#	wacom? ( x11-drivers/xf86-input-wacom )"
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
 	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -89,16 +91,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--disable-systemd
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
-		$(use_enable udev gudev)"
-		# TODO: libwacom is needem
-		#$(use_enable wacom)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
 }
 
 src_prepare() {
@@ -110,7 +111,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
 
 	eautoreconf
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2012-09-09 12:43 Nirbheek Chauhan
  0 siblings, 0 replies; 20+ messages in thread
From: Nirbheek Chauhan @ 2012-09-09 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     af4e6fdb6a04ec305221bea3a7a3b23c77cda7ab
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 10:02:25 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 12:11:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=af4e6fdb

Add gnome-base/gnome-settings-daemon-3.5.91

---
 ...tings-daemon-3.0.2-short-touchpad-timeout.patch |   13 --
 ...ettings-daemon-3.4.0-optional-color-wacom.patch |  127 --------------------
 ...ttings-daemon-3.5.91-optional-color-wacom.patch |   95 +++++++++++++++
 ...ings-daemon-3.5.91-short-touchpad-timeout.patch |   13 ++
 ....ebuild => gnome-settings-daemon-3.5.91.ebuild} |   26 ++--
 .../gnome-settings-daemon-9999.ebuild              |   26 ++--
 6 files changed, 136 insertions(+), 164 deletions(-)

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
deleted file mode 100644
index a87a3d9..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.4.0-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
deleted file mode 100644
index 045b4d6..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
---- gnome-settings-daemon-3.3.92//configure.ac	2012-03-19 14:23:38.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//configure.ac	2012-03-25 11:36:35.833356226 +0530
-@@ -194,13 +194,39 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+AC_ARG_ENABLE([wacom],
-+  AS_HELP_STRING([--disable-wacom],
-+                 [turn off wacom plugin]),
-+       [with_wacom=$enableval],
-+       [with_wacom=no]) dnl Default value
-+
-+if test x$with_wacom = xyes; then
-+       PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes")
-+
-+AC_SUBST(WACOM_CFLAGS)
-+AC_SUBST(WACOM_LIBS)
- 
- dnl ==============================================
- dnl PackageKit section
-diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
---- gnome-settings-daemon-3.3.92//data/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//data/Makefile.am	2012-03-25 11:39:24.548364338 +0530
-@@ -11,16 +11,20 @@
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
--	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if WITH_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
-@@ -33,6 +37,12 @@
- all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
- endif
- 
-+if WITH_WACOM
-+gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+endif
-+
- @INTLTOOL_XML_NOMERGE_RULE@
- 
- @GSETTINGS_RULES@
-diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
---- gnome-settings-daemon-3.3.92//plugins/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am	2012-03-25 11:37:47.296359651 +0530
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -15,13 +14,18 @@
- 	media-keys	\
- 	mouse		\
- 	sound		\
--	wacom		\
- 	xrandr		\
- 	xsettings	\
- 	$(NULL)
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
-@@ -46,5 +50,11 @@
- disabled_plugins += print-notifications
- endif
- 
-+if WITH_WACOM
-+enabled_plugins += wacom
-+else
-+disabled_plugins += wacom
-+endif
-+
- SUBDIRS = common $(enabled_plugins)
- DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
new file mode 100644
index 0000000..3605630
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
@@ -0,0 +1,95 @@
+--- configure.ac
++++ configure.ac
+@@ -240,7 +240,20 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom (disabled for s390/s390x and non Linux platforms)
+@@ -252,11 +265,22 @@
+       have_wacom=no
+     else
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++	AC_ARG_ENABLE([wacom],
++	  AS_HELP_STRING([--disable-wacom],
++	                 [turn off wacom plugin]),
++	       [with_wacom=$enableval],
++	       [with_wacom=no]) dnl Default value
++	
++	if test x$with_wacom = xyes; then
++		PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++      		have_wacom=yes
++	fi
++	
++	AC_SUBST(WACOM_CFLAGS)
++	AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -11,7 +11,6 @@
+ 	org.gnome.settings-daemon.plugins.gschema.xml			\
+ 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+@@ -20,6 +19,12 @@
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+ 
++if WITH_COLOR
++gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
++endif
++
+ if HAVE_PACKAGEKIT
+ gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
+ else
+--- plugins/Makefile.am
++++ plugins/Makefile.am
+@@ -6,7 +6,6 @@
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+ 	power		\
+@@ -21,6 +20,12 @@
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
new file mode 100644
index 0000000..b011009
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-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)
+ 
+                 g_ptr_array_add (args, "syndaemon");
+                 g_ptr_array_add (args, "-i");
+-                g_ptr_array_add (args, "1.0");
++                g_ptr_array_add (args, "0.5");
+                 g_ptr_array_add (args, "-t");
+                 g_ptr_array_add (args, "-K");
+                 g_ptr_array_add (args, "-R");

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.91.ebuild
similarity index 82%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.91.ebuild
index 3ad8a9d..da9f279 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.2 2012/08/07 08:59:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,20 +16,19 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
 	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.3.92:3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	>=gnome-base/gnome-desktop-3.5.3:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.90
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
@@ -40,25 +39,26 @@ COMMON_DEPEND="
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
+	x11-libs/libxkbfile
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
 	>=media-sound/pulseaudio-0.9.16
 
 	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
 	packagekit? (
 		sys-fs/udev[gudev]
-		>=app-admin/packagekit-base-0.6.12 )
+		>=app-admin/packagekit-base-0.7.4 )
 	smartcard? (
 		sys-fs/udev[gudev]
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.3
+	wacom? ( >=dev-libs/libwacom-0.5
 		x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
@@ -76,11 +76,11 @@ RDEPEND="${COMMON_DEPEND}
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
+	dev-libs/libxml2:2
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	x11-proto/inputproto
-	x11-proto/kbproto
 	x11-proto/xf86miscproto
 	>=x11-proto/xproto-7.0.15"
 
@@ -90,10 +90,12 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
+		--enable-man
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
+		$(use_enable i18n ibus)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
 		$(use_enable systemd)
@@ -107,12 +109,12 @@ src_prepare() {
 	# 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"
+		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
 
-	eautoreconf
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 3ad8a9d..da9f279 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.2 2012/08/07 08:59:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,20 +16,19 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
 	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.3.92:3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	>=gnome-base/gnome-desktop-3.5.3:3
+	>=gnome-base/gsettings-desktop-schemas-3.5.90
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
@@ -40,25 +39,26 @@ COMMON_DEPEND="
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
+	x11-libs/libxkbfile
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
 	>=media-sound/pulseaudio-0.9.16
 
 	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
 	packagekit? (
 		sys-fs/udev[gudev]
-		>=app-admin/packagekit-base-0.6.12 )
+		>=app-admin/packagekit-base-0.7.4 )
 	smartcard? (
 		sys-fs/udev[gudev]
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.3
+	wacom? ( >=dev-libs/libwacom-0.5
 		x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
@@ -76,11 +76,11 @@ RDEPEND="${COMMON_DEPEND}
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
+	dev-libs/libxml2:2
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	x11-proto/inputproto
-	x11-proto/kbproto
 	x11-proto/xf86miscproto
 	>=x11-proto/xproto-7.0.15"
 
@@ -90,10 +90,12 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
+		--enable-man
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
+		$(use_enable i18n ibus)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
 		$(use_enable systemd)
@@ -107,12 +109,12 @@ src_prepare() {
 	# 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"
+		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
 
-	eautoreconf
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2012-09-27  5:21 Priit Laes
  0 siblings, 0 replies; 20+ messages in thread
From: Priit Laes @ 2012-09-27  5:21 UTC (permalink / raw
  To: gentoo-commits

commit:     1b245a6d28cd224f17af04eee99b1249555ff621
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Sep 27 05:19:15 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Sep 27 05:19:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b245a6d

gnome-base/gnome-settings-daemon: 3.5.92 → 3.6.0

---
 .../gnome-settings-daemon-3.6.0-crashfix.patch     |   29 ++++++++++++++++++++
 ...2.ebuild => gnome-settings-daemon-3.6.0.ebuild} |    0
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
new file mode 100644
index 0000000..3980fbd
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
@@ -0,0 +1,29 @@
+From dcfe290500e0d68a71f09e576e28c09f7572cef6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 21 Sep 2012 11:46:34 +0000
+Subject: housekeeping: Don't crash on exit
+
+If a notification popup was shown, and then dismissed, notification
+wouldn't have been reset, and we would crash on exit trying to
+dismiss it.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=859383
+https://bugzilla.gnome.org/show_bug.cgi?id=684548
+
+Also includes 63b8c025d446b1a8d7c5fdee92d624dd604f3a24 (typo fix)
+
+---
+diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
+index 4c6b3c5..51e4a8e 100644
+--- a/plugins/housekeeping/gsd-disk-space.c
++++ b/plugins/housekeeping/gsd-disk-space.c
+@@ -294,6 +294,7 @@ static void
+ on_notification_closed (NotifyNotification *notification)
+ {
+         g_object_unref (notification);
++        notification = NULL;
+ }
+ 
+ static gboolean
+--
+cgit v0.9.0.2

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.92.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0.ebuild
similarity index 100%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.5.92.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0.ebuild


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2012-10-30 21:28 Gilles Dartiguelongue
  0 siblings, 0 replies; 20+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-30 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     cb8b7ec2d79adae9e5be0ae831d4d9ade627f22f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 21:24:10 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 21:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb8b7ec2

gnome-base/gnome-settings-daemon: 3.6.0-r1 → 3.6.1

Drop dconf varible env.d creation since it is handled by dconf ebuild.

---
 .../gnome-settings-daemon-3.6.0-crashfix.patch     |   29 --------------------
 ...1.ebuild => gnome-settings-daemon-3.6.1.ebuild} |   26 ++++++-----------
 .../gnome-settings-daemon-9999.ebuild              |   23 ++++++---------
 gnome-base/gnome-settings-daemon/metadata.xml      |   19 +++++++++++++
 4 files changed, 37 insertions(+), 60 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
deleted file mode 100644
index 3980fbd..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dcfe290500e0d68a71f09e576e28c09f7572cef6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 21 Sep 2012 11:46:34 +0000
-Subject: housekeeping: Don't crash on exit
-
-If a notification popup was shown, and then dismissed, notification
-wouldn't have been reset, and we would crash on exit trying to
-dismiss it.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=859383
-https://bugzilla.gnome.org/show_bug.cgi?id=684548
-
-Also includes 63b8c025d446b1a8d7c5fdee92d624dd604f3a24 (typo fix)
-
----
-diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
-index 4c6b3c5..51e4a8e 100644
---- a/plugins/housekeeping/gsd-disk-space.c
-+++ b/plugins/housekeeping/gsd-disk-space.c
-@@ -294,6 +294,7 @@ static void
- on_notification_closed (NotifyNotification *notification)
- {
-         g_object_unref (notification);
-+        notification = NULL;
- }
- 
- static gboolean
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
similarity index 90%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
index 016f92b..b7f5c48 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )"
+	wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
+"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -72,7 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
 
-	!systemd? ( sys-auth/consolekit )"
+	!systemd? ( sys-auth/consolekit )
+"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -82,9 +85,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
+	>=x11-proto/xproto-7.0.15
+"
 
-pkg_setup() {
+src_prepare() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	G2CONF="${G2CONF}
@@ -101,9 +105,7 @@ pkg_setup() {
 		$(use_enable systemd)
 		$(use_enable udev gudev)
 		$(use_enable wacom)"
-}
 
-src_prepare() {
 	# 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.
@@ -114,9 +116,6 @@ src_prepare() {
 	# Make colord and wacom optional; requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
 
-	# Fixes crash; in next release
-	epatch "${FILESDIR}/${P}-crashfix.patch"
-
 	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
@@ -125,10 +124,3 @@ src_prepare() {
 src_test() {
 	Xemake check
 }
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf
-}

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 162a4de..b7f5c48 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )"
+	wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
+"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -72,7 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
 
-	!systemd? ( sys-auth/consolekit )"
+	!systemd? ( sys-auth/consolekit )
+"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -82,9 +85,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
+	>=x11-proto/xproto-7.0.15
+"
 
-pkg_setup() {
+src_prepare() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	G2CONF="${G2CONF}
@@ -101,9 +105,7 @@ pkg_setup() {
 		$(use_enable systemd)
 		$(use_enable udev gudev)
 		$(use_enable wacom)"
-}
 
-src_prepare() {
 	# 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.
@@ -122,10 +124,3 @@ src_prepare() {
 src_test() {
 	Xemake check
 }
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf
-}

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
new file mode 100644
index 0000000..7e1cb01
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="colord">Support color management using
+			<pkg>x11-misc/colord</pkg></flag>
+    <flag name="i18n">Enable support for enhanced input methods through
+			<pkg>app-i18n/ibus</pkg></flag>
+    <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 fast typists</flag>
+    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+    <flag name="wacom">Enable support for Wacom tablets and drawing
+			devices</flag>
+  </use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2013-01-22  8:12 Alexandre Rostovtsev
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Rostovtsev @ 2013-01-22  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f1bac0adbc25cc2fdea3559a5295c5bc2e7baba6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 08:00:43 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Jan 22 08:10:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f1bac0ad

gnome-base/gnome-settings-daemon: sync with gx86

Update patch, rename USE=wacom to INPUT_DEVICES=wacom, modernize ebuild.

---
 ...ttings-daemon-3.6.4-optional-color-wacom.patch} |   49 ++++++--------------
 .../gnome-settings-daemon-9999.ebuild              |   47 +++++++++----------
 gnome-base/gnome-settings-daemon/metadata.xml      |    4 --
 3 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
similarity index 66%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
index 3605630..bd02900 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
@@ -1,6 +1,8 @@
---- configure.ac
-+++ configure.ac
-@@ -240,7 +240,20 @@
+diff --git a/configure.ac b/configure.ac
+index d1739c4..752c09d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,7 +241,20 @@ dnl ---------------------------------------------------------------------------
  dnl - color
  dnl ---------------------------------------------------------------------------
  
@@ -22,7 +24,7 @@
  
  dnl ---------------------------------------------------------------------------
  dnl - wacom (disabled for s390/s390x and non Linux platforms)
-@@ -252,11 +265,22 @@
+@@ -253,11 +266,22 @@ case $host_os in
        have_wacom=no
      else
        if test x$enable_gudev != xno; then
@@ -32,12 +34,12 @@
 +	                 [turn off wacom plugin]),
 +	       [with_wacom=$enableval],
 +	       [with_wacom=no]) dnl Default value
-+	
++
 +	if test x$with_wacom = xyes; then
 +		PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+      		have_wacom=yes
++		have_wacom=yes
 +	fi
-+	
++
 +	AC_SUBST(WACOM_CFLAGS)
 +	AC_SUBST(WACOM_LIBS)
        else
@@ -47,32 +49,11 @@
      fi
      ;;
    *)
---- data/Makefile.am
-+++ data/Makefile.am
-@@ -11,7 +11,6 @@
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
-@@ -20,6 +19,12 @@
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if WITH_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
---- plugins/Makefile.am
-+++ plugins/Makefile.am
-@@ -6,7 +6,6 @@
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 69b7181..a1cdf6c 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
  	automount	\
  	background	\
  	clipboard	\
@@ -80,7 +61,7 @@
  	cursor		\
  	dummy		\
  	power		\
-@@ -21,6 +20,12 @@
+@@ -22,6 +21,12 @@ enabled_plugins =	\
  
  disabled_plugins = $(NULL)
  

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 15ad767..406cf80 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,20 +14,20 @@ fi
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
+IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 REQUIRED_USE="
 	packagekit? ( udev )
 	smartcard? ( udev )
 "
 
-# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+# require colord-0.1.27 dependency for connection type support
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
 	>=x11-libs/gtk+-3.3.4:3
@@ -50,16 +50,16 @@ COMMON_DEPEND="
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
 
-	colord? ( >=x11-misc/colord-0.1.13 )
+	colord? ( >=x11-misc/colord-0.1.27:= )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
 	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
-	wacom? (
-		>=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )
 "
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
@@ -96,7 +96,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.6.4-optional-color-wacom.patch"
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 
@@ -106,20 +106,19 @@ src_prepare() {
 src_configure() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-man
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable debug more-warnings)
-		$(use_enable i18n ibus)
-		$(use_enable packagekit)
-		$(use_enable smartcard smartcard-support)
-		$(use_enable systemd)
-		$(use_enable udev gudev)
-		$(use_enable wacom)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable i18n ibus) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
 }
 
 src_test() {

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 7e1cb01..80031f8 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -11,9 +11,5 @@
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
     <flag name="short-touchpad-timeout">Change the touchpad timeout so that 
 			it's effective for fast typists</flag>
-    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
-			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-    <flag name="wacom">Enable support for Wacom tablets and drawing
-			devices</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2013-12-09 23:34 Gilles Dartiguelongue
  0 siblings, 0 replies; 20+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-09 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b812c21f5002d2c4d3a55c52a36cc7910aa4c847
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 23:32:44 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 23:33:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b812c21f

gnome-base/gnome-settings-daemon: 3.8.6.1 → 3.10.2

---
 .../gnome-settings-daemon-3.10.2-optional.patch    | 89 ++++++++++++++++++++++
 ...ettings-daemon-3.6.4-optional-color-wacom.patch | 76 ------------------
 ...ngs-daemon-3.7.90-short-touchpad-timeout.patch} | 16 +++-
 ....ebuild => gnome-settings-daemon-3.10.2.ebuild} | 75 ++++++++++--------
 .../gnome-settings-daemon-9999.ebuild              | 74 +++++++++++-------
 5 files changed, 196 insertions(+), 134 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
new file mode 100644
index 0000000..213d0a7
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
@@ -0,0 +1,89 @@
+From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac        | 30 ++++++++++++++++++++++++++----
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f3b7ed..5720d36 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -276,12 +289,21 @@ case $host_os in
+       have_wacom=no
+     else
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++        AC_ARG_ENABLE([wacom],
++          AS_HELP_STRING([--disable-wacom],
++                         [turn off wacom plugin]),
++                      [with_wacom=$enableval],
++                      [with_wacom=no]) dnl Default value
++        if test x$with_wacom = xyes; then
++          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++          have_wacom=yes
++        fi
++        AC_SUBST(WACOM_CFLAGS)
++        AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 2f4840d..d517e77 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -22,6 +21,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
+-- 
+1.8.3.2
+

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
deleted file mode 100644
index bd02900..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d1739c4..752c09d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -241,7 +241,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom (disabled for s390/s390x and non Linux platforms)
-@@ -253,11 +266,22 @@ case $host_os in
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+	AC_ARG_ENABLE([wacom],
-+	  AS_HELP_STRING([--disable-wacom],
-+	                 [turn off wacom plugin]),
-+	       [with_wacom=$enableval],
-+	       [with_wacom=no]) dnl Default value
-+
-+	if test x$with_wacom = xyes; then
-+		PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+		have_wacom=yes
-+	fi
-+
-+	AC_SUBST(WACOM_CFLAGS)
-+	AC_SUBST(WACOM_LIBS)
-       else
-         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-       fi
--      have_wacom=yes
-     fi
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 69b7181..a1cdf6c 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
similarity index 54%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
index b011009..7dc410f 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
@@ -1,8 +1,17 @@
+From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Mon, 25 Feb 2013 17:24:25 +0330
+Subject: [PATCH] gnome-settings-daemon-3.7.90-short-touchpad-timeout
+
+---
+ plugins/mouse/gsd-mouse-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
-index 80f664a..c9a29fb 100644
+index a62800a..e7d39e1 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)
+@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
  
                  g_ptr_array_add (args, "syndaemon");
                  g_ptr_array_add (args, "-i");
@@ -11,3 +20,6 @@ index 80f664a..c9a29fb 100644
                  g_ptr_array_add (args, "-t");
                  g_ptr_array_add (args, "-K");
                  g_ptr_array_add (args, "-R");
+-- 
+1.8.1.2
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
similarity index 57%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
index 406cf80..0abb3fb 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
@@ -6,38 +6,31 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit autotools eutils gnome2 systemd virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="
 	packagekit? ( udev )
 	smartcard? ( udev )
 "
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
-# require colord-0.1.27 dependency for connection type support
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/gnome-desktop-3.5.3:3=
-	>=gnome-base/gsettings-desktop-schemas-3.5.90
+	>=dev-libs/glib-2.37.7:2
+	>=x11-libs/gtk+-3.7.8:3
+	>=gnome-base/gnome-desktop-3.9:3=
+	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-0.9.16
+	>=media-sound/pulseaudio-2
 	>=sys-power/upower-0.9.11
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -50,30 +43,36 @@ COMMON_DEPEND="
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
 
-	colord? ( >=x11-misc/colord-0.1.27:= )
+	app-misc/geoclue:2.0
+	>=dev-libs/libgweather-3.9.5:2
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? ( >=x11-misc/colord-1.0.2:= )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
 	input_devices_wacom? (
-		>=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )
-	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/udev[gudev] )
+	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
 "
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
 	>=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
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
-
-	!systemd? ( sys-auth/consolekit )
 "
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
@@ -93,19 +92,18 @@ src_prepare() {
 	# 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.5.91-short-touchpad-timeout.patch"
+		epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.6.4-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.10.2-optional.patch"
 
-	[[ ${PV} != 9999 ]] && eautoreconf
+	epatch_user
+	eautoreconf
 
 	gnome2_src_prepare
 }
 
 src_configure() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	gnome2_src_configure \
 		--disable-static \
 		--enable-man \
@@ -116,7 +114,6 @@ src_configure() {
 		$(use_enable i18n ibus) \
 		$(use_enable packagekit) \
 		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd) \
 		$(use_enable udev gudev) \
 		$(use_enable input_devices_wacom wacom)
 }
@@ -124,3 +121,21 @@ src_configure() {
 src_test() {
 	Xemake check
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 406cf80..26d4d22 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -6,38 +6,38 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 virtualx
+inherit autotools eutils gnome2 systemd virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="
 	packagekit? ( udev )
 	smartcard? ( udev )
 "
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
 
-# require colord-0.1.27 dependency for connection type support
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/gnome-desktop-3.5.3:3=
-	>=gnome-base/gsettings-desktop-schemas-3.5.90
+	>=dev-libs/glib-2.37.7:2
+	>=x11-libs/gtk+-3.7.8:3
+	>=gnome-base/gnome-desktop-3.9:3=
+	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-0.9.16
+	>=media-sound/pulseaudio-2
 	>=sys-power/upower-0.9.11
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -50,30 +50,36 @@ COMMON_DEPEND="
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
 
-	colord? ( >=x11-misc/colord-0.1.27:= )
+	app-misc/geoclue:2.0
+	>=dev-libs/libgweather-3.9.5:2
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? ( >=x11-misc/colord-1.0.2:= )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
 	input_devices_wacom? (
-		>=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )
-	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/udev[gudev] )
+	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
 "
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
 	>=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
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
-
-	!systemd? ( sys-auth/consolekit )
 "
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
@@ -93,19 +99,18 @@ src_prepare() {
 	# 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.5.91-short-touchpad-timeout.patch"
+		epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.6.4-optional-color-wacom.patch"
+	epatch "${FILESDIR}/${PN}-3.10.2-optional.patch"
 
+	epatch_user
 	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
 }
 
 src_configure() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	gnome2_src_configure \
 		--disable-static \
 		--enable-man \
@@ -116,7 +121,6 @@ src_configure() {
 		$(use_enable i18n ibus) \
 		$(use_enable packagekit) \
 		$(use_enable smartcard smartcard-support) \
-		$(use_enable systemd) \
 		$(use_enable udev gudev) \
 		$(use_enable input_devices_wacom wacom)
 }
@@ -124,3 +128,21 @@ src_configure() {
 src_test() {
 	Xemake check
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2014-04-20 18:17 Gilles Dartiguelongue
  0 siblings, 0 replies; 20+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     834b4ee46d6aaefc686cd884cfee8f96c19e3e50
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 16 23:11:54 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:23 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=834b4ee4

gnome-base/gnome-settings-daemon: 3.10.2 → 3.12.0

Bump gnome-settings-daemon, updating the patch to keep wacom/colord optional.

---
 .../gnome-settings-daemon-3.12.0-optional.patch    |  82 ++++++++++++
 .../gnome-settings-daemon-3.12.0.ebuild            | 141 +++++++++++++++++++++
 2 files changed, 223 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
new file mode 100644
index 0000000..cb117d7
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
@@ -0,0 +1,82 @@
+diff --git a/configure.ac b/configure.ac
+index dd95dd4..03d651c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,7 +248,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -279,15 +292,25 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
++      have_wacom=no
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++        AC_ARG_ENABLE([wacom],
++          AS_HELP_STRING([--disable-wacom],
++                         [turn off wacom plugin]),
++                         [with_wacom=$enableval],
++                         [with_wacom=no]) dnl Default value
++        if test x$with_wacom = xyes; then
++          PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++          have_wacom=yes
++          AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++        fi
++        AC_SUBST(WACOM_CFLAGS)
++        AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 04f8e2a..55ed94c 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -21,6 +20,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
new file mode 100644
index 0000000..4a025bd
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 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.10.2.ebuild,v 1.5 2014/03/09 11:58:52 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 systemd virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
+REQUIRED_USE="
+	packagekit? ( udev )
+	smartcard? ( udev )
+"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.7:2
+	>=x11-libs/gtk+-3.7.8:3
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/librsvg-2.36.2
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-2
+	>=sys-power/upower-0.99.0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+
+	>=app-misc/geoclue-2.1.2:2.0
+	>=dev-libs/libgweather-3.9.5:2
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? ( >=x11-misc/colord-1.0.2:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/udev[gudev] )
+	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	udev? ( virtual/udev[gudev] )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
+	>=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
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15
+"
+
+src_prepare() {
+	# 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.7.90-short-touchpad-timeout.patch"
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
+
+	epatch_user
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable i18n ibus) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	Xemake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "http://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2014-04-20 18:17 Gilles Dartiguelongue
  0 siblings, 0 replies; 20+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ae15f14622daac438b78e2c95de31dd4c8c78702
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 14:16:35 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae15f146

gnome-base/gnome-settings-daemon: QAed

* Add missing xkeyboard-config dependency.
* Fix keywords.
* Remove old revision of optional patch.
* Sync live ebuild.

---
 .../gnome-settings-daemon-3.10.2-optional.patch    | 89 ----------------------
 .../gnome-settings-daemon-3.12.0.ebuild            |  7 +-
 .../gnome-settings-daemon-9999.ebuild              |  9 ++-
 3 files changed, 9 insertions(+), 96 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
deleted file mode 100644
index 213d0a7..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 10 Dec 2013 00:27:27 +0100
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac        | 30 ++++++++++++++++++++++++++----
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 32 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f3b7ed..5720d36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -276,12 +289,21 @@ case $host_os in
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+        AC_ARG_ENABLE([wacom],
-+          AS_HELP_STRING([--disable-wacom],
-+                         [turn off wacom plugin]),
-+                      [with_wacom=$enableval],
-+                      [with_wacom=no]) dnl Default value
-+        if test x$with_wacom = xyes; then
-+          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+          have_wacom=yes
-+        fi
-+        AC_SUBST(WACOM_CFLAGS)
-+        AC_SUBST(WACOM_LIBS)
-       else
-         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-       fi
--      have_wacom=yes
-     fi
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 2f4840d..d517e77 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
--- 
-1.8.3.2
-

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
index 4a025bd..2d40849 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.2.ebuild,v 1.5 2014/03/09 11:58:52 pacho Exp $
+# $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	packagekit? ( udev )
 	smartcard? ( udev )
 "
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.7:2
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99.0
+	>=sys-power/upower-0.99
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=
@@ -42,6 +42,7 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
 
 	>=app-misc/geoclue-2.1.2:2.0
 	>=dev-libs/libgweather-3.9.5:2

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 223a4ac..ebdba0b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -30,7 +30,7 @@ fi
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.7:2
 	>=x11-libs/gtk+-3.7.8:3
-	>=gnome-base/gnome-desktop-3.9:3=
+	>=gnome-base/gnome-desktop-3.11.1:3=
 	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
 	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.9.11
+	>=sys-power/upower-0.99
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=
@@ -49,8 +49,9 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
 
-	app-misc/geoclue:2.0
+	>=app-misc/geoclue-2.1.2:2.0
 	>=dev-libs/libgweather-3.9.5:2
 	>=sci-geosciences/geocode-glib-3.10
 	>=sys-auth/polkit-0.103
@@ -102,7 +103,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.10.2-optional.patch"
+	epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
 
 	epatch_user
 	[[ ${PV} != 9999 ]] && eautoreconf


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2014-10-11 23:11 Gilles Dartiguelongue
  0 siblings, 0 replies; 20+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-11 23:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a4894da9617b19e48764bebd743477d2cbd9a967
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 22:32:11 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 22:32:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a4894da9

gnome-base/gnome-settings-daemon: 3.12.3 → 3.14.0

---
 ...=> gnome-settings-daemon-3.14.0-optional.patch} | 27 ++++++++++++++++------
 ....ebuild => gnome-settings-daemon-3.14.0.ebuild} | 25 ++++++++++----------
 .../gnome-settings-daemon-9999.ebuild              | 25 ++++++++++----------
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
similarity index 82%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
index cb117d7..a7a56b0 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
@@ -1,8 +1,18 @@
+From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac        | 35 +++++++++++++++++++++++++++++------
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index dd95dd4..03d651c 100644
+index c42ea8b..26ccd36 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -248,7 +248,20 @@ dnl ---------------------------------------------------------------------------
+@@ -225,7 +225,20 @@ dnl ---------------------------------------------------------------------------
  dnl - color
  dnl ---------------------------------------------------------------------------
  
@@ -24,7 +34,7 @@ index dd95dd4..03d651c 100644
  
  dnl ---------------------------------------------------------------------------
  dnl - datetime
-@@ -279,15 +292,25 @@ case $host_os in
+@@ -256,15 +269,25 @@ case $host_os in
      if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
        have_wacom=no
      else
@@ -56,7 +66,7 @@ index dd95dd4..03d651c 100644
      ;;
    *)
 diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 04f8e2a..55ed94c 100644
+index 7bb01f0..7cc3655 100644
 --- a/plugins/Makefile.am
 +++ b/plugins/Makefile.am
 @@ -4,7 +4,6 @@ enabled_plugins =	\
@@ -67,7 +77,7 @@ index 04f8e2a..55ed94c 100644
  	cursor		\
  	datetime	\
  	dummy		\
-@@ -21,6 +20,12 @@ enabled_plugins =	\
+@@ -22,6 +21,12 @@ enabled_plugins =	\
  
  disabled_plugins = $(NULL)
  
@@ -77,6 +87,9 @@ index 04f8e2a..55ed94c 100644
 +disabled_plugins += color
 +endif
 +
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
  else
+-- 
+2.1.2
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
similarity index 86%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
index 2d40849..b4b6112 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
@@ -6,16 +6,15 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 systemd virtualx
+inherit autotools eutils gnome2 systemd udev virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="
-	packagekit? ( udev )
 	smartcard? ( udev )
 "
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
@@ -31,7 +30,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=
@@ -51,15 +50,14 @@ COMMON_DEPEND="
 
 	colord? ( >=x11-misc/colord-1.0.2:= )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7
 		>=x11-libs/pango-1.20
 		x11-drivers/xf86-input-wacom
-		virtual/udev[gudev] )
-	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+		virtual/libgudev:= )
+	networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/udev[gudev] )
+	udev? ( virtual/libgudev:= )
 "
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
@@ -93,10 +91,10 @@ src_prepare() {
 	# 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.7.90-short-touchpad-timeout.patch"
+		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
 
 	epatch_user
 	eautoreconf
@@ -112,8 +110,7 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable debug) \
 		$(use_enable debug more-warnings) \
-		$(use_enable i18n ibus) \
-		$(use_enable packagekit) \
+		$(use_enable networkmanager network-manager) \
 		$(use_enable smartcard smartcard-support) \
 		$(use_enable udev gudev) \
 		$(use_enable input_devices_wacom wacom)
@@ -123,6 +120,10 @@ src_test() {
 	Xemake check
 }
 
+src_install() {
+	gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index ebdba0b..4d2af19 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 systemd virtualx
+inherit autotools eutils gnome2 systemd udev virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,9 +16,8 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="
-	packagekit? ( udev )
 	smartcard? ( udev )
 "
 if [[ ${PV} = 9999 ]]; then
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=
@@ -58,15 +57,14 @@ COMMON_DEPEND="
 
 	colord? ( >=x11-misc/colord-1.0.2:= )
 	cups? ( >=net-print/cups-1.4[dbus] )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7
 		>=x11-libs/pango-1.20
 		x11-drivers/xf86-input-wacom
-		virtual/udev[gudev] )
-	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+		virtual/libgudev:= )
+	networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/udev[gudev] )
+	udev? ( virtual/libgudev:= )
 "
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
@@ -100,10 +98,10 @@ src_prepare() {
 	# 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.7.90-short-touchpad-timeout.patch"
+		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
 
 	epatch_user
 	[[ ${PV} != 9999 ]] && eautoreconf
@@ -119,8 +117,7 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable debug) \
 		$(use_enable debug more-warnings) \
-		$(use_enable i18n ibus) \
-		$(use_enable packagekit) \
+		$(use_enable networkmanager network-manager) \
 		$(use_enable smartcard smartcard-support) \
 		$(use_enable udev gudev) \
 		$(use_enable input_devices_wacom wacom)
@@ -130,6 +127,10 @@ src_test() {
 	Xemake check
 }
 
+src_install() {
+	gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2015-04-29 19:00 Ole Reifschneider
  0 siblings, 0 replies; 20+ messages in thread
From: Ole Reifschneider @ 2015-04-29 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     46a4b8c1a4c60b85116b718af776eb9e248620e9
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 20:29:22 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 20:30:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=46a4b8c1

Bump gnome-settings-daemon to 3.16.1

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 7E8B4D42

 ...=> gnome-settings-daemon-3.16.0-optional.patch} | 20 ++++++++---------
 ....ebuild => gnome-settings-daemon-3.16.1.ebuild} | 26 +++++++++-------------
 .../gnome-settings-daemon-9999.ebuild              | 13 ++++++-----
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
similarity index 89%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
index a7a56b0..46d9739 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch
@@ -1,6 +1,6 @@
-From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 10 Dec 2013 00:27:27 +0100
+From 8b526c757f0e977eeda9285762e137deba0a31f4 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Sat, 11 Apr 2015 23:10:21 +0200
 Subject: [PATCH] Make colord and wacom support optional
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH] Make colord and wacom support optional
  2 files changed, 35 insertions(+), 7 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index c42ea8b..26ccd36 100644
+index 50a6bb1..a42ec20 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -225,7 +225,20 @@ dnl ---------------------------------------------------------------------------
+@@ -236,7 +236,20 @@ dnl ---------------------------------------------------------------------------
  dnl - color
  dnl ---------------------------------------------------------------------------
  
@@ -34,7 +34,7 @@ index c42ea8b..26ccd36 100644
  
  dnl ---------------------------------------------------------------------------
  dnl - datetime
-@@ -256,15 +269,25 @@ case $host_os in
+@@ -267,15 +280,25 @@ case $host_os in
      if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
        have_wacom=no
      else
@@ -66,7 +66,7 @@ index c42ea8b..26ccd36 100644
      ;;
    *)
 diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 7bb01f0..7cc3655 100644
+index 7365953..779b5d9 100644
 --- a/plugins/Makefile.am
 +++ b/plugins/Makefile.am
 @@ -4,7 +4,6 @@ enabled_plugins =	\
@@ -74,10 +74,10 @@ index 7bb01f0..7cc3655 100644
  	a11y-settings	\
  	clipboard	\
 -	color		\
- 	cursor		\
  	datetime	\
  	dummy		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
+ 	power		\
+@@ -21,6 +20,12 @@ enabled_plugins =	\
  
  disabled_plugins = $(NULL)
  
@@ -91,5 +91,5 @@ index 7bb01f0..7cc3655 100644
  enabled_plugins += smartcard
  else
 -- 
-2.1.2
+2.0.5
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild
similarity index 88%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild
index 7482043..d152d45 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild,v 1.1 2015/03/28 16:07:02 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,31 +8,25 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
 REQUIRED_USE="
+	input_devices_wacom? ( udev )
 	smartcard? ( udev )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2
-	>=x11-libs/gtk+-3.7.8:3
+	>=dev-libs/glib-2.37.7:2[dbus]
+	>=x11-libs/gtk+-3.15.3:3
 	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
 	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
 	media-libs/fontconfig
@@ -107,10 +101,10 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
 
 	epatch_user
-	[[ ${PV} != 9999 ]] && eautoreconf
+	eautoreconf
 
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 7482043..2ebf7ee 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,8 +17,9 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
 REQUIRED_USE="
+	input_devices_wacom? ( udev )
 	smartcard? ( udev )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -29,10 +30,10 @@ else
 fi
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2
-	>=x11-libs/gtk+-3.7.8:3
+	>=dev-libs/glib-2.37.7:2[dbus]
+	>=x11-libs/gtk+-3.15.3:3
 	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
+	>=gnome-base/gsettings-desktop-schemas-3.15.4
 	>=gnome-base/librsvg-2.36.2
 	media-fonts/cantarell
 	media-libs/fontconfig
@@ -107,7 +108,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
 
 	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+	epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
 
 	epatch_user
 	[[ ${PV} != 9999 ]] && eautoreconf


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2018-02-09 15:55 Sobhan Mohammadpour
  0 siblings, 0 replies; 20+ messages in thread
From: Sobhan Mohammadpour @ 2018-02-09 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e588ec09d3603c3e92b10ccee617258b92132b7a
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 15:42:49 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 15:42:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e588ec09

gnome-base/gnome-settings-daemon: bump

Package-Manager: Portage-2.3.23, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../files/3.24.2-udevrulesdir-configure.patch      |  48 ++++++
 .../files/3.24.3-fix-wayland-build.patch           |  53 +++++++
 .../files/3.26.1-optional.patch                    | 169 +++++++++++++++++++++
 .../gnome-settings-daemon-3.26.1.ebuild            | 156 +++++++++++++++++++
 4 files changed, 426 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
new file mode 100644
index 00000000..16988f94
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 29 May 2017 00:38:57 +0300
+Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
+
+Use the standard way to find the udev rules directory via pkg-config by default,
+and support specifying it, should it be necessary.
+This is the same logic as in colord.
+---
+ configure.ac               | 9 +++++++++
+ plugins/rfkill/Makefile.am | 1 -
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1107578..475821d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,15 @@ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
++dnl - Where to install udev rules
++dnl ---------------------------------------------------------------------------
++AC_ARG_WITH([udevrulesdir],
++            AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
++            [],
++            [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
++
++dnl ---------------------------------------------------------------------------
+ dnl - ALSA integration (default enabled)
+ dnl ---------------------------------------------------------------------------
+ ALSA_PKG=""
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
+index 3c5ec47..bfc34c6 100644
+--- a/plugins/rfkill/Makefile.am
++++ b/plugins/rfkill/Makefile.am
+@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
+ 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+ 
+ EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+-- 
+2.10.2
+

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
new file mode 100644
index 00000000..4a06889a
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
@@ -0,0 +1,53 @@
+From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 18 Aug 2017 09:42:56 +0200
+Subject: [PATCH] Fix build issue when gudev is detected in the absence of
+ wayland
+
+See https://bugs.gentoo.org/show_bug.cgi?id=627966
+---
+ configure.ac               | 5 +++++
+ plugins/common/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 908b3a3a..c89d5e2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
+         AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
+         enable_wayland=$enableval, enable_wayland=auto)
+ if test x$enable_wayland != xno; then
++        AS_IF([test "$have_udev" = no],
++              [AC_MSG_ERROR([udev is required for Wayland support])])
++
+         PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
+         if test x$have_wayland = xyes; then
+                 AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
++		GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
+         else
+                 if test x$enable_wayland = xyes; then
+                         AC_MSG_ERROR([Wayland enabled but not found])
+                 fi
+         fi
+ fi
++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
+ 
+ dnl ================================================================
+ dnl Plugins
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 107e4d3b..760f3198 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
+ 	gsd-shell-helper.c	\
+ 	gsd-shell-helper.h
+ 
+-if HAVE_GUDEV
++if HAVE_WAYLAND
+ libcommon_la_SOURCES += \
+ 	gsd-device-manager-udev.c \
+ 	gsd-device-manager-udev.h
+-- 
+2.14.1
+

diff --git a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
new file mode 100644
index 00000000..608784c4
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
@@ -0,0 +1,169 @@
+From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Tue, 15 Aug 2017 18:51:42 +0200
+Subject: [PATCH 1/6] Make colord and wacom support optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Timo Tambet <ttambet@gmail.com>
+Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com>
+---
+ configure.ac               | 54 ++++++++++++++++++++++++++++++----------------
+ plugins/Makefile.am        |  9 ++++++--
+ plugins/common/Makefile.am |  7 ++++--
+ plugins/dummy/Makefile.am  |  5 ++++-
+ 4 files changed, 52 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73fe91e6..d8778c93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
+ 		  gtk+-x11-3.0
+ 		  x11)
+ 
+-PKG_CHECK_MODULES(COLOR,
+-		  colord >= 1.0.2
+-		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-		  libcanberra-gtk3
+-		  libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+-		  lcms2 >= $LCMS_REQUIRED_VERSION
+-		  libnotify)
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [],
++       [enable_color=yes])
++
++AS_IF([test "$enable_color" = "yes"],
++      [PKG_CHECK_MODULES(COLOR,
++                         colord >= 1.0.2
++                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                         libcanberra-gtk3
++                         libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++                         lcms2 >= $LCMS_REQUIRED_VERSION
++                         libnotify)
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++      ])
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
+ 
+ PKG_CHECK_MODULES(DATETIME,
+ 		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+@@ -268,23 +278,31 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
+-      if test x$enable_gudev != xno; then
+-        LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
+-        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+-      else
+-        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+-      fi
+-      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+-      have_wacom=yes
++      have_wacom=no
++      AS_IF([test "$enable_gudev" != "no"],
++        [AC_ARG_ENABLE([wacom],
++           AS_HELP_STRING([--disable-wacom],
++                          [turn off wacom plugin]),
++                          [],
++                          [enable_wacom=no]) dnl Default value
++         AS_IF([test "$enable_wacom" = "yes"],
++               [
++                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++                 PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
++                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++                 have_wacom=yes
++                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++               ])
++        ], [
++          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
++        ])
+     fi
+     ;;
+   *)
+     have_wacom=no
+     ;;
+ esac
+-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - common
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 9324b406..ee78d6d0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	datetime	\
+ 	dummy		\
+ 	power		\
+@@ -22,13 +21,19 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
+ else
+ disabled_plugins += smartcard
+ endif
+ 
+-if HAVE_WACOM
++if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+ disabled_plugins += wacom
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 239c6015..65de4007 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
+ 	-I$(top_builddir)/gnome-settings-daemon	\
+ 	-I$(top_srcdir)/data/
+ 
+-libcommon_la_CFLAGS = $(COMMON_CFLAGS)
++libcommon_la_CFLAGS = \
++	$(COMMON_CFLAGS) \
++	$(LIBWACOM_CFLAGS)
+ 
+ libcommon_la_LDFLAGS = \
+ 	$(GSD_PLUGIN_LDFLAGS)
+ 
+ libcommon_la_LIBADD  = \
+ 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
+-	$(COMMON_LIBS)
++	$(COMMON_LIBS) \
++	$(LIBWACOM_LIBS)
+ 
+ libexec_PROGRAMS = gsd-test-input-helper
+ 
+diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
+index cb5856cf..d8e8bc4e 100644
+--- a/plugins/dummy/Makefile.am
++++ b/plugins/dummy/Makefile.am
+@@ -25,7 +25,10 @@ desktop_DATA =
+ if !SMARTCARD_SUPPORT
+ desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
+ endif
+-if !HAVE_WACOM
++if !BUILD_COLOR
++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
++endif
++if !BUILD_WACOM
+ desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
+ endif
+ if !BUILD_PRINT_NOTIFICATIONS
+-- 
+2.14.1
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
new file mode 100644
index 00000000..0dd04c34
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
+REQUIRED_USE="
+	input_devices_wacom? ( udev )
+	smartcard? ( udev )
+	wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.23.3
+	>=gnome-base/librsvg-2.36.2:2
+	media-fonts/cantarell
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-2
+	>=sys-power/upower-0.99:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
+
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-3.9.5:2=
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? (
+		>=media-libs/lcms-2.2:2
+		>=x11-misc/colord-1.0.2:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/libgudev:= )
+	networkmanager? ( >=net-misc/networkmanager-1.0 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	udev? ( virtual/libgudev:= )
+	wayland? ( dev-libs/wayland )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+	!<gnome-base/gnome-session-3.23.2
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
+		gnome-base/gnome-session )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	>=x11-proto/xproto-7.0.15
+"
+
+# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Make colord and wacom optional; requires eautoreconf
+	"${FILESDIR}"/${PV}-optional.patch
+	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+	"${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
+	# Fix build issue when gudev is present but not wayland, bug #627966
+	"${FILESDIR}"/3.24.3-fix-wayland-build.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "https://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2018-02-14 19:44 Sobhan Mohammadpour
  0 siblings, 0 replies; 20+ messages in thread
From: Sobhan Mohammadpour @ 2018-02-14 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c1298d1702e448ba60a6e322967e80af9bb1cfea
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:02:40 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:02:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c1298d17

Revert "Revert "gnome-base/gnome-settings-daemon: bump""

This reverts commit 7f482f50c0bbf6485cda4e2e4c94dae2fbd60ccb.

 .../files/3.24.2-udevrulesdir-configure.patch      |  48 ++++++
 .../files/3.24.3-fix-wayland-build.patch           |  53 +++++++
 .../files/3.26.1-optional.patch                    | 169 +++++++++++++++++++++
 .../gnome-settings-daemon-3.26.1.ebuild            | 156 +++++++++++++++++++
 4 files changed, 426 insertions(+)

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
new file mode 100644
index 00000000..16988f94
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 29 May 2017 00:38:57 +0300
+Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
+
+Use the standard way to find the udev rules directory via pkg-config by default,
+and support specifying it, should it be necessary.
+This is the same logic as in colord.
+---
+ configure.ac               | 9 +++++++++
+ plugins/rfkill/Makefile.am | 1 -
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1107578..475821d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,15 @@ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
++dnl - Where to install udev rules
++dnl ---------------------------------------------------------------------------
++AC_ARG_WITH([udevrulesdir],
++            AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
++            [],
++            [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
++
++dnl ---------------------------------------------------------------------------
+ dnl - ALSA integration (default enabled)
+ dnl ---------------------------------------------------------------------------
+ ALSA_PKG=""
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
+index 3c5ec47..bfc34c6 100644
+--- a/plugins/rfkill/Makefile.am
++++ b/plugins/rfkill/Makefile.am
+@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
+ 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+ 
+ EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+-- 
+2.10.2
+

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
new file mode 100644
index 00000000..4a06889a
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
@@ -0,0 +1,53 @@
+From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 18 Aug 2017 09:42:56 +0200
+Subject: [PATCH] Fix build issue when gudev is detected in the absence of
+ wayland
+
+See https://bugs.gentoo.org/show_bug.cgi?id=627966
+---
+ configure.ac               | 5 +++++
+ plugins/common/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 908b3a3a..c89d5e2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
+         AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
+         enable_wayland=$enableval, enable_wayland=auto)
+ if test x$enable_wayland != xno; then
++        AS_IF([test "$have_udev" = no],
++              [AC_MSG_ERROR([udev is required for Wayland support])])
++
+         PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
+         if test x$have_wayland = xyes; then
+                 AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
++		GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
+         else
+                 if test x$enable_wayland = xyes; then
+                         AC_MSG_ERROR([Wayland enabled but not found])
+                 fi
+         fi
+ fi
++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
+ 
+ dnl ================================================================
+ dnl Plugins
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 107e4d3b..760f3198 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
+ 	gsd-shell-helper.c	\
+ 	gsd-shell-helper.h
+ 
+-if HAVE_GUDEV
++if HAVE_WAYLAND
+ libcommon_la_SOURCES += \
+ 	gsd-device-manager-udev.c \
+ 	gsd-device-manager-udev.h
+-- 
+2.14.1
+

diff --git a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
new file mode 100644
index 00000000..608784c4
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
@@ -0,0 +1,169 @@
+From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <mail@ole-reifschneider.de>
+Date: Tue, 15 Aug 2017 18:51:42 +0200
+Subject: [PATCH 1/6] Make colord and wacom support optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Timo Tambet <ttambet@gmail.com>
+Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com>
+---
+ configure.ac               | 54 ++++++++++++++++++++++++++++++----------------
+ plugins/Makefile.am        |  9 ++++++--
+ plugins/common/Makefile.am |  7 ++++--
+ plugins/dummy/Makefile.am  |  5 ++++-
+ 4 files changed, 52 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73fe91e6..d8778c93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
+ 		  gtk+-x11-3.0
+ 		  x11)
+ 
+-PKG_CHECK_MODULES(COLOR,
+-		  colord >= 1.0.2
+-		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-		  libcanberra-gtk3
+-		  libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+-		  lcms2 >= $LCMS_REQUIRED_VERSION
+-		  libnotify)
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [],
++       [enable_color=yes])
++
++AS_IF([test "$enable_color" = "yes"],
++      [PKG_CHECK_MODULES(COLOR,
++                         colord >= 1.0.2
++                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                         libcanberra-gtk3
++                         libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++                         lcms2 >= $LCMS_REQUIRED_VERSION
++                         libnotify)
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++      ])
++AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
+ 
+ PKG_CHECK_MODULES(DATETIME,
+ 		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+@@ -268,23 +278,31 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
+-      if test x$enable_gudev != xno; then
+-        LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
+-        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
+-      else
+-        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+-      fi
+-      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
+-      have_wacom=yes
++      have_wacom=no
++      AS_IF([test "$enable_gudev" != "no"],
++        [AC_ARG_ENABLE([wacom],
++           AS_HELP_STRING([--disable-wacom],
++                          [turn off wacom plugin]),
++                          [],
++                          [enable_wacom=no]) dnl Default value
++         AS_IF([test "$enable_wacom" = "yes"],
++               [
++                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
++                 PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
++                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++                 have_wacom=yes
++                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
++               ])
++        ], [
++          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
++        ])
+     fi
+     ;;
+   *)
+     have_wacom=no
+     ;;
+ esac
+-AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
++AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - common
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 9324b406..ee78d6d0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	datetime	\
+ 	dummy		\
+ 	power		\
+@@ -22,13 +21,19 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
+ else
+ disabled_plugins += smartcard
+ endif
+ 
+-if HAVE_WACOM
++if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+ disabled_plugins += wacom
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 239c6015..65de4007 100644
+--- a/plugins/common/Makefile.am
++++ b/plugins/common/Makefile.am
+@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
+ 	-I$(top_builddir)/gnome-settings-daemon	\
+ 	-I$(top_srcdir)/data/
+ 
+-libcommon_la_CFLAGS = $(COMMON_CFLAGS)
++libcommon_la_CFLAGS = \
++	$(COMMON_CFLAGS) \
++	$(LIBWACOM_CFLAGS)
+ 
+ libcommon_la_LDFLAGS = \
+ 	$(GSD_PLUGIN_LDFLAGS)
+ 
+ libcommon_la_LIBADD  = \
+ 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
+-	$(COMMON_LIBS)
++	$(COMMON_LIBS) \
++	$(LIBWACOM_LIBS)
+ 
+ libexec_PROGRAMS = gsd-test-input-helper
+ 
+diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
+index cb5856cf..d8e8bc4e 100644
+--- a/plugins/dummy/Makefile.am
++++ b/plugins/dummy/Makefile.am
+@@ -25,7 +25,10 @@ desktop_DATA =
+ if !SMARTCARD_SUPPORT
+ desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
+ endif
+-if !HAVE_WACOM
++if !BUILD_COLOR
++desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
++endif
++if !BUILD_WACOM
+ desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
+ endif
+ if !BUILD_PRINT_NOTIFICATIONS
+-- 
+2.14.1
+

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
new file mode 100644
index 00000000..0dd04c34
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
+REQUIRED_USE="
+	input_devices_wacom? ( udev )
+	smartcard? ( udev )
+	wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.23.3
+	>=gnome-base/librsvg-2.36.2:2
+	media-fonts/cantarell
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-2
+	>=sys-power/upower-0.99:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	x11-misc/xkeyboard-config
+
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-3.9.5:2=
+	>=sci-geosciences/geocode-glib-3.10
+	>=sys-auth/polkit-0.103
+
+	colord? (
+		>=media-libs/lcms-2.2:2
+		>=x11-misc/colord-1.0.2:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20
+		x11-drivers/xf86-input-wacom
+		virtual/libgudev:= )
+	networkmanager? ( >=net-misc/networkmanager-1.0 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	udev? ( virtual/libgudev:= )
+	wayland? ( dev-libs/wayland )
+"
+# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
+# systemd needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	!openrc-force? ( sys-apps/systemd )
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+	!<gnome-base/gnome-session-3.23.2
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
+		gnome-base/gnome-session )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	>=x11-proto/xproto-7.0.15
+"
+
+# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Make colord and wacom optional; requires eautoreconf
+	"${FILESDIR}"/${PV}-optional.patch
+	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+	"${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
+	# Fix build issue when gudev is present but not wayland, bug #627966
+	"${FILESDIR}"/3.24.3-fix-wayland-build.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable networkmanager network-manager) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! systemd_is_booted; then
+		ewarn "${PN} needs Systemd to be *running* for working"
+		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "https://wiki.gentoo.org/wiki/Systemd"
+	fi
+
+	if use openrc-force; then
+		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+		ewarn "this can lead to unexpected problems and is not supported neither by"
+		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+		ewarn "you will need to disable this USE flag system wide and retest before"
+		ewarn "opening any bug report."
+	fi
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
@ 2018-09-28 17:59 Mart Raudsepp
  0 siblings, 0 replies; 20+ messages in thread
From: Mart Raudsepp @ 2018-09-28 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     beb7ce2ab6614f65fadb09ff19af813a87633b07
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:42:47 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:42:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=beb7ce2a

gnome-base/gnome-settings-daemon: remove, moved to ::gentoo

 .../files/3.24.2-udevrulesdir-configure.patch      |  48 ------
 .../files/3.24.3-fix-wayland-build.patch           |  53 -------
 .../files/3.26.1-optional.patch                    | 169 ---------------------
 .../gnome-settings-daemon-3.26.2-r1.ebuild         | 131 ----------------
 gnome-base/gnome-settings-daemon/metadata.xml      |  13 --
 5 files changed, 414 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
deleted file mode 100644
index 16988f94..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 29 May 2017 00:38:57 +0300
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.
----
- configure.ac               | 9 +++++++++
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1107578..475821d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
- dnl ---------------------------------------------------------------------------
-+dnl - Where to install udev rules
-+dnl ---------------------------------------------------------------------------
-+AC_ARG_WITH([udevrulesdir],
-+            AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
-+            [],
-+            [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl ---------------------------------------------------------------------------
- dnl - ALSA integration (default enabled)
- dnl ---------------------------------------------------------------------------
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index 3c5ec47..bfc34c6 100644
---- a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
- 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
- 
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
- 
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
--- 
-2.10.2
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
deleted file mode 100644
index 4a06889a..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 18 Aug 2017 09:42:56 +0200
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of
- wayland
-
-See https://bugs.gentoo.org/show_bug.cgi?id=627966
----
- configure.ac               | 5 +++++
- plugins/common/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 908b3a3a..c89d5e2d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
-         AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
-         enable_wayland=$enableval, enable_wayland=auto)
- if test x$enable_wayland != xno; then
-+        AS_IF([test "$have_udev" = no],
-+              [AC_MSG_ERROR([udev is required for Wayland support])])
-+
-         PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
-         if test x$have_wayland = xyes; then
-                 AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
-+		GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
-         else
-                 if test x$enable_wayland = xyes; then
-                         AC_MSG_ERROR([Wayland enabled but not found])
-                 fi
-         fi
- fi
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
- 
- dnl ================================================================
- dnl Plugins
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 107e4d3b..760f3198 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
- 	gsd-shell-helper.c	\
- 	gsd-shell-helper.h
- 
--if HAVE_GUDEV
-+if HAVE_WAYLAND
- libcommon_la_SOURCES += \
- 	gsd-device-manager-udev.c \
- 	gsd-device-manager-udev.h
--- 
-2.14.1
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch b/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
deleted file mode 100644
index 608784c4..00000000
--- a/gnome-base/gnome-settings-daemon/files/3.26.1-optional.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <mail@ole-reifschneider.de>
-Date: Tue, 15 Aug 2017 18:51:42 +0200
-Subject: [PATCH 1/6] Make colord and wacom support optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-Signed-off-by: Timo Tambet <ttambet@gmail.com>
-Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com>
----
- configure.ac               | 54 ++++++++++++++++++++++++++++++----------------
- plugins/Makefile.am        |  9 ++++++--
- plugins/common/Makefile.am |  7 ++++--
- plugins/dummy/Makefile.am  |  5 ++++-
- 4 files changed, 52 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73fe91e6..d8778c93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
- 		  gtk+-x11-3.0
- 		  x11)
- 
--PKG_CHECK_MODULES(COLOR,
--		  colord >= 1.0.2
--		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
--		  libcanberra-gtk3
--		  libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
--		  lcms2 >= $LCMS_REQUIRED_VERSION
--		  libnotify)
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [],
-+       [enable_color=yes])
-+
-+AS_IF([test "$enable_color" = "yes"],
-+      [PKG_CHECK_MODULES(COLOR,
-+                         colord >= 1.0.2
-+                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+                         libcanberra-gtk3
-+                         libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
-+                         lcms2 >= $LCMS_REQUIRED_VERSION
-+                         libnotify)
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+      ])
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
- 
- PKG_CHECK_MODULES(DATETIME,
- 		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-@@ -268,23 +278,31 @@ case $host_os in
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
--      if test x$enable_gudev != xno; then
--        LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
--        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
--      else
--        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
--      fi
--      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
--      have_wacom=yes
-+      have_wacom=no
-+      AS_IF([test "$enable_gudev" != "no"],
-+        [AC_ARG_ENABLE([wacom],
-+           AS_HELP_STRING([--disable-wacom],
-+                          [turn off wacom plugin]),
-+                          [],
-+                          [enable_wacom=no]) dnl Default value
-+         AS_IF([test "$enable_wacom" = "yes"],
-+               [
-+                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+                 have_wacom=yes
-+                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+               ])
-+        ], [
-+          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-+        ])
-     fi
-     ;;
-   *)
-     have_wacom=no
-     ;;
- esac
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
- 
- dnl ---------------------------------------------------------------------------
- dnl - common
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9324b406..ee78d6d0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	datetime	\
- 	dummy		\
- 	power		\
-@@ -22,13 +21,19 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
- disabled_plugins += smartcard
- endif
- 
--if HAVE_WACOM
-+if BUILD_WACOM
- enabled_plugins += wacom
- else
- disabled_plugins += wacom
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 239c6015..65de4007 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
- 	-I$(top_builddir)/gnome-settings-daemon	\
- 	-I$(top_srcdir)/data/
- 
--libcommon_la_CFLAGS = $(COMMON_CFLAGS)
-+libcommon_la_CFLAGS = \
-+	$(COMMON_CFLAGS) \
-+	$(LIBWACOM_CFLAGS)
- 
- libcommon_la_LDFLAGS = \
- 	$(GSD_PLUGIN_LDFLAGS)
- 
- libcommon_la_LIBADD  = \
- 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
--	$(COMMON_LIBS)
-+	$(COMMON_LIBS) \
-+	$(LIBWACOM_LIBS)
- 
- libexec_PROGRAMS = gsd-test-input-helper
- 
-diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
-index cb5856cf..d8e8bc4e 100644
---- a/plugins/dummy/Makefile.am
-+++ b/plugins/dummy/Makefile.am
-@@ -25,7 +25,10 @@ desktop_DATA =
- if !SMARTCARD_SUPPORT
- desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
- endif
--if !HAVE_WACOM
-+if !BUILD_COLOR
-+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
-+endif
-+if !BUILD_WACOM
- desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
- endif
- if !BUILD_PRINT_NOTIFICATIONS
--- 
-2.14.1
-

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
deleted file mode 100644
index 0d45c1d0..00000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-	wayland? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.53.0:2
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.23.3
-	>=gnome-base/librsvg-2.36.2:2
-	media-fonts/cantarell
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.9.5:2=
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? (
-		>=media-libs/lcms-2.2:2
-		>=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# logind needed for power and session management, bug #464944
-# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter)
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-	!<gnome-base/gnome-session-3.25.4
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf
-	# Make colord and wacom optional; requires eautoreconf
-	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
-	# Fix build system to require gudev with wayland, bug #627966; requires eautoreconf
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	virtx emake check
-}

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
deleted file mode 100644
index 5e2d0958..00000000
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
-		<flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
-	</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2018-09-28 17:59 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-09 12:43 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:59 Mart Raudsepp
2018-02-14 19:44 Sobhan Mohammadpour
2018-02-09 15:55 Sobhan Mohammadpour
2015-04-29 19:00 Ole Reifschneider
2014-10-11 23:11 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:34 Gilles Dartiguelongue
2013-01-22  8:12 Alexandre Rostovtsev
2012-10-30 21:28 Gilles Dartiguelongue
2012-09-27  5:21 Priit Laes
2012-04-06  8:38 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2011-10-29 19:56 Alexandre Restovtsev
2011-10-28  5:28 Alexandre Restovtsev
2011-10-04  8:56 Alexandre Restovtsev
2011-07-13 15:53 Alexandre Restovtsev
2011-07-12  0:19 Alexandre Restovtsev
2011-06-14  6:36 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox