Link to libxfcegui4 (and fix LDFLAGS vs. LDADD mistake in Makefile.am) wrt #331493 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 61 insertions, 8 deletions

diff --git a/xfce-extra/xfce4-verve-plugin/ChangeLog b/xfce-extra/xfce4-verve-plugin/ChangeLog
index 96a62c98e846..61231252694a 100644
--- a/xfce-extra/xfce4-verve-plugin/ChangeLog
+++ b/xfce-extra/xfce4-verve-plugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-verve-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.4 2009/10/24 17:54:18 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/ChangeLog,v 1.5 2010/08/07 17:22:14 ssuominen Exp $
+
+  07 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-verve-plugin-0.3.6.ebuild,
+  +files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch:
+  Link to libxfcegui4 (and fix LDFLAGS vs. LDADD mistake in Makefile.am) wrt
+  #331493 by Diego E. Pettenò.
 
   24 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-verve-plugin-0.3.6.ebuild,
diff --git a/xfce-extra/xfce4-verve-plugin/Manifest b/xfce-extra/xfce4-verve-plugin/Manifest
index 0945753fa983..48b8697327a9 100644
--- a/xfce-extra/xfce4-verve-plugin/Manifest
+++ b/xfce-extra/xfce4-verve-plugin/Manifest
@@ -1,5 +1,6 @@
 AUX xfce4-verve-plugin-0.3.6-exo.patch 728 RMD160 0399fda59016c1e2cfdb2f4a9eecbafe93fdb163 SHA1 f0d909035e82831b63896822f4f78a8a2d1dba40 SHA256 d0247859fe682af93e2c746e61dcf8b625926e6ffd574456dc191758802003ae
+AUX xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch 1291 RMD160 e694b496156f0c3af4f2ccc23f5adef6a4e88140 SHA1 4e81dd5520d8548de57a999981e99eb637026217 SHA256 a0c71e3bf0c78a9f7f7c0fd24ca0b3b16b5c008a4650d8123ce5613c0752d0ff
 DIST xfce4-verve-plugin-0.3.6.tar.bz2 283337 RMD160 a796af12c9fc84e03ae13122a98a38ba7b8c0001 SHA1 e9f6d6e90a21895d63f8c346f08cdc4232b56038 SHA256 a36991328ce4080b615f2e603628f397feb03848a5cabbedf0f5a8f4d701239f
-EBUILD xfce4-verve-plugin-0.3.6.ebuild 995 RMD160 79fe95b5aa1e82bba62957e71d6288a3429f4b53 SHA1 37d9a25a58120505161e59fa068191b2cdd9d8e2 SHA256 f2ac43446c5b9c059c567790a7982e9ddb2f1c9f356325bc064b5e8d0fd93e96
-MISC ChangeLog 859 RMD160 fe32176a86c4928574a67b775f168872d472b4e5 SHA1 70de0c46a3e3c7308dde337a2e16cabf84412c8a SHA256 3845d6c8ffe90a1cbbb1adee189183faa6a2dc0f17bc990c2053dad019ecdda3
+EBUILD xfce4-verve-plugin-0.3.6.ebuild 1075 RMD160 b0a3cd1220a18bffe1d8b2a785d8d404ed7274a4 SHA1 ce4f0b344020420cedf28adf5b9b26f805f86c95 SHA256 4bec03f22f644c4d6d5d3b8e7eb94f4ac089fa1934ebefb867d18fc2054d4f55
+MISC ChangeLog 1119 RMD160 beb3d0e6b6620dd96a4a73c97c58bc44981c1342 SHA1 0f07c901c652afc18f6821833c4478b4687b32af SHA256 2f4b23867246106ae5ae809299bcbdf1c7c93eae0026fd4a77a4d6891dd2e1b2
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch b/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch
new file mode 100644
index 000000000000..dd94d632358a
--- /dev/null
+++ b/xfce-extra/xfce4-verve-plugin/files/xfce4-verve-plugin-0.3.6-link_to_libxfcegui4.patch
@@ -0,0 +1,42 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6616
+http://bugs.gentoo.org/331493
+
+--- configure.in
++++ configure.in
+@@ -56,6 +56,7 @@
+   [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
+ XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -21,14 +21,16 @@
+ 	@LIBEXO_CFLAGS@							\
+ 	@LIBXFCE4PANEL_CFLAGS@						\
+ 	@LIBXFCE4UTIL_CFLAGS@						\
++	@LIBXFCEGUI4_CFLAGS@						\
+ 	@LIBPCRE_CFLAGS@						\
+ 	@GLIB_CFLAGS@							\
+ 	@GTHREAD_CFLAGS@						
+ 
+-xfce4_verve_plugin_LDFLAGS = 						\
++xfce4_verve_plugin_LDADD = 						\
+ 	@LIBEXO_LIBS@							\
+ 	@LIBXFCE4PANEL_LIBS@						\
+ 	@LIBXFCE4UTIL_LIBS@						\
++	@LIBXFCEGUI4_LIBS@						\
+ 	@LIBPCRE_LIBS@							\
+ 	@GLIB_LIBS@							\
+ 	@GTHREAD_LIBS@
+@@ -43,7 +45,7 @@
+ 	-DDBUS_API_SUBJECT_TO_CHANGE					\
+ 	$(DBUS_CFLAGS)
+ 
+-xfce4_verve_plugin_LDFLAGS += 						\
++xfce4_verve_plugin_LDADD += 						\
+ 	$(DBUS_LIBS)
+ 
+ verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml 
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild
index bbd647c66d14..1ca332897121 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild,v 1.4 2009/10/24 17:54:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-0.3.6.ebuild,v 1.5 2010/08/07 17:22:14 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -18,6 +18,7 @@ IUSE="dbus debug"
 RDEPEND=">=xfce-base/exo-0.3.1.3
 	>=xfce-base/xfce4-panel-4.4
 	>=xfce-base/libxfce4util-4.4
+	>=xfce-base/libxfcegui4-4.4
 	>=dev-libs/libpcre-5
 	dbus? ( >=dev-libs/dbus-glib-0.60 )"
 DEPEND="${RDEPEND}
@@ -25,9 +26,12 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-exo.patch
+		"${FILESDIR}"/${P}-link_to_libxfcegui4.patch
+		)
 	XFCONF="--disable-dependency-tracking
 		$(use_enable dbus)
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
 	DOCS="AUTHORS ChangeLog README THANKS TODO"
-	PATCHES=( "${FILESDIR}/${P}-exo.patch" )
 }