From f2206e3dd78989ed968dcf5e2dd5fd6d13485d2e Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 23 Jun 2010 19:22:50 +0000 Subject: [PATCH] =?utf8?q?Fix=20building=20with=20GCC=204.5+=20wrt=20#3230?= =?utf8?q?79=20by=20Diego=20E.=20Petten=C3=B2.=20Package-Manager:=20portag?= =?utf8?q?e-2.2=5Frc67/cvs/Linux=20x86=5F64?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- gnome-extra/wp_tray/ChangeLog | 6 ++++- gnome-extra/wp_tray/Manifest | 5 ++-- .../wp_tray/files/wp_tray-0.5.5-gcc45.patch | 13 ++++++++++ gnome-extra/wp_tray/wp_tray-0.5.5.ebuild | 26 +++++++++---------- 4 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 gnome-extra/wp_tray/files/wp_tray-0.5.5-gcc45.patch diff --git a/gnome-extra/wp_tray/ChangeLog b/gnome-extra/wp_tray/ChangeLog index 4ed7f6d2844b..6c19280ca269 100644 --- a/gnome-extra/wp_tray/ChangeLog +++ b/gnome-extra/wp_tray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/wp_tray # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/wp_tray/ChangeLog,v 1.3 2010/06/23 19:13:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/wp_tray/ChangeLog,v 1.4 2010/06/23 19:22:50 ssuominen Exp $ + + 23 Jun 2010; Samuli Suominen wp_tray-0.5.5.ebuild, + +files/wp_tray-0.5.5-gcc45.patch: + Fix building with GCC 4.5+ wrt #323079 by Diego E. Pettenò. 23 Jun 2010; Samuli Suominen wp_tray-0.5.5.ebuild: Missing libpanelapplet-2.0 rdep wrt #320117 by Diego E. Pettenò. diff --git a/gnome-extra/wp_tray/Manifest b/gnome-extra/wp_tray/Manifest index 2eca26fa3b8b..77afaed48090 100644 --- a/gnome-extra/wp_tray/Manifest +++ b/gnome-extra/wp_tray/Manifest @@ -1,4 +1,5 @@ +AUX wp_tray-0.5.5-gcc45.patch 325 RMD160 17d59214c712323b6e76920cf48bb4c18e240251 SHA1 70457f26dc961f510263f66762f5052183eefc0b SHA256 597e0847d3708266855459a070b5e43415dcb012ba8b698afa83f856aa867eb6 DIST wp_tray-0.5.5.tar.gz 421998 RMD160 f555c5bc6212051dd76759d0128e646057594b7c SHA1 0bbef163d879f5f59f739862cbd46631a1b30df9 SHA256 6896098263d821e9c8f42fe932b3bac12748e2dcdc1ebdd18c70107cdf02c177 -EBUILD wp_tray-0.5.5.ebuild 1079 RMD160 f070da34c19f8c72b1a2a9d7ef3ca5b891be645d SHA1 e58f7245400045c5e42e26078e86a5fc7d13b82d SHA256 daab1b5858615976bc4fd03b4727b039d0b9edd640f2ab2657a6840650be03c8 -MISC ChangeLog 680 RMD160 5f8f125ebc75161125a172c2d0c233a5f0353981 SHA1 5ffea6a011ce755171d457f1f02aee8b1cc256ef SHA256 5fb48d58f219f0010e11aca3a3ce4cc60546dcc44fac570bba657eaa2edc5e78 +EBUILD wp_tray-0.5.5.ebuild 1079 RMD160 70cec1fdbaadf803d23f89bd751a60d6bdc03f68 SHA1 a0f128975bfb9487ad4081d4ae83caea23a805d6 SHA256 97aff84282e956034de10c76185c390c55b4a2d8de03597bb2dc9f831e89ce8f +MISC ChangeLog 856 RMD160 b81ac06f98dc6fd61d7fa2ade8fdd8676768fb3c SHA1 04395fed9e6da4fb49876c7c14430c3b67239497 SHA256 521d546008a51a399ba25100eba3212a8e65f327cf6c940db5e16f1f40bf7972 MISC metadata.xml 256 RMD160 8dc7a4052a6af09de33b041a5db3fcaef3ad2abd SHA1 bea8cc6ebcd55181ce2f60be7e5e22e9e3750666 SHA256 937bb978f6db779ce4b544b7f60d3fd8d08f732d3a59fbad44f928f7837b7c68 diff --git a/gnome-extra/wp_tray/files/wp_tray-0.5.5-gcc45.patch b/gnome-extra/wp_tray/files/wp_tray-0.5.5-gcc45.patch new file mode 100644 index 000000000000..3667fa97a138 --- /dev/null +++ b/gnome-extra/wp_tray/files/wp_tray-0.5.5-gcc45.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/323079 + +--- src/Applet.hh ++++ src/Applet.hh +@@ -77,7 +77,7 @@ + std::auto_ptr m_pAboutBox; + + Gtk::EventBox m_GtkEventBox; +- Gtk::Image::Image m_GtkImage; ++ Gtk::Image m_GtkImage; + Gtk::Tooltips m_GtkTooltips; + + Glib::RefPtr m_pGdkIcon; diff --git a/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild b/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild index c27596f98bf0..a9287b3cc237 100644 --- a/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild +++ b/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild,v 1.4 2010/06/23 19:13:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/wp_tray/wp_tray-0.5.5.ebuild,v 1.5 2010/06/23 19:22:50 ssuominen Exp $ -inherit gnome2 multilib eutils +EAPI=2 +GCONF_DEBUG=no +inherit eutils gnome2 multilib DESCRIPTION="Wallpaper Manager for the Gnome Desktop" HOMEPAGE="http://planetearthworm.com/projects/wp_tray" - SRC_URI="http://planetearthworm.com/projects/${PN}/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -24,19 +25,18 @@ DEPEND="${RDEPEND} dev-util/pkgconfig dev-libs/boost" -src_compile() { - local myconf - - myconf="${myconf} --with-boostfilesystem=/usr/$(get_libdir)/libboost_filesystem.so" - myconf="${myconf} --with-boostregex=/usr/$(get_libdir)/libboost_regex.so" +pkg_setup() { + G2CONF="${G2CONF} --with-boostfilesystem=/usr/$(get_libdir)/libboost_filesystem.so" + G2CONF="${G2CONF} --with-boostregex=/usr/$(get_libdir)/libboost_regex.so" + DOCS="AUTHORS ChangeLog NEWS README*" +} - econf ${myconf} || die "Configure failure" - emake || die "Make failure" +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc45.patch + gnome2_src_prepare } src_install() { addpredict /root/.gconf gnome2_src_install } - -DOCS="AUTHORS ChangeLog INSTALL NEWS README*" -- 2.26.2