From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RJezE-00033T-NG for garchives@archives.gentoo.org; Fri, 28 Oct 2011 05:28:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A02BE21C02D; Fri, 28 Oct 2011 05:28:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5CBFD21C039 for ; Fri, 28 Oct 2011 05:28:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B03B1B4013 for ; Fri, 28 Oct 2011 05:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 93B5580042 for ; Fri, 28 Oct 2011 05:28:02 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/ gnome-base/gnome-settings-daemon/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: dd3ad295b1a9f48c00617a7c53c6699168f62523 Date: Fri, 28 Oct 2011 05:28:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 31a775fa0e91561d273fa8980c3fab5f commit: dd3ad295b1a9f48c00617a7c53c6699168f62523 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Oct 28 03:36:45 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Oct 28 03:36:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Ddd3ad295 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/gno= me-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 +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 = >=3D $GNOME_DESKTOP_REQUIRED_VE + dnl -------------------------------------------------------------------= -------- + dnl - Check for colord + dnl -------------------------------------------------------------------= -------- +-PKG_CHECK_MODULES(COLORD, colord >=3D 0.1.12) ++build_color=3Dfalse ++AC_ARG_ENABLE(color, ++ AC_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [case "${enableval}" in ++ yes) WANT_COLOR=3Dyes ;; ++ no) WANT_COLOR=3Dno ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; ++ esac], ++ [WANT_COLOR=3Dyes]) dnl Default value ++ ++if test x$WANT_COLOR =3D xyes; then ++ PKG_CHECK_MODULES(COLORD, colord >=3D 0.1.12) ++ build_color=3Dtrue ++fi ++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" =3D "xtrue") ++ ++AC_SUBST(COLORD_CFLAGS) ++AC_SUBST(COLORD_LIBS) +=20 + 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 =3D \ + 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 =3D \ +=20 + all_schemas =3D $(gsettings_SCHEMAS) +=20 ++if BUILD_COLOR ++gsettings_SCHEMAS +=3D org.gnome.settings-daemon.plugins.color.gschema.= xml ++else ++all_schemas +=3D org.gnome.settings-daemon.plugins.color.gschema.xml ++endif ++ + if HAVE_PACKAGEKIT + gsettings_SCHEMAS +=3D org.gnome.settings-daemon.plugins.updates.gschem= a.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 =3D \ + automount \ + background \ + clipboard \ +- color \ + cursor \ + datetime \ + dummy \ +@@ -24,6 +23,12 @@ enabled_plugins =3D \ +=20 + disabled_plugins =3D $(NULL) +=20 ++if BUILD_COLOR ++enabled_plugins +=3D color ++else ++disabled_plugins +=3D color ++endif ++ + if BUILD_GCONF_BRIDGE + enabled_plugins +=3D gconf + else +--=20 +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.eb= uild 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=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit eutils gnome2 virtualx +inherit autotools eutils gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -21,7 +21,7 @@ if [[ ${PV} =3D 9999 ]]; then else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi -IUSE=3D"+cups debug packagekit policykit short-touchpad-timeout smartcar= d +udev" +IUSE=3D"+colord +cups debug packagekit policykit short-touchpad-timeout = smartcard +udev" =20 # 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=3D">=3Ddev-libs/dbus-glib-0.74 x11-libs/libXfixes x11-libs/libXxf86misc >=3Dx11-libs/libxklavier-5.0 - >=3Dx11-misc/colord-0.1.13 >=3Dmedia-sound/pulseaudio-0.9.16 =20 + colord? ( >=3Dx11-misc/colord-0.1.13 ) cups? ( >=3Dnet-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] @@ -91,6 +91,7 @@ pkg_setup() { --disable-schemas-compile --enable-gconf-bridge --with-pnpids=3D${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" =20 + # Make colord optional; requires eautoreconf + epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch" + eautoreconf + gnome2_src_prepare } =20