fixed gcc 4.5 compilation bug #321323

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-util/universalindentgui/ChangeLog b/dev-util/universalindentgui/ChangeLog
index ea070e6dcc030bb8af6e3691256a08130faee9be..d7ef7f9ead833b6138c0a1e3aba5818f486df238 100644 (file)
--- a/dev-util/universalindentgui/ChangeLog
+++ b/dev-util/universalindentgui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/universalindentgui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/ChangeLog,v 1.8 2010/01/02 21:06:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/ChangeLog,v 1.9 2010/05/24 22:03:39 wired Exp $
+
+  24 May 2010; Alex Alexander <wired@gentoo.org>
+  universalindentgui-1.1.0-r2.ebuild,
+  +files/universalindentgui-1.1.0-gcc45.patch:
+  fixed gcc 4.5 compilation bug #321323, thanks to Kacper Kowalik
 
   02 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   universalindentgui-1.1.0-r2.ebuild:

diff --git a/dev-util/universalindentgui/Manifest b/dev-util/universalindentgui/Manifest
index b1498b7e957ad2c7e00d3a30a10856a7586ea203..a269a34bd3acd4a0fe851abd0008922204a708e3 100644 (file)
--- a/dev-util/universalindentgui/Manifest
+++ b/dev-util/universalindentgui/Manifest
@@ -1,4 +1,5 @@
+AUX universalindentgui-1.1.0-gcc45.patch 423 RMD160 5d07e718e821de5f519e8d467a8a8a5c04a1f821 SHA1 a6205b67c4ac4963fb4f40c6c26b150933ceab47 SHA256 c0755faf167fd9b67ee9aa7713808aeaeddfcb20ae07872dc2a8838fa8ff1efd
 DIST universalindentgui-1.1.0.tar.gz 934141 RMD160 0d6e84e5b9a8b4835c7cb1d6ec7c078cfe3fff36 SHA1 e1bb09e48bb2d927d2a9e59eb5b8eb7fa2a8193e SHA256 6b1d06e2a9d441ea330d45e0d8e9099acb3066a3ca259a5f0d604cd18a1025d6
-EBUILD universalindentgui-1.1.0-r2.ebuild 3719 RMD160 7555ec8f5825ddd55981ac40e3f3ef7951503e31 SHA1 603b829b9cae5c8964049b278e8a193cc32d1752 SHA256 bd88657c9585295b4afa8b202c7c7aca0bf2eeca7a4bf7752a9203d8457247b2
-MISC ChangeLog 1432 RMD160 88bbb0848d0e5953842076f56c243edc74bbfe62 SHA1 d5cbca049e32a250be127029fc798c54826ca8bf SHA256 f1de85e6ab19bfe873f1e08ee5a0662f1309a15039ee1ab7e888c22dce9914ec
+EBUILD universalindentgui-1.1.0-r2.ebuild 3764 RMD160 66e5594a9f3385a7a6836b037641387deb70fc86 SHA1 71ad6afd8fe290a93e26f559ef5d7473e43cbb49 SHA256 52f2cef7801c77193c3a7e7046bdb0eaf35b90fcb33b1a49059613b8b03b269e
+MISC ChangeLog 1632 RMD160 5cd2ec937adaf68010ed2f87c69870de1beb67ec SHA1 a3e14eb6525ad2c53abd7714a737db726768378c SHA256 7fb8caee5ec79f004c2c90535f18b796272f9a7961503e26a7aa78a9aafcc8aa
 MISC metadata.xml 356 RMD160 4d279df51ce172f5947ac8332613d56331c86ebf SHA1 cd2cdf21d586eedf80ae3d56c5c6a1145da8709f SHA256 221135864588497dc8022a255c5b6d0d42aeb8ec28e3442ffcdbe015ee7ca0bb

diff --git a/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch b/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch
new file mode 100644 (file)
index 0000000..564cca5
--- /dev/null
+++ b/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+https://bugs.gentoo.org/321323
+
+--- src/UiGuiIniFileParser.cpp
++++ src/UiGuiIniFileParser.cpp
+@@ -51,7 +51,7 @@
+     \brief Directly loads and parses the file with name \a iniFileName.
+  */
+ UiGuiIniFileParser::UiGuiIniFileParser(const QString &iniFileName) {
+-    UiGuiIniFileParser::UiGuiIniFileParser();
++    UiGuiIniFileParser();
+     this->iniFileName = iniFileName;
+     parseIniFile();
+ }

diff --git a/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild b/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild
index eadbe279de0e094d1d418349cd9f7b5f2bb980d1..7b0acb3c55b10380c3310845184d1a1cb26300f8 100644 (file)
--- a/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild
+++ b/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild,v 1.3 2010/01/02 21:06:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild,v 1.4 2010/05/24 22:03:39 wired Exp $
 
 EAPI="2"
 
-inherit qt4-r2
+inherit eutils qt4-r2
 
 DESCRIPTION="Cross platform compatible GUI for several code formatters, beautifiers and indenters."
 HOMEPAGE="http://universalindent.sourceforge.net/"
@@ -117,6 +117,7 @@ src_prepare() {
                fi
        done
 
+       epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {