summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-06-12 10:47:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-06-12 10:47:26 +0000
commit781af90b83d166cc32b32d65e19f4a872f79dd69 (patch)
treed4e66105575c6eccd89badf8f3ced1480821970f /app-editors/amyedit
parentremove old (diff)
downloadhistorical-781af90b83d166cc32b32d65e19f4a872f79dd69.tar.gz
historical-781af90b83d166cc32b32d65e19f4a872f79dd69.tar.bz2
historical-781af90b83d166cc32b32d65e19f4a872f79dd69.zip
fix build with gcc 4.5, bug #321293
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-editors/amyedit')
-rw-r--r--app-editors/amyedit/ChangeLog6
-rw-r--r--app-editors/amyedit/Manifest11
-rw-r--r--app-editors/amyedit/amyedit-1.0-r1.ebuild5
-rw-r--r--app-editors/amyedit/files/amyedit-1.0-gcc45.patch16
4 files changed, 30 insertions, 8 deletions
diff --git a/app-editors/amyedit/ChangeLog b/app-editors/amyedit/ChangeLog
index 21fa49c44b93..7ea6fa78fed9 100644
--- a/app-editors/amyedit/ChangeLog
+++ b/app-editors/amyedit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/amyedit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/ChangeLog,v 1.23 2010/06/12 10:44:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/ChangeLog,v 1.24 2010/06/12 10:47:26 aballier Exp $
+
+ 12 Jun 2010; Alexis Ballier <aballier@gentoo.org> amyedit-1.0-r1.ebuild,
+ +files/amyedit-1.0-gcc45.patch:
+ fix build with gcc 4.5, bug #321293
12 Jun 2010; Alexis Ballier <aballier@gentoo.org> -amyedit-0.9.ebuild,
-amyedit-1.0.ebuild:
diff --git a/app-editors/amyedit/Manifest b/app-editors/amyedit/Manifest
index ad4f69545882..a16daa605a02 100644
--- a/app-editors/amyedit/Manifest
+++ b/app-editors/amyedit/Manifest
@@ -1,16 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX amyedit-1.0-gcc45.patch 675 RMD160 c954e54e79b4a4e6575d0cf0935dab6bc073b28a SHA1 a38fc5c5b391dc5a54992fe0873e5c992b1fe93e SHA256 bc1cc1edd9004f9977035afdcf96c2dee9d3a2d5343d3c61af9de6ec9b9a4ca8
AUX amyedit-1.0-keyfile.patch 2123 RMD160 0b2a6411240e340b20ca487cdf751321732ede64 SHA1 93a443fc0935eb49f09464979bebc41b2eace74e SHA256 aef655d331cca213d85f6f939b70604511d7b891e33834390d250ed08b9c577a
AUX amyedit-1.0-signal.patch 3142 RMD160 0abe18918cf571d03ded7acb0399bfbe9af3f922 SHA1 5f8093eed36af7e3475b773147d5a93373c43542 SHA256 34123b5d142f9141f49cd05fa0c31cf631d6d83fe5ad1d343ecd356aedbd83a6
DIST amyedit-1.0.tar.bz2 297769 RMD160 b08ee643f2e6021e6ad7a3382c394106ea504298 SHA1 2ca1c7910b231e782596548622a51de96e1bd090 SHA256 9aa88340266827bd83715d495b7e1f2c1ca7100ff9f7586877c1b4d3ec67f228
-EBUILD amyedit-1.0-r1.ebuild 820 RMD160 aba749fea2c80b83e909d19f7c9e53d219d5db8b SHA1 23a90aeae60f7f55ff4716068ef7a907cfa2f8cb SHA256 7f2ddd2ffd2f4a8ca10f37a3452ffea6d928bc8d0f3e3b4a19f253a096ae2540
-MISC ChangeLog 2984 RMD160 2f12b00d23ae4064786ccd868ed74e1df507ab2f SHA1 7d575311f06de3057be7de390fd56d49a22d028c SHA256 815f707a165e926833986991d9f32d9fc88ea96b93e051b590c18eb0a87a9888
+EBUILD amyedit-1.0-r1.ebuild 861 RMD160 0caf0c17da13bb0f1196d091a8278af289507b36 SHA1 d41272611941461bbc8f44670161a9212d56da4b SHA256 a9893bca5e4eca4587f74cf84fd4c638b49017e08c068c270683463538a3dcbd
+MISC ChangeLog 3132 RMD160 96ae236f58480ffbff2fa9903c8bae460729fa21 SHA1 0f4dd4aa51eb4c75afe2eda78f741d64ad35b27b SHA256 a34c72debecc2d3b4bc82e96d50da9d83a30aa0e96bb05b5621b1d5041c49a0d
MISC metadata.xml 158 RMD160 bfa606b587a9accc212f1e81dbef51196e5a0744 SHA1 e2015772e89e37e6b9e1c4b66fc3c588437ef54a SHA256 13fb4255576ddeb318fb62817c06a115c1d7ea5c8b2f67db2c59a15fdb1cd95a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwTZRcACgkQvFcC4BYPU0qGiwCfRIVby+EzKElRqOxvnj64bc9G
-AV0AoJ6X+5POuW5JEVl0weM5WI+GfsJt
-=FDZV
+iEYEARECAAYFAkwTZcMACgkQvFcC4BYPU0rfmQCdEGe/D9lB6yAWozphySqsbwyl
+dnkAn0sYCu0zW+dA/e45lGzzAqxKJ64d
+=SWnM
-----END PGP SIGNATURE-----
diff --git a/app-editors/amyedit/amyedit-1.0-r1.ebuild b/app-editors/amyedit/amyedit-1.0-r1.ebuild
index df32c425f29f..56ad78656565 100644
--- a/app-editors/amyedit/amyedit-1.0-r1.ebuild
+++ b/app-editors/amyedit/amyedit-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-editors/amyedit/amyedit-1.0-r1.ebuild,v 1.6 2008/11/22 15:10:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/amyedit/amyedit-1.0-r1.ebuild,v 1.7 2010/06/12 10:47:26 aballier Exp $
inherit eutils autotools
@@ -25,6 +25,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-keyfile.patch"
epatch "${FILESDIR}/${P}-signal.patch"
+ epatch "${FILESDIR}/${P}-gcc45.patch"
eautoreconf
}
diff --git a/app-editors/amyedit/files/amyedit-1.0-gcc45.patch b/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
new file mode 100644
index 000000000000..16db9fd415f5
--- /dev/null
+++ b/app-editors/amyedit/files/amyedit-1.0-gcc45.patch
@@ -0,0 +1,16 @@
+Fix build with gcc 4.5
+https://bugs.gentoo.org/show_bug.cgi?id=321293
+
+Index: amyedit-1.0/src/Preferences.cc
+===================================================================
+--- amyedit-1.0.orig/src/Preferences.cc
++++ amyedit-1.0/src/Preferences.cc
+@@ -211,7 +211,7 @@ int Preferences::run()
+ }
+
+ void Preferences::edit_latex_commands(){
+- EditLatexCommands::EditLatexCommands dialog(this);
++ EditLatexCommands dialog(this);
+ dialog.run();
+ Amy::populate_text_list_model_from_list(previewoptionslist->get_model(), PrefStruct::instance()->get_keys("Commands"), true);
+ previewoptionslist->select(PrefStruct::instance()->get<Glib::ustring>("General", "preview_combo"));