[csw-devel] SF.net SVN: gar:[21503] csw/mgar/pkg/lang-python/pyqt/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Fri Jul 12 11:43:47 CEST 2013
Revision: 21503
http://gar.svn.sourceforge.net/gar/?rev=21503&view=rev
Author: pfelecan
Date: 2013-07-12 09:43:47 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
lang-python/pyqt/trunk:
- version bump
- generate and include configuration script
Modified Paths:
--------------
csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
csw/mgar/pkg/lang-python/pyqt/trunk/checksums
csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch
Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-12 07:06:33 UTC (rev 21502)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-07-12 09:43:47 UTC (rev 21503)
@@ -1,7 +1,7 @@
# $Id$
NAME = pyqt
-VERSION = 4.10.1
+VERSION = 4.10.2
CATEGORIES = python
GARTYPE = v2
@@ -76,11 +76,53 @@
include gar/category.mk
-PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
+PATH := /opt/csw/gnu:$(PATH)
+# all this hoopla to obtain the file required by projects based on the
+# old PyQt build system providing this script
+$(WORKSRC)/pyqtconfig.py:
+ cd $(WORKSRC) && \
+ rm -f reference && \
+ touch reference && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ python configure.py \
+ --verbose \
+ --confirm-license \
+ --assume-shared \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
+ LFLAGS="${LDFLAGS}" \
+ && \
+ gfind . -type f -newer reference | \
+ ggrep -v '^[.]/pyqtconfig.py$$' | \
+ xargs rm \
+ && \
+ rmdir \
+ ./phonon \
+ ./Qt \
+ ./QtCore \
+ ./QtDBus \
+ ./QtDeclarative \
+ ./QtDesigner \
+ ./QtGui \
+ ./QtHelp \
+ ./QtMultimedia \
+ ./QtNetwork \
+ ./QtOpenGL \
+ ./QtScript \
+ ./QtScriptTools \
+ ./QtSql \
+ ./QtSvg \
+ ./QtTest \
+ ./QtXml \
+ ./sip/Qt \
+ && \
+ rm reference
+
# assume share because QT_SHARED doesn't get defined in the
# configuration environment (TODO: explore issue in depth)
-configure-custom:
+configure-custom: $(WORKSRC)/pyqtconfig.py
cd $(WORKSRC) && \
/usr/bin/env -i \
$(CONFIGURE_ENV) \
@@ -108,4 +150,6 @@
/usr/bin/env -i \
$(INSTALL_ENV) \
$(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install
+ ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/pyqtconfig.py $(DESTDIR)/$(libdir)/python/site-packages/PyQt4
+
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/lang-python/pyqt/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-07-12 07:06:33 UTC (rev 21502)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-07-12 09:43:47 UTC (rev 21503)
@@ -1 +1 @@
-e5973c4ec0b0469f329bc00209d2ad9c PyQt-x11-gpl-4.10.1.tar.gz
+9257e12fec9b1b21e5a0d76d455d1691 PyQt-x11-gpl-4.10.2.tar.gz
Modified: csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-07-12 07:06:33 UTC (rev 21502)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-07-12 09:43:47 UTC (rev 21503)
@@ -1,15 +1,14 @@
-From 7ad6eea32906e2cf2f0f016b48854a4cb5d247ff Mon Sep 17 00:00:00 2001
+From a61b2572022b23ee0f6f6b1c3cebf786d850e62f Mon Sep 17 00:00:00 2001
From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 6 May 2013 14:23:33 +0200
+Date: Wed, 10 Jul 2013 19:14:25 +0200
Subject: [PATCH] disable ocsw unsupported modules
---
- configure-ng.py | 15 ---------------
- configure.py | 25 +------------------------
- 2 files changed, 1 insertion(+), 39 deletions(-)
+ configure-ng.py | 18 ------------------
+ 1 file changed, 18 deletions(-)
diff --git a/configure-ng.py b/configure-ng.py
-index ad7b594..0a64412 100644
+index 100ba59..3ee4977 100644
--- a/configure-ng.py
+++ b/configure-ng.py
@@ -73,10 +73,8 @@ class ModuleMetadata:
@@ -68,89 +67,16 @@
if target_config.qt_version < 0x050000:
check_module(target_config, verbose, 'phonon', 'phonon/videowidget.h',
-diff --git a/configure.py b/configure.py
-index 81eb0e1..2934fad 100644
---- a/configure.py
-+++ b/configure.py
-@@ -366,14 +366,9 @@ class ConfigurePyQt4:
- extra_libs=sql_libs)
- check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
- check_module("QtTest", "QtTest", "QTest::qSleep(0)")
-- check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
- check_module("QtXml", "qdom.h", "new QDomDocument()")
-- check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
- check_module("phonon", "phonon/videowidget.h",
- "new Phonon::VideoWidget()")
-- check_module("QtAssistant", "qassistantclient.h",
-- "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
-- extra_libs=ass_libs)
+@@ -969,9 +954,6 @@ def check_modules(target_config, verbose):
+ else:
+ inform("QtDesigner module disabled with static Qt libraries.")
- if not qt_shared:
- sipconfig.inform("QtDesigner module disabled with static Qt libraries.")
-@@ -381,8 +376,6 @@ class ConfigurePyQt4:
- check_module("QtDesigner", "QExtensionFactory",
- "new QExtensionFactory()")
-
-- check_module("QAxContainer", "qaxobject.h", "new QAxObject()")
+- check_module(target_config, verbose, 'QAxContainer', 'qaxobject.h',
+- 'new QAxObject()')
-
- if os.path.isdir(os.path.join(src_dir, "dbus")):
- check_dbus()
-
-@@ -507,21 +500,12 @@ class ConfigurePyQt4:
- if "QtTest" in pyqt_modules:
- generate_code("QtTest")
-
-- if "QtWebKit" in pyqt_modules:
-- generate_code("QtWebKit")
--
- if "QtXml" in pyqt_modules:
- generate_code("QtXml")
-
-- if "QtXmlPatterns" in pyqt_modules:
-- generate_code("QtXmlPatterns")
--
- if "phonon" in pyqt_modules:
- generate_code("phonon")
-
-- if "QtAssistant" in pyqt_modules:
-- generate_code("QtAssistant")
--
- if "QtDesigner" in pyqt_modules:
- qpy_inc_dir, qpy_lib_dir, qpy_lib = self._qpy_directories("QtDesigner", "qpydesigner")
-
-@@ -535,9 +519,6 @@ class ConfigurePyQt4:
- generate_code("QtDesigner", extra_include_dirs=[qpy_inc_dir],
- extra_lib_dirs=[qpy_lib_dir], extra_libs=[qpy_lib])
-
-- if "QAxContainer" in pyqt_modules:
-- generate_code("QAxContainer")
--
- # Generate the composite module.
- qtmod_sipdir = os.path.join("sip", "Qt")
- mk_clean_dir(qtmod_sipdir)
-@@ -1277,7 +1258,7 @@ def compile_qt_program(name, mname, extra_include_dirs=None, extra_lib_dirs=None
- opengl = (mname == "QtOpenGL")
-
- qt = [mname]
-- if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"):
-+ if mname in ("QtHelp", "QtOpenGL"):
- qt.append("QtCore")
-
- makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
-@@ -1576,13 +1557,9 @@ def needed_qt_libs(mname, qt_libs):
- "QtSql": ["QtGui"],
- "QtSvg": ["QtGui"],
- "QtTest": ["QtGui"],
-- "QtWebKit": ["QtNetwork", "QtGui"],
- "QtXml": ["QtCore"],
-- "QtXmlPatterns": ["QtNetwork", "QtCore"],
- "phonon": ["QtGui"],
-- "QtAssistant": ["QtNetwork", "QtGui"],
- "QtDesigner": ["QtGui"],
-- "QAxContainer": ["QtGui"]
- }
-
- # Handle the dependencies first.
+ # Qt v4.7 was current when we added support for QtDBus and we didn't bother
+ # properly versioning its API.
+ if target_config.qt_version >= 0x040700:
--
-1.8.1.4
+1.8.3.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list