[csw-devel] SF.net SVN: gar:[21990] csw/mgar/pkg/lang-python/pyqt/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Tue Sep 24 13:50:13 CEST 2013
Revision: 21990
http://gar.svn.sourceforge.net/gar/?rev=21990&view=rev
Author: pfelecan
Date: 2013-09-24 11:50:11 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
lang-python/pyqt/trunk:
- supports only Python 2.7 for ABI compatibility reasons
- addition of a documentation package
- supports webkit and xmlpatterns as delivered by the new Qt4
Modified Paths:
--------------
csw/mgar/pkg/lang-python/pyqt/trunk/Makefile
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-09-24 08:38:06 UTC (rev 21989)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-09-24 11:50:11 UTC (rev 21990)
@@ -4,6 +4,8 @@
VERSION = 4.10.2
CATEGORIES = python
PYTHON_VERSION = 2_7
+# support only Python 2.7 as it is build with gcc
+MODULATIONS_PYTHON_VERSION = $(PYTHON_VERSION)
GARTYPE = v2
DESCRIPTION = Python bindings for Qt
@@ -23,6 +25,7 @@
BUILD_DEP_PKGS += CSWqt4-dev
BUILD_DEP_PKGS += CSWpy-sip
+BUILD_DEP_PKGS += CSWpython27-dev
GARCOMPILER = GNU
EXTRA_CFLAGS += -std=gnu99 -D_XPG6
@@ -41,18 +44,23 @@
SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files
ARCHALL_CSWpy-pyqt-common = 1
+PACKAGES += CSWpy-pyqt-doc
+CATALOGNAME_CSWpy-pyqt-doc = py_pyqt_doc
+SPKG_DESC_CSWpy-pyqt-doc = $(DESCRIPTION), documentation
+PKGFILES_CSWpy-pyqt-doc += $(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)/.*
+ARCHALL_CSWpy-pyqt-doc = 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
-PKGFILES_CSWpy-pyqt += /opt/csw/lib/python/site-packages/dbus/mainloop/qt.so
+PKGFILES_CSWpy-pyqt += $(PYTHON_SITE_PACKAGES)/PyQt4/.*
+PKGFILES_CSWpy-pyqt += /opt/csw/lib/qt4/plugins/designer/.*
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibdbus1-3
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibphonon4
-RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-7-1-0
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtcore4
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdbus4
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdeclarative4
@@ -70,10 +78,9 @@
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWpy-pyqt-common
-CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpython
CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpy-pyqt-common
-CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386
+CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386
include gar/category.mk
@@ -152,5 +159,7 @@
$(INSTALL_ENV) \
$(MAKE) DESTDIR=$(DESTDIR) INSTALL_ROOT=$(DESTDIR) install
ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/pyqtconfig.py $(DESTDIR)/$(PYTHON_SITE_PACKAGES)/PyQt4
-
+ ginstall -d "$(DESTDIR)$(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)"
+ gtar --directory=$(WORKSRC)/doc --create --file=- html | \
+ gtar --directory="$(DESTDIR)$(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)" --extract --file=-
@$(MAKECOOKIE)
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-09-24 08:38:06 UTC (rev 21989)
+++ csw/mgar/pkg/lang-python/pyqt/trunk/files/0001-disable-ocsw-unsupported-modules.patch 2013-09-24 11:50:11 UTC (rev 21990)
@@ -1,14 +1,16 @@
-From a61b2572022b23ee0f6f6b1c3cebf786d850e62f Mon Sep 17 00:00:00 2001
+From 43252bcbc6f7166bc5dc75a1a5c552f425f0737d Mon Sep 17 00:00:00 2001
From: Peter Felecan <pfelecan at opencsw.org>
-Date: Wed, 10 Jul 2013 19:14:25 +0200
+Date: Tue, 24 Sep 2013 10:17:14 +0200
Subject: [PATCH] disable ocsw unsupported modules
+- QAxContainer is for COM
+- QtAssistant is obsoleted
---
- configure-ng.py | 18 ------------------
- 1 file changed, 18 deletions(-)
+ configure-ng.py | 6 ------
+ 1 file changed, 6 deletions(-)
diff --git a/configure-ng.py b/configure-ng.py
-index 100ba59..3ee4977 100644
+index 100ba59..5781614 100644
--- a/configure-ng.py
+++ b/configure-ng.py
@@ -73,10 +73,8 @@ class ModuleMetadata:
@@ -22,18 +24,7 @@
'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 = {
+@@ -106,7 +104,6 @@ QT4_MODULES = {
QT5_MODULES = {
'dbus': ModuleMetadata(qmake_QT=['-gui'], qmake_TARGET='qt',
in_consolidated=False),
@@ -41,33 +32,7 @@
'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',
-@@ -969,9 +954,6 @@ def check_modules(target_config, verbose):
+@@ -969,9 +966,6 @@ def check_modules(target_config, verbose):
else:
inform("QtDesigner module disabled with static Qt libraries.")
@@ -78,5 +43,5 @@
# properly versioning its API.
if target_config.qt_version >= 0x040700:
--
-1.8.3.1
+1.8.3.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