Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/PyQt4/files: configure-4.6.1.py.patch
Date: Wed, 28 Oct 2009 15:49:22
Message-Id: E1N3Am0-0001yU-8c@stork.gentoo.org
1 hwoarang 09/10/28 15:49:20
2
3 Added: configure-4.6.1.py.patch
4 Log:
5 Version bump. Add new configuration patch
6 (Portage version: 2.2_rc46/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-python/PyQt4/files/configure-4.6.1.py.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/configure-4.6.1.py.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/files/configure-4.6.1.py.patch?rev=1.1&content-type=text/plain
13
14 Index: configure-4.6.1.py.patch
15 ===================================================================
16 --- PyQt-x11-gpl-4.6.1~orig/configure.py 2009-10-23 23:03:13.000000000 +0200
17 +++ PyQt-x11-gpl-4.6.1/configure.py 2009-10-23 23:33:06.000000000 +0200
18 @@ -341,7 +341,7 @@
19 check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
20 check_module("QtXml", "qdom.h", "new QDomDocument()")
21 check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
22 - check_module("phonon", "Phonon/VideoWidget",
23 + check_module("phonon", "phonon/videowidget.h",
24 "new Phonon::VideoWidget()")
25 check_module("QtAssistant", "qassistantclient.h",
26 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
27 @@ -451,7 +451,7 @@
28 generate_code("QtXmlPatterns")
29
30 if "phonon" in pyqt_modules:
31 - generate_code("phonon")
32 + generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
33
34 if "QtAssistant" in pyqt_modules:
35 generate_code("QtAssistant")
36 @@ -759,6 +759,7 @@
37 install_dir=pydbusmoddir,
38 qt=["QtCore"],
39 debug=opts.debug,
40 + strip=0,
41 universal=sipcfg.universal,
42 arch=sipcfg.arch
43 )
44 @@ -1468,6 +1469,7 @@
45 warnings=1,
46 static=opts.static,
47 debug=opts.debug,
48 + strip=0,
49 universal=sipcfg.universal,
50 arch=sipcfg.arch
51 )