diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-08 15:55:37 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-08 15:55:37 +0000 |
commit | 6061c8b3c1e34a70ee77cf25ebf79757acf610b3 (patch) | |
tree | fbfd41eef75997589161097687ccb00c013d926b /xfce-extra | |
parent | bump (diff) | |
download | historical-6061c8b3c1e34a70ee77cf25ebf79757acf610b3.tar.gz historical-6061c8b3c1e34a70ee77cf25ebf79757acf610b3.tar.bz2 historical-6061c8b3c1e34a70ee77cf25ebf79757acf610b3.zip |
Link to libxfcegui4 wrt #331495 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
4 files changed, 46 insertions, 8 deletions
diff --git a/xfce-extra/xfce4-radio-plugin/ChangeLog b/xfce-extra/xfce4-radio-plugin/ChangeLog index cf7df69d4465..a2f7c4810df5 100644 --- a/xfce-extra/xfce4-radio-plugin/ChangeLog +++ b/xfce-extra/xfce4-radio-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-radio-plugin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.4 2009/08/26 10:10:35 fauli Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/ChangeLog,v 1.5 2010/08/08 15:55:37 ssuominen Exp $ + + 08 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-radio-plugin-0.4.2.ebuild, + +files/xfce4-radio-plugin-0.4.2-link_to_libxfcegui4.patch: + Link to libxfcegui4 wrt #331495 by Diego E. Pettenò. 26 Aug 2009; Christian Faulhammer <fauli@gentoo.org> xfce4-radio-plugin-0.4.2.ebuild: diff --git a/xfce-extra/xfce4-radio-plugin/Manifest b/xfce-extra/xfce4-radio-plugin/Manifest index cc6837e437ab..d0f8623d943b 100644 --- a/xfce-extra/xfce4-radio-plugin/Manifest +++ b/xfce-extra/xfce4-radio-plugin/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-radio-plugin-0.4.2-link_to_libxfcegui4.patch 805 RMD160 1bc01b6c01a8d0997211e1e497c93655485b011d SHA1 652e4405fa87ff3b160cdba8018f34d757b866b5 SHA256 b2302d132f10c50b5e896278e45e1f2f298a2edfee08bd4af4b101693fa7088f DIST xfce4-radio-plugin-0.4.2.tar.gz 160833 RMD160 fba36a0ea669dc49d3df70cc9b6815636d636f73 SHA1 0802d08c5489aa8712757e430eb7c1129886ea4d SHA256 307186c73114491890fd3a6764664aaa553861ca2f8e30b45d0424bbd22093e0 -EBUILD xfce4-radio-plugin-0.4.2.ebuild 902 RMD160 7680e1a041d262423e7ed282ee2ae437172f8c28 SHA1 a2003c455f6ff4d477d1308dd7ea7ebedaac66c7 SHA256 98c22aa1da9d0747343b8acae3fea10fa1c2b0ddbedc56d6eda2ecf871f17bcf -MISC ChangeLog 891 RMD160 54ca95cfc667f2fefa77e35b6f9d851b1032559a SHA1 91e10533bdec837e50bc775514153062d6c43553 SHA256 3877002caa888effa0158552d890b2d4cf30d073ae950ccca97f64ea886b3ae7 +EBUILD xfce4-radio-plugin-0.4.2.ebuild 1008 RMD160 b5e1eeed5145461f66c963386b33102cfd4b6566 SHA1 aced0dbe9db51202e35d0aa3f6afb1dbf80f6f3c SHA256 71f054133147d2450ee8ae52c23d6b8fd1d56d22da3f8d2fc3536e1dfab1bc33 +MISC ChangeLog 1102 RMD160 4be730997a1bfceca5e9b870e4ac51578c72db79 SHA1 95407b9db3d65e4c9664d41c5d040b5484bd54d3 SHA256 6e54082dda5b3c829847791b6dbadddaec106cf8448706388b6b0825570b2afb MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/xfce4-radio-plugin/files/xfce4-radio-plugin-0.4.2-link_to_libxfcegui4.patch b/xfce-extra/xfce4-radio-plugin/files/xfce4-radio-plugin-0.4.2-link_to_libxfcegui4.patch new file mode 100644 index 000000000000..fb23955df677 --- /dev/null +++ b/xfce-extra/xfce4-radio-plugin/files/xfce4-radio-plugin-0.4.2-link_to_libxfcegui4.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/show_bug.cgi?id=331495 +http://bugzilla.xfce.org/show_bug.cgi?id=6621 + +--- configure.in ++++ configure.in +@@ -31,6 +31,7 @@ + + dnl configure the panel plugin + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22]) ++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22]) + + dnl check for i18n support + XDT_I18N([ar ca cs da de en_GB es eu fr gl hu id it ja lv nl pl pt_BR pt ru sq sv tr uk ur zh_TW ]) +--- panel-plugin/Makefile.am ++++ panel-plugin/Makefile.am +@@ -10,10 +10,12 @@ + xfce4_radio_plugin_CFLAGS = \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ \ + -std=c99 + + xfce4_radio_plugin_LDADD = \ +- @LIBXFCE4PANEL_LIBS@ ++ @LIBXFCE4PANEL_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ + + # .desktop file + # diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild index aa8143610dfb..8bc84bd998ea 100644 --- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild +++ b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild @@ -1,8 +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-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild,v 1.5 2010/03/20 17:43:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.4.2.ebuild,v 1.6 2010/08/08 15:55:37 ssuominen Exp $ EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Panel plugin to control V4L radio device" @@ -14,19 +15,21 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="debug" -RDEPEND=">=xfce-base/xfce4-panel-4.3.22" +RDEPEND=">=xfce-base/libxfcegui4-4.3.22 + >=xfce-base/xfce4-panel-4.3.22" DEPEND="${RDEPEND} dev-util/pkgconfig >=dev-util/intltool-0.40" pkg_setup() { + PATCHES=( "${FILESDIR}"/${P}-link_to_libxfcegui4.patch ) XFCONF="--disable-dependency-tracking - $(use_enable debug)" + $(xfconf_use_debug)" DOCS="AUTHORS ChangeLog NEWS README" } src_prepare() { - xfconf_src_prepare echo panel-plugin/radio.desktop.in.in >> po/POTFILES.skip echo panel-plugin/xfce4-radio.c >> po/POTFILES.skip + xfconf_src_prepare } |