diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-07 17:22:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-07 17:22:14 +0000 |
| commit | e2f84cf7cc1014fcbc6d822c18cc48871470ed4c (patch) | |
| tree | de774a4d837b3ecfee2714851f0ef5a462ec2215 /xfce-extra | |
| parent | alpha/ia64/sparc stable wrt #320247 (diff) | |
| download | gentoo-2-e2f84cf7cc1014fcbc6d822c18cc48871470ed4c.tar.gz gentoo-2-e2f84cf7cc1014fcbc6d822c18cc48871470ed4c.tar.bz2 gentoo-2-e2f84cf7cc1014fcbc6d822c18cc48871470ed4c.zip | |
Link to libxfcegui4 (and fix LDFLAGS vs. LDADD mistake in Makefile.am) wrt #331493 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
3 files changed, 58 insertions, 6 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/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" ) } |