diff options
| -rw-r--r-- | x11-misc/fme/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/fme/Manifest | 15 | ||||
| -rw-r--r-- | x11-misc/fme/files/fme-1.1.2-gcc45.patch | 31 | ||||
| -rw-r--r-- | x11-misc/fme/fme-1.1.2.ebuild | 15 |
4 files changed, 50 insertions, 19 deletions
diff --git a/x11-misc/fme/ChangeLog b/x11-misc/fme/ChangeLog index 780bbcfa5bbf..a2bcd89b8db2 100644 --- a/x11-misc/fme/ChangeLog +++ b/x11-misc/fme/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/fme -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fme/ChangeLog,v 1.6 2008/09/22 13:04:39 omp Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fme/ChangeLog,v 1.7 2010/05/06 11:18:59 ssuominen Exp $ + + 06 May 2010; Samuli Suominen <ssuominen@gentoo.org> fme-1.1.2.ebuild, + +files/fme-1.1.2-gcc45.patch: + Fix building with GCC 4.5+ wrt #318409. 22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml: Change herd from commonbox to desktop-wm. diff --git a/x11-misc/fme/Manifest b/x11-misc/fme/Manifest index de3cbf2e139f..76f4f629ec04 100644 --- a/x11-misc/fme/Manifest +++ b/x11-misc/fme/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX fme-1.1.2-gcc45.patch 1205 RMD160 3ed95c0747cc5aedb7d1140f5275635ea98fc80f SHA1 4eb57270533ddff0557dae789be4e760c2c00dbe SHA256 8736fc3aab014c75585329e83151cac5a25eec4233fff63345d9b0fc25ff5f4c DIST fme-1.1.0.tar.gz 351739 RMD160 3278f2a0e2a2671fe35eeee6eea69fe46877f05d SHA1 79dc42e5f08d204dc2f58dea244148e56267fbf4 SHA256 8d6a94fc84c08ad7d971f3332e2c6f160c5d0f38fe89254a67c0d2dbf1f052f4 DIST fme-1.1.2.tar.gz 351800 RMD160 120759496943f5e9945331ceb6441ad1e054a6fa SHA1 285fe6236ca283ad7f919da0ea0812e63c382be9 SHA256 e1b3e1a34075f5b3684765241bd740a9338aff4409896b70e7534492cdb78fe0 EBUILD fme-1.1.0.ebuild 799 RMD160 1d6974746be9935bfd538ab8a270a904fedd3e06 SHA1 b50eab145d2deb6fb5e6893c57c1121c804de926 SHA256 428e20613d24a66f31c520ce1c05fab656396d3101f7b3c2dd4df2f25a948289 -EBUILD fme-1.1.2.ebuild 799 RMD160 ac77d4205c7d7ac7ef2855353d3142c0bbb13e9d SHA1 b4e5430a1f7e0284b2ea92571a6b572d13129451 SHA256 e8b6f7939edae041dd11f6b11a617a25d1850a16d1629164c7ca2709a8468c48 -MISC ChangeLog 998 RMD160 626434b5edb6fc6c2156866450e70cd10ecf54d1 SHA1 4bf869fccf17c45697a1d6844ff95ca96a34c303 SHA256 2c41233df7838588f6775260b5bcaefe95673ae1c931a7d346cf2433c440a4d6 +EBUILD fme-1.1.2.ebuild 852 RMD160 4d787bf35edc511b952edcff28901a9357627af5 SHA1 a61f62d8f0693119b76d0added5767b51a261f89 SHA256 62ee14b6ffbfc4519955f772ec2d048fb07ed19b0324d414c940e005f38688fa +MISC ChangeLog 1151 RMD160 fb3f9c37be1b1cb9fd8017b828317b9af3f64782 SHA1 cc8591db5c2c57598e93e7efef611b70ab5e73a9 SHA256 f1c253ec47881332ea5096aad7dbedb8d7f098d25f5eff9af01b8abf03b43749 MISC metadata.xml 252 RMD160 9aee742c6964eb4b20d1f7b66d841f8a1d79a593 SHA1 5584b7e61a123cbb415c3d6c9cc275a5d8483734 SHA256 5b00daa050bc4717874e5a48880e5d5585e002497999e18e887a553ee99a0187 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkjXl+4ACgkQvSApE0uP4UutswCdHYGvVwh06UMF0tn4S0vo/Ffi -VjcAn2lt23RmWUfICiA8QGzPr4+0Pr1l -=kv4Y ------END PGP SIGNATURE----- diff --git a/x11-misc/fme/files/fme-1.1.2-gcc45.patch b/x11-misc/fme/files/fme-1.1.2-gcc45.patch new file mode 100644 index 000000000000..6c554a43a643 --- /dev/null +++ b/x11-misc/fme/files/fme-1.1.2-gcc45.patch @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/318409 + +--- src/ui.cc ++++ src/ui.cc +@@ -886,7 +886,7 @@ + unsigned i=1; + for ( Glib::Container_Helpers::ArrayHandleIterator<Glib::Container_Helpers::TypeTraits<Glib::ustring> > iter=dirs.begin(); iter!=dirs.end(); iter++ ) { + try { +- Glib::Dir::Dir directory(*iter); ++ Glib::Dir directory(*iter); + #else + boost::regex re("\\:"); + boost::sregex_token_iterator dir(path.begin(), path.end(), re, -1); +@@ -894,7 +894,7 @@ + + for ( unsigned i=1; dir!=end;) { + try { +- Glib::Dir::Dir directory(*dir++); ++ Glib::Dir directory(*dir++); + #endif /* GLIBMM_REGEX */ + for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { + Gtk::TreeModel::Row rowCompletion = *(refCompletionModel->append()); +@@ -1259,7 +1259,7 @@ + + for ( std::vector<Glib::ustring>::iterator iterPath = preferences.getPathsIcons().begin(); iterPath!=preferences.getPathsIcons().end(); iterPath++ ) { + try { +- Glib::Dir::Dir directory(*iterPath); ++ Glib::Dir directory(*iterPath); + for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { + Glib::ustring icon_name = *iter; + if ( icon_name.find(command_name)!=Glib::ustring::npos ) { diff --git a/x11-misc/fme/fme-1.1.2.ebuild b/x11-misc/fme/fme-1.1.2.ebuild index 38907d6a789e..8e4753d8c944 100644 --- a/x11-misc/fme/fme-1.1.2.ebuild +++ b/x11-misc/fme/fme-1.1.2.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fme/fme-1.1.2.ebuild,v 1.1 2008/08/25 20:34:48 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fme/fme-1.1.2.ebuild,v 1.2 2010/05/06 11:18:59 ssuominen Exp $ +EAPI=2 inherit eutils DESCRIPTION="Graphical menu editor for Fluxbox menus" HOMEPAGE="http://fme.rhymux.info/" SRC_URI="http://fme.rhymux.info/stable/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -17,12 +19,15 @@ RDEPEND="sys-devel/bc >=dev-cpp/gtkmm-2.4 >=dev-cpp/glibmm-2.14.0 >=dev-cpp/libglademm-2.4" +DEPEND="${RDEPEND} + dev-util/pkgconfig" -DEPEND="dev-util/pkgconfig - ${RDEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc45.patch +} src_install() { - emake DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install || die doicon glade/${PN}.png make_desktop_entry ${PN} "Fluxbox Menu Editor" ${PN} "Settings;DesktopSettings" |