Fix linking with xfce4-panel >= 4.7.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 47 insertions, 6 deletions

diff --git a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
index c905aad229ec..2bcbccc9e382 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
+++ b/xfce-extra/xfce4-cellmodem-plugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-extra/xfce4-cellmodem-plugin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.1 2009/08/25 10:23:47 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/ChangeLog,v 1.2 2010/08/05 23:13:58 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-cellmodem-plugin-0.0.5.ebuild,
+  +files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch:
+  Fix linking with xfce4-panel >= 4.7.
 
 *xfce4-cellmodem-plugin-0.0.5 (25 Aug 2009)
 
diff --git a/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch
new file mode 100644
index 000000000000..af945f191934
--- /dev/null
+++ b/xfce-extra/xfce4-cellmodem-plugin/files/xfce4-cellmodem-plugin-0.0.5-link_for_xfce_warn.patch
@@ -0,0 +1,31 @@
+xfce4_cellmodem_plugin-pin_helper.o: In function `pin_helper_pin_entry_callback':
+pin_helper.c:(.text+0xa6): undefined reference to `xfce_warn'
+
+--- configure.ac
++++ configure.ac
+@@ -18,6 +18,8 @@
+ AC_CHECK_FUNCS([vasprintf])
+ 
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20])
++
+ XDT_I18N([cs pt])
+ 
+ AC_ARG_ENABLE([debug],
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -3,10 +3,12 @@
+ 
+ xfce4_cellmodem_plugin_CFLAGS = \
+         -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+-	@LIBXFCE4PANEL_CFLAGS@
++	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@
+ 
+ xfce4_cellmodem_plugin_LDADD = \
+-	@LIBXFCE4PANEL_LIBS@ 
++	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCEGUI4_LIBS@
+ 
+ xfce4_cellmodem_plugin_SOURCES = \
+ 	cellmodem.c modem_driver.c \
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
index 3b8be42b1fdc..bfcef20ff603 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.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-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.1 2009/08/25 10:23:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild,v 1.2 2010/08/05 23:13:58 ssuominen Exp $
 
 EAUTORECONF=yes
 EINTLTOOLIZE=yes
@@ -17,6 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND=">=xfce-base/xfce4-panel-4.3.20
+	>=xfce-base/libxfcegui4-4.3.20
 	sys-apps/pciutils[zlib]
 	=virtual/libusb-0*"
 DEPEND="${RDEPEND}
@@ -24,10 +25,14 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 pkg_setup() {
-	PATCHES=( "${FILESDIR}/${P}-asneeded.patch" )
-	DOCS="AUTHORS ChangeLog README"
+	PATCHES=(
+		"${FILESDIR}"/${P}-asneeded.patch
+		"${FILESDIR}"/${P}-link_for_xfce_warn.patch
+		)
+
 	XFCONF="--disable-dependency-tracking
 		$(use_enable debug)"
+	DOCS="AUTHORS ChangeLog README"
 }
 
 src_prepare() {