diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2008-12-25 22:34:44 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2008-12-25 22:34:44 +0000 |
| commit | 7ba4b56874c56b9613b088071b5a21bdb765bbe1 (patch) | |
| tree | babddd27ca4519174e961abccd0556efcd503d45 /dev-java/qtjambi | |
| parent | Version bump #190983 by Daniel Pielmeier (billie). (diff) | |
| download | gentoo-2-7ba4b56874c56b9613b088071b5a21bdb765bbe1.tar.gz gentoo-2-7ba4b56874c56b9613b088071b5a21bdb765bbe1.tar.bz2 gentoo-2-7ba4b56874c56b9613b088071b5a21bdb765bbe1.zip | |
Add patches that I missed.
(Portage version: 2.1.6.2/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'dev-java/qtjambi')
| -rw-r--r-- | dev-java/qtjambi/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/qtjambi/files/configuration-4.4.3.patch | 24 | ||||
| -rw-r--r-- | dev-java/qtjambi/files/generator-4.4.3.patch | 10 |
3 files changed, 40 insertions, 2 deletions
diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog index d17cdec3e5ea..e8b54006c806 100644 --- a/dev-java/qtjambi/ChangeLog +++ b/dev-java/qtjambi/ChangeLog @@ -1,13 +1,17 @@ # ChangeLog for dev-java/qtjambi # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.15 2008/12/24 04:48:53 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.16 2008/12/25 22:34:44 ali_bush Exp $ + + 25 Dec 2008; Alistair Bush <ali_bush@gentoo.org> + +files/configuration-4.4.3.patch, +files/generator-4.4.3.patch: + Adding patches I missed. *qtjambi-4.4.3 (24 Dec 2008) 24 Dec 2008; Alistair Bush <ali_bush@gentoo.org> metadata.xml, +qtjambi-4.4.3.ebuild: Version Bump qtjambi. Thanks to all the good work done by Fabian Koster - <koesterreich@gmx.net>. + <koesterreich@gmx.net> See #233840. 21 May 2008; Ingmar Vanhassel <ingmar@gentoo.org> -files/generator-4.3.2.patch, -qtjambi-4.3.2_p1.ebuild: diff --git a/dev-java/qtjambi/files/configuration-4.4.3.patch b/dev-java/qtjambi/files/configuration-4.4.3.patch new file mode 100644 index 000000000000..df4a469534e0 --- /dev/null +++ b/dev-java/qtjambi/files/configuration-4.4.3.patch @@ -0,0 +1,24 @@ +Index: qtjambi-src-gpl-4.4.3_01/com/trolltech/tools/ant/InitializeTask.java +=================================================================== +--- qtjambi-src-gpl-4.4.3_01.orig/com/trolltech/tools/ant/InitializeTask.java ++++ qtjambi-src-gpl-4.4.3_01/com/trolltech/tools/ant/InitializeTask.java +@@ -323,7 +323,7 @@ public class InitializeTask extends Task + } + + private String decideQtDir() { +- qtdir = System.getenv("QTDIR"); ++ qtdir = "/usr/lib/qt4"; + if (qtdir == null) + throw new BuildException("QTDIR environment variable missing"); + if (!new File(qtdir).exists()) +@@ -346,8 +346,8 @@ public class InitializeTask extends Task + StringBuilder path = new StringBuilder(); + path.append(props.getProperty(null, QTDIR)); + path.append("/"); +- path.append(props.getProperty(null, LIBSUBDIR)); +- path.append("/"); ++ //path.append(props.getProperty(null, LIBSUBDIR)); ++ //path.append("/"); + path.append(LibraryEntry.formatQtName(name, debug, version)); + return new File(path.toString()).exists(); + } diff --git a/dev-java/qtjambi/files/generator-4.4.3.patch b/dev-java/qtjambi/files/generator-4.4.3.patch new file mode 100644 index 000000000000..fffaf6f09b97 --- /dev/null +++ b/dev-java/qtjambi/files/generator-4.4.3.patch @@ -0,0 +1,10 @@ +--- generator/main.h.orig ++++ generator/main.h +@@ -91,7 +91,6 @@ struct Preprocess + if (qtdir.isEmpty()) { + qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files."); + } else { +- qtdir += "/include"; + includes << (qtdir + "/QtXml"); + includes << (qtdir + "/QtNetwork"); + includes << (qtdir + "/QtCore"); |