Magellan Linux

Annotation of /trunk/pyqt4/patches/pyqt4-4.5-configure.py.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 837 - (hide annotations) (download)
Tue Jun 9 21:10:13 2009 UTC (14 years, 11 months ago) by niro
File size: 1727 byte(s)
pyqt4 patches

1 niro 837 diff -Naur PyQt-x11-gpl-4.4.4~orig/configure.py PyQt-x11-gpl-4.4.4/configure.py
2     --- PyQt-x11-gpl-4.4.4~orig/configure.py 2009-06-01 01:54:27.000000000 +0200
3     +++ PyQt-x11-gpl-4.4.4/configure.py 2009-06-01 01:55:57.000000000 +0200
4     @@ -300,7 +300,8 @@
5     check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
6     check_module("QtXml", "qdom.h", "new QDomDocument()")
7     check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
8     - check_module("phonon", "phonon", "new Phonon::VideoWidget()")
9     + check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()",
10     + extra_include_dirs=["/usr/include/phonon"])
11     check_module("QtAssistant", "qassistantclient.h",
12     "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
13     extra_libs=ass_libs)
14     @@ -394,7 +395,7 @@
15     generate_code("QtXmlPatterns")
16    
17     if "phonon" in pyqt_modules:
18     - generate_code("phonon")
19     + generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
20    
21     if "QtAssistant" in pyqt_modules:
22     generate_code("QtAssistant")
23     @@ -666,6 +667,7 @@
24     install_dir=pydbusmoddir,
25     qt=["QtCore"],
26     debug=opts.debug,
27     + strip=0,
28     universal=sipcfg.universal
29     )
30    
31     @@ -1350,6 +1352,7 @@
32     warnings=1,
33     static=opts.static,
34     debug=opts.debug,
35     + strip=0,
36     universal=sipcfg.universal
37     )
38    
39     @@ -1510,7 +1513,7 @@
40     # The Qt binary installer has macx-xcode as the default.
41     args = "-spec macx-g++ " + args
42    
43     - return args
44     + return " QMAKE_STRIP= " + args
45    
46    
47     def get_qt_configuration():