diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-09 12:55:00 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-09 12:55:00 +0000 |
| commit | 314a5ae95e333ace0cc6d5896f49275eb7dd9ba5 (patch) | |
| tree | 9b1f603e49eb8498561a9f371a34482b18bc3a78 /xfce-extra/xfce4-mpc-plugin | |
| parent | Drop useless kde_minimal definition. (diff) | |
| download | historical-314a5ae95e333ace0cc6d5896f49275eb7dd9ba5.tar.gz historical-314a5ae95e333ace0cc6d5896f49275eb7dd9ba5.tar.bz2 historical-314a5ae95e333ace0cc6d5896f49275eb7dd9ba5.zip | |
Fix exo-0.5 detection and link to libxfcegui4 wrt #331499 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra/xfce4-mpc-plugin')
4 files changed, 51 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-mpc-plugin/ChangeLog b/xfce-extra/xfce4-mpc-plugin/ChangeLog index b6811280c6ae..2676c05590ed 100644 --- a/xfce-extra/xfce4-mpc-plugin/ChangeLog +++ b/xfce-extra/xfce4-mpc-plugin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-extra/xfce4-mpc-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/ChangeLog,v 1.7 2010/06/30 16:08:27 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/ChangeLog,v 1.8 2010/08/09 12:54:59 ssuominen Exp $ + + 09 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-mpc-plugin-0.3.5.ebuild, + +files/xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch: + Fix exo-0.5 detection and link to libxfcegui4 wrt #331499 by Diego E. + Pettenò. 30 Jun 2010; Christian Faulhammer <fauli@gentoo.org> xfce4-mpc-plugin-0.3.5.ebuild: diff --git a/xfce-extra/xfce4-mpc-plugin/Manifest b/xfce-extra/xfce4-mpc-plugin/Manifest index 64f15ba6b61b..3acfe52f7d51 100644 --- a/xfce-extra/xfce4-mpc-plugin/Manifest +++ b/xfce-extra/xfce4-mpc-plugin/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch 970 RMD160 e931f8e1e4f04ca110b294ac1ad9b0a00af7b43e SHA1 6e82c514a2d80cbd0110702d4ae828d5811abaf6 SHA256 d34fcd77aa80845c7af182a02a9999a419a0a4299a4ec812170b859c762ce4cb DIST xfce4-mpc-plugin-0.3.5.tar.bz2 107366 RMD160 d469b909f63dc0b32ac0865e5c43d37451f661eb SHA1 3c1f60b762ea2de80014f95f44441f686018e0e5 SHA256 5f986d089b1f1d19a30aacb0e7dd95866662977290a5bde2360572cd02d6dddb -EBUILD xfce4-mpc-plugin-0.3.5.ebuild 749 RMD160 ae3b3d9e35e206422eeae567eeefb442da01c187 SHA1 3148e4132201a2f807e9ac231af6629986c9a849 SHA256 16bd56fba69ebb2eb687f546148925f6070fe8b841de289e88101ffb2c89ae9b -MISC ChangeLog 1264 RMD160 74bed3cbab79c7ab18a4add42b9934089ea69eac SHA1 f8f34af2de40382a73772b3d717f644edb99ddaf SHA256 dea723034f22f0ffc87b106cd56f893efb997fa199e05783fbc4b017706f1a8f +EBUILD xfce4-mpc-plugin-0.3.5.ebuild 891 RMD160 c256655d6e05ea57c16411d43fd91bb2ca21eb1d SHA1 91df8c65101c3809f136e1913cf189071a88eef9 SHA256 6f2e0c0b25382e0d055afb8b256e138ddbe0e93058cfea4b114e86f36097cc10 +MISC ChangeLog 1499 RMD160 4bdc0cc14a74e65abc7926b71fec9d46f17a421e SHA1 ed7f6f895ce44c944de35ec87b1e6fe9313b5d2d SHA256 f22693e681596e071447ed66669135a6014feef43dd3828f8e735751ecb5437c MISC metadata.xml 303 RMD160 766676e31e2b35a5b7b141b880732e1f77357b40 SHA1 18901caa7d7cefebfac0541894cb7535e2d2a903 SHA256 0125ccd39ba1cf3fa1a712da026895ea2888e2fe512e98ef84bb219aa8414032 diff --git a/xfce-extra/xfce4-mpc-plugin/files/xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch b/xfce-extra/xfce4-mpc-plugin/files/xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch new file mode 100644 index 000000000000..82b20a313187 --- /dev/null +++ b/xfce-extra/xfce4-mpc-plugin/files/xfce4-mpc-plugin-0.3.5-exo_and_libxfcegui4.patch @@ -0,0 +1,34 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=6623 +http://bugs.gentoo.org/show_bug.cgi?id=331499 + +--- configure.ac ++++ configure.ac +@@ -40,7 +40,9 @@ + + dnl configure the panel plugin + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22]) +-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1]) ++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22]) ++XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1], [], ++ [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])]) + + dnl check for libmpd presence + AC_ARG_WITH(libmpd, +--- panel-plugin/Makefile.am ++++ panel-plugin/Makefile.am +@@ -4,11 +4,13 @@ + xfce4_mpc_plugin_CFLAGS = \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + @EXO_CFLAGS@ \ +- @LIBXFCE4PANEL_CFLAGS@ ++ @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ + + xfce4_mpc_plugin_LDADD = \ + @EXO_LIBS@ \ +- @LIBXFCE4PANEL_LIBS@ ++ @LIBXFCE4PANEL_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ + + + xfce4_mpc_plugin_SOURCES = xfce4-mpc-plugin.c xfce4-mpc-plugin.h diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild index 16370ea2862d..606953380460 100644 --- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild +++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild,v 1.3 2010/06/30 16:08:27 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.3.5.ebuild,v 1.4 2010/08/09 12:54:59 ssuominen Exp $ +EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Music Player Daemon (mpd) panel plugin" @@ -13,13 +15,16 @@ SLOT="0" KEYWORDS="amd64 ~ppc64 x86" IUSE="debug libmpd" -RDEPEND=">=xfce-base/xfce4-panel-4.3.22 +RDEPEND=">=xfce-base/exo-0.3.1.1 + >=xfce-base/libxfcegui4-4.3.22 + >=xfce-base/xfce4-panel-4.3.22 libmpd? ( media-libs/libmpd )" DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool" pkg_setup() { + PATCHES=( "${FILESDIR}"/${P}-exo_and_libxfcegui4.patch ) XFCONF="--disable-dependency-tracking $(use_enable libmpd) $(xfconf_use_debug)" |