summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-05-24 22:03:40 +0000
committerAlex Alexander <wired@gentoo.org>2010-05-24 22:03:40 +0000
commit229a0b10ffd4f013dbebb4b6cf55630602bb2b4d (patch)
tree24d24a05efecb760f354be187d4b6a08edf31efe /dev-util/universalindentgui
parentFix CC, CXX, LD and LINK in all test files, bug 321335. (diff)
downloadgentoo-2-229a0b10ffd4f013dbebb4b6cf55630602bb2b4d.tar.gz
gentoo-2-229a0b10ffd4f013dbebb4b6cf55630602bb2b4d.tar.bz2
gentoo-2-229a0b10ffd4f013dbebb4b6cf55630602bb2b4d.zip
fixed gcc 4.5 compilation bug #321323
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/universalindentgui')
-rw-r--r--dev-util/universalindentgui/ChangeLog7
-rw-r--r--dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch15
-rw-r--r--dev-util/universalindentgui/universalindentgui-1.1.0-r2.ebuild5
3 files changed, 24 insertions, 3 deletions
diff --git a/dev-util/universalindentgui/ChangeLog b/dev-util/universalindentgui/ChangeLog
index ea070e6dcc03..d7ef7f9ead83 100644
--- 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/files/universalindentgui-1.1.0-gcc45.patch b/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch
new file mode 100644
index 000000000000..564cca5be7e8
--- /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 eadbe279de0e..7b0acb3c55b1 100644
--- 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() {