Fix linking error with xfce4-panel >= 4.7.

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

4 files changed, 53 insertions, 7 deletions

diff --git a/xfce-extra/xfce4-wavelan-plugin/ChangeLog b/xfce-extra/xfce4-wavelan-plugin/ChangeLog
index 050d63fd0e37..8c3c6e92ae9a 100644
--- a/xfce-extra/xfce4-wavelan-plugin/ChangeLog
+++ b/xfce-extra/xfce4-wavelan-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-wavelan-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.6 2009/09/05 15:34:54 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.7 2010/08/05 22:47:22 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-wavelan-plugin-0.5.5.ebuild,
+  +files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch:
+  Fix linking error with xfce4-panel >= 4.7.
 
   05 Sep 2009; Brent Baude <ranger@gentoo.org>
   xfce4-wavelan-plugin-0.5.5.ebuild:
diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 210e65b7187d..03d4f191453c 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,4 +1,5 @@
+AUX xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch 1012 RMD160 897911fccfbea496fef86d97be24dd0b1ee80ca9 SHA1 b31705365cc6e2b7086f6f2a3beca2d43f54fdbb SHA256 5ccdfcbaaf1f2e7a7e29d23b6703967ce00d6af0b46e1560aa97538c44a82e55
 DIST xfce4-wavelan-plugin-0.5.5.tar.bz2 260828 RMD160 8f507a51d4099dabfd055d284ed1884d40bc7ad8 SHA1 ed76f631ecd154fefacac288d1e7f6afa8ada3c1 SHA256 634b6ebff5b02b843646d4056ee64191f316bd45c54fe26f55ed0154e214e0c0
-EBUILD xfce4-wavelan-plugin-0.5.5.ebuild 818 RMD160 3540ae3a2196ea531b1ca5fc6bbcde6951adacf1 SHA1 d08c658e5a040822e1fdad40271e92c137c6a57f SHA256 252c4ba010d79cfec04a066a82d22877ba4977fd21fc6c679e576893c841e4ac
-MISC ChangeLog 1107 RMD160 2930dc01584dbd9b79052e2b44d962d41b233c67 SHA1 c5f56a974cc1c6435ba08b8e7fbf08e3479c415d SHA256 26ba3b676ba5d2fa38ced714c1e06e42b765aa1f8c0f1eeecc8bbb9bfac1d2dd
+EBUILD xfce4-wavelan-plugin-0.5.5.ebuild 935 RMD160 62bd083044e5268979aa059aa7d10e841b33d2b1 SHA1 4808da1a97a4f067b1cc6d6eb0d6f8a34413363a SHA256 23849dd93a11491eb8f7531b3ef609387a1e8a68cef19007452f36be9c45577c
+MISC ChangeLog 1318 RMD160 fcd9178dfefd284c683f2d031854a6720ae2fcf5 SHA1 c18d59c152599bb73b49ffe72dbd86f36d6b21d2 SHA256 0e9c5012ee35269795a97829b040cf19c6fc57fcc63c5d6d0fe08d0c1da51e8e
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
diff --git a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch
new file mode 100644
index 000000000000..d5298adff79b
--- /dev/null
+++ b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch
@@ -0,0 +1,37 @@
+Because xfce4-panel is using libxfce4ui instead of libxfcegui4 the flags won't get inherited anymore.
+
+xfce4_wavelan_plugin-wavelan.o: In function `wavelan_configure':
+wavelan.c:(.text+0xed9): undefined reference to `xfce_create_header'
+
+--- configure.in
++++ configure.in
+@@ -49,6 +49,7 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ 
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -11,7 +11,8 @@
+ #	libwavelan.la
+ 
+ xfce4_wavelan_plugin_LDFLAGS =							\
+-				@LIBXFCE4PANEL_LIBS@
++				@LIBXFCE4PANEL_LIBS@ \
++				@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_wavelan_plugin_SOURCES =							\
+ 	wavelan.c							\
+@@ -21,7 +22,8 @@
+ 	wi_linux.c
+ 
+ xfce4_wavelan_plugin_CFLAGS =							\
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ # .desktop file
+ #
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild
index b1ba4062859f..7a1e00f841da 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild
@@ -1,8 +1,9 @@
-# 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-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild,v 1.6 2009/09/05 15:34:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild,v 1.7 2010/08/05 22:47:21 ssuominen Exp $
 
 EAPI=2
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Wireless monitor panel plugin"
@@ -15,6 +16,7 @@ KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/xfce4-panel-4.3.20
+	>=xfce-base/libxfcegui4-4.3.20
 	>=xfce-base/libxfce4util-4.3.20
 	>=x11-libs/gtk+-2.6:2"
 DEPEND="${RDEPEND}
@@ -24,5 +26,6 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 	XFCONF="--disable-dependency-tracking
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
+	PATCHES=( "${FILESDIR}"/${P}-libs_for_xfce_create_header.patch )
 }