[patch] the patch which solves the problem

0001-gnome-control-center.patch (text/plain), 6.49 KB, created by Romain Perier (RETIRED) on 2009-04-14 14:48:13 UTC

From 4889311789c7f30672718a1bf4d338124ea1fe16 Mon Sep 17 00:00:00 2001
From: PERIER Romain <[e-mail]>
Date: Tue, 14 Apr 2009 16:41:55 +0200
Subject: [PATCH] gnome-control-center:
 - Fixed libcanberra and policykit-gnome automagics
 - Updated ebuild to include canberra and policykit USE flags

---
 gnome-base/gnome-control-center/Manifest           |    3 +-
 ...-center-2.26.0-automagics-canberra+polkit.patch |   69 ++++++++++++++++++++
 .../gnome-control-center-2.26.0.ebuild             |   18 ++++--
 3 files changed, 83 insertions(+), 7 deletions(-)
 create mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index aab406d..7f550be 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,4 @@
 AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
+AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc01ee688986a20339e6d14d39a43d40a03a770 SHA1 cde5a169e98a7d92875bb7fc535502f375774e5b SHA256 1a2a294de055d561985ec95cd612b81cc8ad68820e890011a62afbb1e340b597
 DIST gnome-control-center-2.26.0.tar.bz2 2262324 RMD160 d22c75b21d63bad9321ad1221e442f381da8dd35 SHA1 4730780aaab599869a2dfe2d72d68dd54bb77058 SHA256 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
-EBUILD gnome-control-center-2.26.0.ebuild 2145 RMD160 795f31153f1ff842835a3c1c8a238c299f4681d7 SHA1 3dae408b41e21ba34249ca1492fb87845e72846f SHA256 31f8a5e54717139bfc67b9e52767a55109d3dd3fdd74551abd917075b86e0008
+EBUILD gnome-control-center-2.26.0.ebuild 2346 RMD160 6979f5e1da0fdb59a4417565cd5e3419bd469b24 SHA1 d0286a59e076bce4c2bf2a9569b732dccb84ca9f SHA256 73630b973ee2f956fe9095528caea0bdf5f67a0a1916551b01eddd897f6a0227
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
new file mode 100644
index 0000000..15286e2
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.26.0-automagics-canberra+polkit.patch
@@ -0,0 +1,69 @@
+ configure.in |   35 +++++++++++++++++++++++++----------
+ 1 files changed, 25 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 515f053..03eda8c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -60,13 +60,6 @@ AC_CHECK_FUNC(XScreenSaverQueryInfo, [
+ AC_SUBST(TYPING_BREAK)
+ AC_SUBST(SCREENSAVER_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, [
+-  CANBERRA_GTK=1
+-  AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
+-  AC_SUBST(LIBCANBERRA_GTK_LIBS)
+-  ], [:])
+-AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
+-
+ AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
+ 
+ dnl keyboard-properties-capplet
+@@ -96,6 +89,22 @@ COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
+  gconf-2.0 dnl
+  libglade-2.0 >= 2.0.0 dnl
+  gnome-desktop-2.0 >= 2.25.1"
++
++AC_ARG_ENABLE([canberra],
++	AC_HELP_STRING([--enable-canberra],
++	[Enable canberra support @<:@default=yes@:>@]),
++	enable_canberra=$enableval, enable_canberra=yes)
++
++CANBERRA_GTK=0
++if test x$enable_canberra = xyes; then
++   PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk, 
++   [CANBERRA_GTK=1
++   AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
++   AC_SUBST(LIBCANBERRA_GTK_LIBS)], [])
++fi
++
++AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
++
+ PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
+ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
+ PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
+@@ -199,15 +208,21 @@ AC_ARG_ENABLE([aboutme],
+    [enable_aboutme=no])
+ AC_MSG_RESULT([$enable_aboutme])
+ 
++AC_ARG_ENABLE([policykit-gnome],
++	AC_HELP_STRING([--enable-policykit-gnome],
++	[Enable PolicyKit-gnome support @<:@default=yes@:>@]),
++	enable_polkit=$enableval, enable_polkit=yes)
++
+ if test "x$enable_aboutme" = "xyes"; then
+   PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
+                     [AC_DEFINE([HAVE_LIBEBOOK], 1,
+                     [Define if evolution-data-server libebook-1.2 is available])])
+-  dnl PolicyKit-gnome is optional
++  if test "x$enable_polkit" = "xyes"; then
+   PKG_CHECK_MODULES(POLKIT_GNOME, [polkit-gnome],
+   		    [AC_DEFINE([HAVE_POLKIT], 1,
+-  		    [Define if PolicyKit-gnome is available])],
+-  		    has_polkit=false)
++  		    [Define if PolicyKit-gnome is available])], 		    
++		    has_polkit=false)
++  fi
+ fi
+ 
+ AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
index db5d212..287d417 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.26.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -12,10 +12,8 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="eds hal"
+IUSE="canberra eds hal policykit"
 
-# FIXME: libcanberra is automagic.
-# FIXME: policykit-gnome is automagic for about-me capplet.
 RDEPEND="x11-libs/libXft
 	>=x11-libs/gtk+-2.13.1
 	>=dev-libs/glib-2.17.4
@@ -39,7 +37,8 @@ RDEPEND="x11-libs/libXft
 
 	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
 	hal? ( >=sys-apps/hal-0.5.6 )
-	>=media-libs/libcanberra-0.4[gtk]
+	canberra?  ( >=media-libs/libcanberra-0.4[gtk] )
+	policykit? ( gnome-extra/policykit-gnome )
 
 	>=gnome-base/libbonobo-2
 	>=gnome-base/libgnome-2.2
@@ -79,7 +78,9 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		$(use_enable eds aboutme)
-		$(use_enable hal)"
+		$(use_enable hal)
+		$(use_enable canberra)
+		$(use_enable policykit)"
 }
 
 src_prepare() {
@@ -87,4 +88,9 @@ src_prepare() {
 
 	# Fix compilation on fbsd, bug #256958
 	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
+	# Fix libcanberra and policykit-gnome for about-me capplet
+	# automagics support
+	epatch "${FILESDIR}/${P}-automagics-canberra+polkit.patch"
+	
+	eautoreconf
 }
-- 
1.6.2.3