From a21e6fb15e70be791ffd321656093a9b04532f2b Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Wed, 25 May 2016 22:12:12 +0300 Subject: [PATCH] python-qt5:version bump to 5.6 --- .../language/python/python-qt5/actions.py | 15 ++--- .../files/PyQt5_gpl-5.6-dbus_ftbfs.patch | 12 ++++ .../language/python/python-qt5/pspec.xml | 61 ++++++++++--------- 3 files changed, 50 insertions(+), 38 deletions(-) create mode 100644 programming/language/python/python-qt5/files/PyQt5_gpl-5.6-dbus_ftbfs.patch diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py index b0060f411c..6c50447e25 100644 --- a/programming/language/python/python-qt5/actions.py +++ b/programming/language/python/python-qt5/actions.py @@ -10,10 +10,10 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get -WorkDir="PyQt-gpl-%s" % get.srcVERSION() +WorkDir="PyQt5_gpl-%s" % get.srcVERSION() def setup(): - shelltools.copytree("%s/PyQt-gpl-5.5.1" % get.workDIR(), "%s/Py2Qt-gpl-5.5.1" % get.workDIR()) + shelltools.copytree("%s/PyQt5_gpl-%s" % (get.workDIR(),get.srcVERSION()), "%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION())) pythonmodules.run("configure.py --confirm-license \ --qsci-api \ --sip /usr/bin/sip \ @@ -23,7 +23,7 @@ def setup(): CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'") - shelltools.cd("%s/Py2Qt-gpl-5.5.1" % get.workDIR()) + shelltools.cd("%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION())) pythonmodules.run("configure.py --confirm-license \ --qsci-api \ --destdir='/usr/lib/python2.7/site-packages' \ @@ -34,11 +34,11 @@ def setup(): def build(): autotools.make() - shelltools.cd("%s/Py2Qt-gpl-5.5.1" % get.workDIR()) + shelltools.cd("%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION())) autotools.make() def install(): - shelltools.cd("%s/Py2Qt-gpl-5.5.1" % get.workDIR()) + shelltools.cd("%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION())) autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) @@ -51,13 +51,10 @@ def install(): pisitools.domove("/usr/share/sip/PyQt5/*", "/usr/share/sip/Py2Qt5") pisitools.removeDir("/usr/share/sip/PyQt5") - shelltools.cd("%s/PyQt-gpl-5.5.1" % get.workDIR()) + shelltools.cd("%s/PyQt5_gpl-%s" % (get.workDIR(),get.srcVERSION())) autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()}) - #pisitools.insinto("/usr/share/sip/PyQt5", "./sip/*") - # Fix conflicts with python-pyqt5 - #pisitools.rename("/usr/bin/pyuic5", "python3-pyuic5") pisitools.dohtml("doc/html/*") diff --git a/programming/language/python/python-qt5/files/PyQt5_gpl-5.6-dbus_ftbfs.patch b/programming/language/python/python-qt5/files/PyQt5_gpl-5.6-dbus_ftbfs.patch new file mode 100644 index 0000000000..6830ddad15 --- /dev/null +++ b/programming/language/python/python-qt5/files/PyQt5_gpl-5.6-dbus_ftbfs.patch @@ -0,0 +1,12 @@ +diff -up PyQt5_gpl-5.6/configure.py.dbus PyQt5_gpl-5.6/configure.py +--- PyQt5_gpl-5.6/configure.py.dbus 2016-04-24 22:16:43.120281591 -0500 ++++ PyQt5_gpl-5.6/configure.py 2016-04-25 10:16:52.465218805 -0500 +@@ -2141,7 +2141,7 @@ def check_dbus(target_config, verbose): + else: + dlist = target_config.dbus_inc_dirs + +- target_config.dbus_inc_dirs = [] ++ #target_config.dbus_inc_dirs = [] + + for d in dlist: + if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK): diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml index aea11fd3b6..acd70abb31 100644 --- a/programming/language/python/python-qt5/pspec.xml +++ b/programming/language/python/python-qt5/pspec.xml @@ -13,7 +13,7 @@ library A set of Python bindings for the Qt 5.x Toolkit Qt is a set of C++ libraries and development tools that includes platform independent abstractions for graphical user interfaces, networking, threads, Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and application settings. PyQt implements 440 of these classes as a set of Python modules. - https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz + mirrors://sourceforge/pyqt/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz dbus-devel dbus-python3 @@ -37,6 +37,9 @@ qt5-x11extras-devel qt5-xmlpatterns-devel + + PyQt5_gpl-5.6-dbus_ftbfs.patch + @@ -47,19 +50,19 @@ dbus python qt5-base - qt5-sensors - qt5-location - qt5-webkit - qt5-enginio - qt5-x11extras - qt5-svg - qt5-multimedia - qt5-serialport - qt5-webchannel - qt5-websockets - qt5-declarative - qt5-xmlpatterns - qt5-connectivity + qt5-sensors + qt5-location + qt5-webkit + qt5-enginio + qt5-x11extras + qt5-svg + qt5-multimedia + qt5-serialport + qt5-webchannel + qt5-websockets + qt5-declarative + qt5-xmlpatterns + qt5-connectivity python-sip @@ -93,19 +96,19 @@ dbus python3 qt5-base - qt5-sensors - qt5-location - qt5-webkit - qt5-enginio - qt5-x11extras - qt5-svg - qt5-multimedia - qt5-serialport - qt5-webchannel - qt5-websockets - qt5-declarative - qt5-xmlpatterns - qt5-connectivity + qt5-sensors + qt5-location + qt5-webkit + qt5-enginio + qt5-x11extras + qt5-svg + qt5-multimedia + qt5-serialport + qt5-webchannel + qt5-websockets + qt5-declarative + qt5-xmlpatterns + qt5-connectivity python3-sip @@ -136,8 +139,8 @@ 2016-05-25 - 5.5.1 - Rebuild. + 5.6 + version bump Ayhan Yalçınsoy ayhanyalcinsoy@pisilinux.org