summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2007-08-11 20:24:59 +0000
committerCaleb Tennis <caleb@gentoo.org>2007-08-11 20:24:59 +0000
commit0fbe5ec5916c50aa1e17f50bb88f5498d926230f (patch)
tree0b61a85ae7c104d9e72ca646ce91940ec8920cac /dev-java/qtjambi
parentx86 stable wrt #184641 (diff)
downloadgentoo-2-0fbe5ec5916c50aa1e17f50bb88f5498d926230f.tar.gz
gentoo-2-0fbe5ec5916c50aa1e17f50bb88f5498d926230f.tar.bz2
gentoo-2-0fbe5ec5916c50aa1e17f50bb88f5498d926230f.zip
add generator patch fix
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-java/qtjambi')
-rw-r--r--dev-java/qtjambi/ChangeLog6
-rw-r--r--dev-java/qtjambi/files/generator-4.3.1.patch10
-rw-r--r--dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild4
3 files changed, 17 insertions, 3 deletions
diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
index 2b4936916477..e1cead39e3b1 100644
--- a/dev-java/qtjambi/ChangeLog
+++ b/dev-java/qtjambi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/qtjambi
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.6 2007/08/09 20:18:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.7 2007/08/11 20:24:59 caleb Exp $
+
+ 11 Aug 2007; Caleb Tennis <caleb@gentoo.org> +files/generator-4.3.1.patch,
+ qtjambi-4.3.1_p1.ebuild:
+ add generator patch fix
09 Aug 2007; Caleb Tennis <caleb@gentoo.org> -qtjambi-4.3.0_p1.ebuild,
-qtjambi-4.3.0_p1-r1.ebuild:
diff --git a/dev-java/qtjambi/files/generator-4.3.1.patch b/dev-java/qtjambi/files/generator-4.3.1.patch
new file mode 100644
index 000000000000..64464f7f4baa
--- /dev/null
+++ b/dev-java/qtjambi/files/generator-4.3.1.patch
@@ -0,0 +1,10 @@
+--- generator/main.h.orig 2007-08-11 16:21:02.000000000 -0400
++++ generator/main.h 2007-08-11 16:21:25.000000000 -0400
+@@ -74,7 +74,6 @@
+ if (qtdir.isEmpty()) {
+ qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files.");
+ } else {
+- qtdir += "/include";
+ includes << qtdir;
+ includes << (qtdir + "/QtXml");
+ includes << (qtdir + "/QtNetWork");
diff --git a/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild b/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild
index 1be0e60eca06..e73364226f2a 100644
--- a/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild
+++ b/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild,v 1.1 2007/08/09 20:17:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.1_p1.ebuild,v 1.2 2007/08/11 20:24:59 caleb Exp $
inherit eutils java-pkg-2
@@ -30,7 +30,7 @@ RDEPEND="~x11-libs/qt-${QTVERSION}
src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/generator.patch
+ epatch ${FILESDIR}/generator-4.3.1.patch
epatch ${FILESDIR}/qtjambi_base.pri.diff
epatch ${FILESDIR}/jambi.pri.diff