Merge pull request #1892 from ayhanyalcinsoy/master

pip:fixed abondened file
2016-06-07 02:17:52 +03:00
parent ceb6fc2e50 f82a3066ad
commit 60e7828345
8 changed files with 185 additions and 75 deletions
@@ -13,17 +13,6 @@ from pisi.actionsapi import get
 WorkDir="PyQt5_gpl-%s" % get.srcVERSION()

 def setup():
-    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 \
-                                    --qmake='/usr/bin/qmake-qt5' \
-                                    --destdir='/usr/lib/python3.4/site-packages' \
-                                    --sip-incdir='/usr/include/python3.4m' \
-                                    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/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION()))
    pythonmodules.run("configure.py --confirm-license \
                                    --qsci-api \
                                    --destdir='/usr/lib/python2.7/site-packages' \
@@ -34,11 +23,8 @@ def setup():

 def build():
    autotools.make()
-    shelltools.cd("%s/Py2Qt5_gpl-%s" % (get.workDIR(),get.srcVERSION()))
-    autotools.make()

 def install():
-    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()})
@@ -50,12 +36,3 @@ def install():
    pisitools.rename("/usr/bin/pyuic5", "py2uic5")    
    pisitools.domove("/usr/share/sip/PyQt5/*", "/usr/share/sip/Py2Qt5")
    pisitools.removeDir("/usr/share/sip/PyQt5")
-    
-    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.dohtml("doc/html/*")
-    pisitools.dodoc("NEWS", "README","LICENSE*")
@@ -16,11 +16,8 @@
        <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>
            <Dependency>dbus-python-common</Dependency>
-            <Dependency>python3-devel</Dependency>
            <Dependency>python-devel</Dependency>
-            <Dependency versionFrom="4.18">python3-sip</Dependency>
            <Dependency versionFrom="4.18">python-sip</Dependency>
            <Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
            <Dependency versionFrom="5.6.0">qt5-connectivity-devel</Dependency>
@@ -88,55 +85,14 @@
        </Files>
    </Package>

-    <Package>
-        <Name>python3-qt5</Name>
-        <Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
-        <RuntimeDependencies>
-            <Dependency>libgcc</Dependency>
-            <Dependency>dbus</Dependency>
-            <Dependency>python3</Dependency>
-            <Dependency versionFrom="5.6.0">qt5-base</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>
-            <Path fileType="executable">/usr/bin/pyuic5</Path>
-            <Path fileType="library">/usr/lib/python3.4/site-packages</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/designer/libpyqt5.so</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/usr/share/qt5/qsci/api/python/PyQt5.api</Path>
-            <Path fileType="executable">/usr/bin/pyrcc5</Path>            
-            <Path fileType="executable">/usr/bin/pylupdate5</Path>
-        </Files>
-    </Package>
-
-    <Package>
-        <Name>python3-qt5-devel</Name>
-        <Summary>Development files for python3-qt5</Summary>
-        <RuntimeDependencies>
-            <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="5.6.0">qt5-base</Dependency>
-            <Dependency release="current">python3-qt5</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="data">/usr/share/sip/PyQt5</Path>
-        </Files>
-    </Package>
-
    <History>
+        <Update release="3">
+            <Date>2016-06-07</Date>
+            <Version>5.6</Version>
+            <Comment>version bump</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
        <Update release="2">
            <Date>2016-05-25</Date>
            <Version>5.6</Version>
@@ -17,6 +17,7 @@ def setup():
 def install(): 
    pythonmodules.install(pyVer = "3")
    pisitools.rename("/usr/bin/pip", "pip3")
+    pisitools.rename("/usr/share/doc/pip/README.rst", "README3.rst")
    
    shelltools.system("sed -i 's|#!/usr/bin/env python$|#!/usr/bin/env python3|' %s/usr/lib/python3.4/site-packages/pip/__init__.py" % get.installDIR())
    shelltools.system("python3 -m compileall %s/usr/lib/python3.4/site-packages/pip/__init__.py" % get.installDIR())
@@ -26,7 +26,7 @@
            <Path fileType="executable">/usr/bin/pip</Path>
            <Path fileType="executable">/usr/bin/pip3*</Path>
            <Path fileType="data">/usr/lib/python3*</Path>
-<!--             <Path fileType="doc">/usr/share/doc</Path> -->
+            <Path fileType="doc">/usr/share/doc</Path>
        </Files>
        <RuntimeDependencies>
            <Dependency>python3-setuptools</Dependency>
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+WorkDir="PyQt5_gpl-%s" % get.srcVERSION()
+
+def setup():   
+    pythonmodules.run("configure.py --confirm-license \
+                                    --qsci-api \
+                                    --sip /usr/bin/sip \
+                                    --qmake='/usr/bin/qmake-qt5' \
+                                    --destdir='/usr/lib/python3.4/site-packages' \
+                                    --sip-incdir='/usr/include/python3.4m' \
+                                    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'")
+
+def build():
+    autotools.make()
+
+def install():
+    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.dohtml("doc/html/*")
+    pisitools.dodoc("NEWS", "README","LICENSE*")
@@ -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):
@@ -0,0 +1,114 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>python3-qt5</Name>
+        <Homepage>http://www.riverbankcomputing.co.uk/software/pyqt</Homepage>
+        <Packager>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <License>GPLv3</License>
+        <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="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>
+            <Dependency>dbus-python-common</Dependency>
+            <Dependency>python3-devel</Dependency>
+            <Dependency versionFrom="4.18">python3-sip</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-connectivity-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-declarative-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-enginio-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-location-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-multimedia-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-sensors-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-serialport-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-svg-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-webchannel-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-webkit-devel</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-websockets-devel</Dependency>
+            <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>
+        <Name>python3-qt5</Name>
+        <Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency>dbus</Dependency>
+            <Dependency>python3</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-base</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>
+            <Path fileType="executable">/usr/bin/pyuic5</Path>
+            <Path fileType="library">/usr/lib/python3.4/site-packages</Path>
+            <Path fileType="library">/usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so</Path>
+            <Path fileType="library">/usr/lib/qt5/plugins/designer/libpyqt5.so</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/share/qt5/qsci/api/python/PyQt5.api</Path>
+            <Path fileType="executable">/usr/bin/pyrcc5</Path>            
+            <Path fileType="executable">/usr/bin/pylupdate5</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>python3-qt5-devel</Name>
+        <Summary>Development files for python3-qt5</Summary>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency versionFrom="5.6.0">qt5-base</Dependency>
+            <Dependency release="current">python3-qt5</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/usr/share/sip/PyQt5</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="3">
+            <Date>2016-06-07</Date>
+            <Version>5.6</Version>
+            <Comment>version bump</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-05-25</Date>
+            <Version>5.6</Version>
+            <Comment>version bump</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2016-05-08</Date>
+            <Version>5.5.1</Version>
+            <Comment>First release</Comment>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
@@ -0,0 +1,14 @@
+<PISI>
+    <Source>
+        <Name>python-qt5</Name>
+        <Summary xml:lang="tr">Qt5.x araçları için python bağlayıcıları</Summary>
+        <Description xml:lang="tr">Qt5, C++ kütüphaneleri dizisi ve geliştirme araçları olup grafik kullanıcı arabirimleri için, ağ bağlantısı, iş parçacığı, Unicode, düzenli ifadeler, SQL veritabanları, SVG, OpenGL, XML ve kullanıcıve uygulama ayarları gibi platform bağımsız uygulamalara ayrılır. PyQt, Python modülü seti olarak bu sınıftan 440 kadar uygulamayı çalıştırır.</Description>
+    </Source>
+    <Package>
+        <Name>python3-qt5</Name>
+    </Package>
+    <Package>
+        <Name>python3-qt5-docs</Name>
+    </Package>
+</PISI>
+