| 1 |
hwoarang 09/06/01 16:30:48 |
| 2 |
|
| 3 |
Modified: configure.py.patch |
| 4 |
Log: |
| 5 |
Fixed automagic dependency issue. ( bug 236341 ). Fixed rpath issues ( bug 235819 , bug 271870 ) |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-python/PyQt4/files/configure.py.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/configure.py.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/configure.py.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/configure.py.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: configure.py.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/files/configure.py.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- configure.py.patch 7 Apr 2009 18:30:59 -0000 1.1 |
| 22 |
+++ configure.py.patch 1 Jun 2009 16:30:48 -0000 1.2 |
| 23 |
@@ -1,7 +1,26 @@ |
| 24 |
diff -Naur PyQt-x11-gpl-4.4.4~orig/configure.py PyQt-x11-gpl-4.4.4/configure.py |
| 25 |
---- PyQt-x11-gpl-4.4.4~orig/configure.py 2009-03-26 01:01:43.000000000 +0100 |
| 26 |
-+++ PyQt-x11-gpl-4.4.4/configure.py 2009-03-26 01:09:50.000000000 +0100 |
| 27 |
-@@ -666,6 +666,7 @@ |
| 28 |
+--- PyQt-x11-gpl-4.4.4~orig/configure.py 2009-06-01 01:54:27.000000000 +0200 |
| 29 |
++++ PyQt-x11-gpl-4.4.4/configure.py 2009-06-01 01:55:57.000000000 +0200 |
| 30 |
+@@ -300,7 +300,8 @@ |
| 31 |
+ check_module("QtWebKit", "qwebpage.h", "new QWebPage()") |
| 32 |
+ check_module("QtXml", "qdom.h", "new QDomDocument()") |
| 33 |
+ check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") |
| 34 |
+- check_module("phonon", "phonon", "new Phonon::VideoWidget()") |
| 35 |
++ check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()", |
| 36 |
++ extra_include_dirs=["/usr/include/phonon"]) |
| 37 |
+ check_module("QtAssistant", "qassistantclient.h", |
| 38 |
+ "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, |
| 39 |
+ extra_libs=ass_libs) |
| 40 |
+@@ -394,7 +395,7 @@ |
| 41 |
+ generate_code("QtXmlPatterns") |
| 42 |
+ |
| 43 |
+ if "phonon" in pyqt_modules: |
| 44 |
+- generate_code("phonon") |
| 45 |
++ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"]) |
| 46 |
+ |
| 47 |
+ if "QtAssistant" in pyqt_modules: |
| 48 |
+ generate_code("QtAssistant") |
| 49 |
+@@ -666,6 +667,7 @@ |
| 50 |
install_dir=pydbusmoddir, |
| 51 |
qt=["QtCore"], |
| 52 |
debug=opts.debug, |
| 53 |
@@ -9,7 +28,7 @@ |
| 54 |
universal=sipcfg.universal |
| 55 |
) |
| 56 |
|
| 57 |
-@@ -1350,6 +1351,7 @@ |
| 58 |
+@@ -1350,6 +1352,7 @@ |
| 59 |
warnings=1, |
| 60 |
static=opts.static, |
| 61 |
debug=opts.debug, |
| 62 |
@@ -17,7 +36,7 @@ |
| 63 |
universal=sipcfg.universal |
| 64 |
) |
| 65 |
|
| 66 |
-@@ -1510,7 +1512,7 @@ |
| 67 |
+@@ -1510,7 +1513,7 @@ |
| 68 |
# The Qt binary installer has macx-xcode as the default. |
| 69 |
args = "-spec macx-g++ " + args |
Archives