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

Merge pull request #1856 from ayhanyalcinsoy/master

Browse Source 
python-qt5 and kaptan: version bump
This commit is contained in:
bferturk
2016-05-25 22:16:32 +03:00
parent 2dab5bf593 431174ea26
commit d5a1496e27
5 changed files with 85 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/pisilinux/kaptan/actions.py
+22 -19
View File
@@ -8,31 +8,34 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
import glob import glob
projectDir = "/usr/lib/kaptan/"
def install(): def install():
for file in glob.glob1(".", "*"): pythonmodules.install(pyVer = "3")
shelltools.chmod(file, 0755)
#projectDir = "/usr/lib/kaptan/"
#def install():
#for file in glob.glob1(".", "*"):
#shelltools.chmod(file, 0755)
for file in glob.glob1("languages", "*"): #for file in glob.glob1("languages", "*"):
shelltools.chmod("languages/"+file, 0755) #shelltools.chmod("languages/"+file, 0755)
for file in glob.glob1("kaptan", "*"): #for file in glob.glob1("kaptan", "*"):
shelltools.chmod("kaptan/"+file, 0755) #shelltools.chmod("kaptan/"+file, 0755)
for file in glob.glob1("data", "*"): #for file in glob.glob1("data", "*"):
shelltools.chmod("data/"+file, 0755) #shelltools.chmod("data/"+file, 0755)
for file in glob.glob1("data/images", "*"): #for file in glob.glob1("data/images", "*"):
shelltools.chmod("data/images/"+file, 0755) #shelltools.chmod("data/images/"+file, 0755)
pisitools.insinto("/usr/share/pixmaps/", "data/images/kaptan-icon.png", "kaptan.png") #pisitools.insinto("/usr/share/pixmaps/", "data/images/kaptan-icon.png", "kaptan.png")
pisitools.insinto(projectDir, "data/") #pisitools.insinto(projectDir, "data/")
pisitools.insinto(projectDir, "languages/") #pisitools.insinto(projectDir, "languages/")
pisitools.insinto(projectDir, "kaptan/") #pisitools.insinto(projectDir, "kaptan/")
pisitools.insinto(projectDir, "kaptan.py", "kaptan5.py") #pisitools.insinto(projectDir, "kaptan.py", "kaptan5.py")
pisitools.insinto(projectDir, "rc_kaptan.py") #pisitools.insinto(projectDir, "rc_kaptan.py")
pisitools.insinto("/usr/bin/", "script/kaptan") #pisitools.insinto("/usr/bin/", "script/kaptan")
desktop/pisilinux/kaptan/pspec.xml
+13 -3
View File
@@ -13,11 +13,12 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>Kaptan, Pisi Linux workspace configuration wizard</Summary> <Summary>Kaptan, Pisi Linux workspace configuration wizard</Summary>
<Description>Kaptan lets you configure your workspace on first login.</Description> <Description>Kaptan lets you configure your workspace on first login.</Description>
<Archive sha1sum="21724354d0d3899af9ccb1b5dbe7f1121c8c86f6" type="targz">https://github.com/PisiLinuxNew/kaptan/archive/5.0-beta.tar.gz</Archive> <Archive sha1sum="5a348ad071c111ccd9a09c2ad32af423fff37c76" type="targz">https://github.com/PisiLinuxNew/kaptan/archive/kaptan-beta-2.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>python3-setuptools</Dependency> <Dependency>python3-setuptools</Dependency>
<Dependency>python3-qt5-devel</Dependency> <Dependency>python3-qt5-devel</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>qt5-linguist</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
@@ -31,12 +32,21 @@
<Path fileType="data">/usr/lib/kaptan</Path> <Path fileType="data">/usr/lib/kaptan</Path>
<Path fileType="data">/usr/lib/python3.4/site-packages</Path> <Path fileType="data">/usr/lib/python3.4/site-packages</Path>
<Path fileType="data">/usr/share/applications</Path> <Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path> <Path fileType="data">/usr/share/icons</Path>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
<Path fileType="localdata">/usr/share/kaptan/languages</Path>
<Path fileType="config">/etc</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="2">
<Date>2016-05-17</Date>
<Version>5.1</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="1"> <Update release="1">
<Date>2016-05-08</Date> <Date>2016-05-08</Date>
<Version>5.0</Version> <Version>5.0</Version>
@@ -45,4 +55,4 @@
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
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 pisitools
from pisi.actionsapi import get from pisi.actionsapi import get
WorkDir="PyQt-gpl-%s" % get.srcVERSION() WorkDir="PyQt5_gpl-%s" % get.srcVERSION()
def setup(): 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 \ pythonmodules.run("configure.py --confirm-license \
--qsci-api \ --qsci-api \
--sip /usr/bin/sip \ --sip /usr/bin/sip \
@@ -23,7 +23,7 @@ def setup():
CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3") 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.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 \ pythonmodules.run("configure.py --confirm-license \
--qsci-api \ --qsci-api \
--destdir='/usr/lib/python2.7/site-packages' \ --destdir='/usr/lib/python2.7/site-packages' \
@@ -34,11 +34,11 @@ def setup():
def build(): def build():
autotools.make() autotools.make()
shelltools.cd("%s/Py2Qt-gpl-5.5.1" % get.workDIR()) shelltools.cd("%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION()))
autotools.make() autotools.make()
def install(): 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 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("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
autotools.rawInstall("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.domove("/usr/share/sip/PyQt5/*", "/usr/share/sip/Py2Qt5")
pisitools.removeDir("/usr/share/sip/PyQt5") 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 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("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
autotools.rawInstall("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/*") 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> <IsA>library</IsA>
<Summary>A set of Python bindings for the Qt 5.x Toolkit</Summary> <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> <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> <BuildDependencies>
<Dependency>dbus-devel</Dependency> <Dependency>dbus-devel</Dependency>
<Dependency>dbus-python3</Dependency> <Dependency>dbus-python3</Dependency>
@@ -37,6 +37,9 @@
<Dependency versionFrom="5.6.0">qt5-x11extras-devel</Dependency> <Dependency versionFrom="5.6.0">qt5-x11extras-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns-devel</Dependency> <Dependency versionFrom="5.6.0">qt5-xmlpatterns-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches>
<Patch>PyQt5_gpl-5.6-dbus_ftbfs.patch</Patch>
</Patches>
</Source> </Source>
<Package> <Package>
@@ -47,19 +50,19 @@
<Dependency>dbus</Dependency> <Dependency>dbus</Dependency>
<Dependency>python</Dependency> <Dependency>python</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency> <Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency>qt5-sensors</Dependency> <Dependency versionFrom="5.6.0">qt5-sensors</Dependency>
<Dependency>qt5-location</Dependency> <Dependency versionFrom="5.6.0">qt5-location</Dependency>
<Dependency>qt5-webkit</Dependency> <Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency>qt5-enginio</Dependency> <Dependency versionFrom="5.6.0">qt5-enginio</Dependency>
<Dependency>qt5-x11extras</Dependency> <Dependency versionFrom="5.6.0">qt5-x11extras</Dependency>
<Dependency>qt5-svg</Dependency> <Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency>qt5-multimedia</Dependency> <Dependency versionFrom="5.6.0">qt5-multimedia</Dependency>
<Dependency>qt5-serialport</Dependency> <Dependency versionFrom="5.6.0">qt5-serialport</Dependency>
<Dependency>qt5-webchannel</Dependency> <Dependency versionFrom="5.6.0">qt5-webchannel</Dependency>
<Dependency>qt5-websockets</Dependency> <Dependency versionFrom="5.6.0">qt5-websockets</Dependency>
<Dependency>qt5-declarative</Dependency> <Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
<Dependency>qt5-xmlpatterns</Dependency> <Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
<Dependency>qt5-connectivity</Dependency> <Dependency versionFrom="5.6.0">qt5-connectivity</Dependency>
<Dependency>python-sip</Dependency> <Dependency>python-sip</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -93,19 +96,19 @@
<Dependency>dbus</Dependency> <Dependency>dbus</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency> <Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency>qt5-sensors</Dependency> <Dependency versionFrom="5.6.0">qt5-sensors</Dependency>
<Dependency>qt5-location</Dependency> <Dependency versionFrom="5.6.0">qt5-location</Dependency>
<Dependency>qt5-webkit</Dependency> <Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency>qt5-enginio</Dependency> <Dependency versionFrom="5.6.0">qt5-enginio</Dependency>
<Dependency>qt5-x11extras</Dependency> <Dependency versionFrom="5.6.0">qt5-x11extras</Dependency>
<Dependency>qt5-svg</Dependency> <Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency>qt5-multimedia</Dependency> <Dependency versionFrom="5.6.0">qt5-multimedia</Dependency>
<Dependency>qt5-serialport</Dependency> <Dependency versionFrom="5.6.0">qt5-serialport</Dependency>
<Dependency>qt5-webchannel</Dependency> <Dependency versionFrom="5.6.0">qt5-webchannel</Dependency>
<Dependency>qt5-websockets</Dependency> <Dependency versionFrom="5.6.0">qt5-websockets</Dependency>
<Dependency>qt5-declarative</Dependency> <Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
<Dependency>qt5-xmlpatterns</Dependency> <Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
<Dependency>qt5-connectivity</Dependency> <Dependency versionFrom="5.6.0">qt5-connectivity</Dependency>
<Dependency>python3-sip</Dependency> <Dependency>python3-sip</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -136,8 +139,8 @@
<History> <History>
<Update release="2"> <Update release="2">
<Date>2016-05-25</Date> <Date>2016-05-25</Date>
<Version>5.5.1</Version> <Version>5.6</Version>
<Comment>Rebuild.</Comment> <Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name> <Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email> <Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update> </Update>