| 1 |
ali_bush 08/12/25 22:34:43 |
| 2 |
|
| 3 |
Added: configuration-4.4.3.patch generator-4.4.3.patch |
| 4 |
Log: |
| 5 |
Add patches that I missed. |
| 6 |
(Portage version: 2.1.6.2/cvs/Linux 2.6.27-gentoo-r4 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/qtjambi/files/configuration-4.4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/files/configuration-4.4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/files/configuration-4.4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: configuration-4.4.3.patch |
| 15 |
=================================================================== |
| 16 |
Index: qtjambi-src-gpl-4.4.3_01/com/trolltech/tools/ant/InitializeTask.java |
| 17 |
=================================================================== |
| 18 |
--- qtjambi-src-gpl-4.4.3_01.orig/com/trolltech/tools/ant/InitializeTask.java |
| 19 |
+++ qtjambi-src-gpl-4.4.3_01/com/trolltech/tools/ant/InitializeTask.java |
| 20 |
@@ -323,7 +323,7 @@ public class InitializeTask extends Task |
| 21 |
} |
| 22 |
|
| 23 |
private String decideQtDir() { |
| 24 |
- qtdir = System.getenv("QTDIR"); |
| 25 |
+ qtdir = "/usr/lib/qt4"; |
| 26 |
if (qtdir == null) |
| 27 |
throw new BuildException("QTDIR environment variable missing"); |
| 28 |
if (!new File(qtdir).exists()) |
| 29 |
@@ -346,8 +346,8 @@ public class InitializeTask extends Task |
| 30 |
StringBuilder path = new StringBuilder(); |
| 31 |
path.append(props.getProperty(null, QTDIR)); |
| 32 |
path.append("/"); |
| 33 |
- path.append(props.getProperty(null, LIBSUBDIR)); |
| 34 |
- path.append("/"); |
| 35 |
+ //path.append(props.getProperty(null, LIBSUBDIR)); |
| 36 |
+ //path.append("/"); |
| 37 |
path.append(LibraryEntry.formatQtName(name, debug, version)); |
| 38 |
return new File(path.toString()).exists(); |
| 39 |
} |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-java/qtjambi/files/generator-4.4.3.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/files/generator-4.4.3.patch?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/qtjambi/files/generator-4.4.3.patch?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: generator-4.4.3.patch |
| 49 |
=================================================================== |
| 50 |
--- generator/main.h.orig |
| 51 |
+++ generator/main.h |
| 52 |
@@ -91,7 +91,6 @@ struct Preprocess |
| 53 |
if (qtdir.isEmpty()) { |
| 54 |
qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files."); |
| 55 |
} else { |
| 56 |
- qtdir += "/include"; |
| 57 |
includes << (qtdir + "/QtXml"); |
| 58 |
includes << (qtdir + "/QtNetwork"); |
| 59 |
includes << (qtdir + "/QtCore"); |
Archives