[csw-devel] SF.net SVN: gar:[21022] csw/mgar/pkg/lang-python
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Tue May 7 12:00:56 CEST 2013
Revision: 21022
http://gar.svn.sourceforge.net/gar/?rev=21022&view=rev
Author: pfelecan
Date: 2013-05-07 10:00:56 +0000 (Tue, 07 May 2013)
Log Message:
-----------
lang-python/pyqt/trunk: instantiate
Added Paths:
-----------
csw/mgar/pkg/lang-python/pyqt/
csw/mgar/pkg/lang-python/pyqt/Makefile
csw/mgar/pkg/lang-python/pyqt/branches/
csw/mgar/pkg/lang-python/pyqt/tags/
csw/mgar/pkg/lang-python/pyqt/trunk/
csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
csw/mgar/pkg/lang-python/pyqt/trunk/checksums
csw/mgar/pkg/lang-python/pyqt/trunk/files/
csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch
csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch
Added: csw/mgar/pkg/lang-python/pyqt/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/Makefile (rev 0)
+++ csw/mgar/pkg/lang-python/pyqt/Makefile 2013-05-07 10:00:56 UTC (rev 21022)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/lang-python/pyqt/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-05-07 10:00:56 UTC (rev 21022)
@@ -0,0 +1,85 @@
+# $Id$
+
+NAME = pyqt
+VERSION = 4.10.1
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Python bindings for Qt
+define BLURB
+ PyQt is the Python bindings for Qt cross-platform application development
+ framework.
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJECT = pyqt
+SPKG_SOURCEURL = $(MASTER_SITES)
+DISTNAME = PyQt-x11-gpl-$(VERSION)
+DISTFILES = $(DISTNAME).tar.gz
+LICENSE = LICENSE.GPL3
+PATCHFILES += 0001-disable-ocsw-unsupported-modules.patch
+PATCHFILES += 0002-force-xpg6-where-not-set-by-configure.patch
+
+BUILD_DEPS_PKG += CSWqt4-dev
+BUILD_DEPS_PKG += CSWpy-sip
+
+GARCOMPILER = GNU
+EXTRA_CFLAGS += -std=gnu99 -D_XPG6
+EXTRA_CXXFLAGS += -D_XPG6
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_SCRIPTS = custom
+
+BUILD_SCRIPTS = custom
+
+TEST_SCRIPTS =
+
+INSTALL_SCRIPTS = custom
+
+PACKAGES += CSWpy-pyqt-common
+CATALOGNAME_CSWpy-pyqt-common = py_pyqt_common
+SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files
+ARCHALL_CSWpy-pyqt-common = 1
+
+PACKAGES += CSWpy-pyqt
+CATALOGNAME_CSWpy-pyqt = py_pyqt
+SPKG_DESC_CSWpy-pyqt = $(DESCRIPTION)
+PKGFILES_CSWpy-pyqt += /opt/csw/bin/pylupdate4
+PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4
+PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/PyQt4/.*[.]so
+PKGFILES_CSWpy-pyqt += /opt/csw/plugins/designer/libpythonplugin.so
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
+
+# assume share because QT_SHARED doesn't get defined in the
+# configuration environment (TODO: explore issue in depth)
+configure-custom:
+ cd $(WORKSRC) && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ python configure-ng.py \
+ --verbose \
+ --confirm-license \
+ --assume-shared \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
+ LFLAGS="${LDFLAGS}" \
+ QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
+ QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
+ QMAKE_LFLAGS+="${LDFLAGS}"
+ @$(MAKECOOKIE)
+
+build-custom:
+ cd $(WORKSRC) && \
+ /usr/bin/env -i \
+ $(BUILD_ENV) \
+ $(MAKE)
+ @$(MAKECOOKIE)
+
+install-custom:
+ cd $(WORKSRC) && \
+ /usr/bin/env -i \
+ $(INSTALL_ENV) \
+ $(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/lang-python/pyqt/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/checksums (rev 0)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/checksums 2013-05-07 10:00:56 UTC (rev 21022)
@@ -0,0 +1 @@
+e5973c4ec0b0469f329bc00209d2ad9c PyQt-x11-gpl-4.10.1.tar.gz
Added: 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 (rev 0)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-05-07 10:00:56 UTC (rev 21022)
@@ -0,0 +1,156 @@
+From 7ad6eea32906e2cf2f0f016b48854a4cb5d247ff Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 6 May 2013 14:23:33 +0200
+Subject: [PATCH] disable ocsw unsupported modules
+
+---
+ configure-ng.py | 15 ---------------
+ configure.py | 25 +------------------------
+ 2 files changed, 1 insertion(+), 39 deletions(-)
+
+diff --git a/configure-ng.py b/configure-ng.py
+index ad7b594..0a64412 100644
+--- a/configure-ng.py
++++ b/configure-ng.py
+@@ -73,10 +73,8 @@ class ModuleMetadata:
+ QT4_MODULES = {
+ 'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt',
+ in_consolidated=False),
+- 'QAxContainer': ModuleMetadata(qmake_CONFIG='qaxcontainer'),
+ 'Qt': ModuleMetadata(qmake_QT=['-core', '-gui'],
+ in_consolidated=False),
+- 'QtAssistant': ModuleMetadata(qmake_LIBS='-lqassistantclient'),
+ 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'),
+ 'QtDBus': ModuleMetadata(qmake_QT=['dbus', '-gui'],
+ qpy_lib='qpydbus'),
+@@ -95,10 +93,7 @@ QT4_MODULES = {
+ 'QtSql': ModuleMetadata(qmake_QT=['sql']),
+ 'QtSvg': ModuleMetadata(qmake_QT=['svg']),
+ 'QtTest': ModuleMetadata(qmake_QT=['testlib']),
+- 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']),
+ 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']),
+- 'QtXmlPatterns': ModuleMetadata(
+- qmake_QT=['xmlpatterns', '-gui', 'network']),
+ 'phonon': ModuleMetadata(qmake_QT=['phonon'])
+ }
+
+@@ -106,7 +101,6 @@ QT4_MODULES = {
+ QT5_MODULES = {
+ 'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt',
+ in_consolidated=False),
+- 'QAxContainer': ModuleMetadata(qmake_QT=['axcontainer']),
+ 'Qt': ModuleMetadata(qmake_QT=['-core', '-gui'],
+ in_consolidated=False),
+ 'QtCore': ModuleMetadata(qmake_QT=['-gui'], qpy_lib='qpycore'),
+@@ -129,12 +123,7 @@ QT5_MODULES = {
+ 'QtSql': ModuleMetadata(qmake_QT=['sql', 'widgets']),
+ 'QtSvg': ModuleMetadata(qmake_QT=['svg']),
+ 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']),
+- 'QtWebKit': ModuleMetadata(
+- qmake_QT=['webkit', 'webkitwidgets',
+- 'network']),
+ 'QtXml': ModuleMetadata(qmake_QT=['xml', '-gui']),
+- 'QtXmlPatterns': ModuleMetadata(
+- qmake_QT=['xmlpatterns', '-gui', 'network'])
+ }
+
+
+@@ -948,12 +937,8 @@ def check_modules(target_config, verbose):
+ 'new QSvgWidget()')
+ check_module(target_config, verbose, 'QtTest', 'QtTest',
+ 'QTest::qSleep(0)')
+- check_module(target_config, verbose, 'QtWebKit', 'qwebpage.h',
+- 'new QWebPage()')
+ check_module(target_config, verbose, 'QtXml', 'qdom.h',
+ 'new QDomDocument()')
+- check_module(target_config, verbose, 'QtXmlPatterns', 'qxmlname.h',
+- 'new QXmlName()')
+
+ 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)
+
+ 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()")
+-
+ 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.
+--
+1.8.1.4
+
Added: csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch
===================================================================
--- csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch (rev 0)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0002-force-xpg6-where-not-set-by-configure.patch 2013-05-07 10:00:56 UTC (rev 21022)
@@ -0,0 +1,25 @@
+From 89d3fcd82222171a37d23ce3eaaf73b2e6f7ff54 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 7 May 2013 10:33:29 +0200
+Subject: [PATCH] force xpg6 where not set by configure
+
+---
+ designer/pluginloader.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/designer/pluginloader.h b/designer/pluginloader.h
+index a3b4fab..4d1babc 100644
+--- a/designer/pluginloader.h
++++ b/designer/pluginloader.h
+@@ -28,6 +28,8 @@
+ #ifndef _PLUGINLOADER_H
+ #define _PLUGINLOADER_H
+
++#define _XPG6
++
+ #include <Python.h>
+
+ #include <QDesignerCustomWidgetCollectionInterface>
+--
+1.8.1.4
+
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