Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python-qt5:version bump to 5.6

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-05-25 22:12:12 +03:00
parent f4cdd521be
commit a21e6fb15e
3 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/python/python-qt5/actions.py
+6 -9
View File
@@ -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/*")
programming/language/python/python-qt5/files/PyQt5_gpl-5.6-dbus_ftbfs.patch
+12
View File
@@ -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):
programming/language/python/python-qt5/pspec.xml
+32 -29
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>A set of Python bindings for the Qt 5.x Toolkit</Summary>
<Description>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.</Description>
<Archive sha1sum="d54cd7cf26b10f0b59fddce4a6a742f9697a94ff" type="targz">https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz</Archive>
<Archive sha1sum="8920e4094470ff93f79e257c37c46f5cd0bff7ab" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz</Archive>
<BuildDependencies>
<Dependency>dbus-devel</Dependency>
<Dependency>dbus-python3</Dependency>
@@ -37,6 +37,9 @@
<Dependency versionFrom="5.6.0">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>PyQt5_gpl-5.6-dbus_ftbfs.patch</Patch>
</Patches>
</Source>
<Package>
@@ -47,19 +50,19 @@
<Dependency>dbus</Dependency>
<Dependency>python</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency>qt5-sensors</Dependency>
<Dependency>qt5-location</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>qt5-enginio</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency>qt5-multimedia</Dependency>
<Dependency>qt5-serialport</Dependency>
<Dependency>qt5-webchannel</Dependency>
<Dependency>qt5-websockets</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-xmlpatterns</Dependency>
<Dependency>qt5-connectivity</Dependency>
<Dependency versionFrom="5.6.0">qt5-sensors</Dependency>
<Dependency versionFrom="5.6.0">qt5-location</Dependency>
<Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency versionFrom="5.6.0">qt5-enginio</Dependency>
<Dependency versionFrom="5.6.0">qt5-x11extras</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency versionFrom="5.6.0">qt5-multimedia</Dependency>
<Dependency versionFrom="5.6.0">qt5-serialport</Dependency>
<Dependency versionFrom="5.6.0">qt5-webchannel</Dependency>
<Dependency versionFrom="5.6.0">qt5-websockets</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.6.0">qt5-connectivity</Dependency>
<Dependency>python-sip</Dependency>
</RuntimeDependencies>
<Files>
@@ -93,19 +96,19 @@
<Dependency>dbus</Dependency>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency>qt5-sensors</Dependency>
<Dependency>qt5-location</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>qt5-enginio</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency>qt5-multimedia</Dependency>
<Dependency>qt5-serialport</Dependency>
<Dependency>qt5-webchannel</Dependency>
<Dependency>qt5-websockets</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency>qt5-xmlpatterns</Dependency>
<Dependency>qt5-connectivity</Dependency>
<Dependency versionFrom="5.6.0">qt5-sensors</Dependency>
<Dependency versionFrom="5.6.0">qt5-location</Dependency>
<Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency versionFrom="5.6.0">qt5-enginio</Dependency>
<Dependency versionFrom="5.6.0">qt5-x11extras</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency versionFrom="5.6.0">qt5-multimedia</Dependency>
<Dependency versionFrom="5.6.0">qt5-serialport</Dependency>
<Dependency versionFrom="5.6.0">qt5-webchannel</Dependency>
<Dependency versionFrom="5.6.0">qt5-websockets</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.6.0">qt5-connectivity</Dependency>
<Dependency>python3-sip</Dependency>
</RuntimeDependencies>
<Files>
@@ -136,8 +139,8 @@
<History>
<Update release="2">
<Date>2016-05-25</Date>
<Version>5.5.1</Version>
<Comment>Rebuild.</Comment>
<Version>5.6</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>