From fc5771734fb0ddd920473f9144670b38ac9e9587 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Mon, 19 Oct 2015 14:35:52 +0300
Subject: [PATCH] pyqt5:fixed. it works

---
 .../language/python/python-qt5/actions.py     | 53 ++-------------
 .../language/python/python-qt5/pspec.xml      | 66 +++++++++++--------
 2 files changed, 45 insertions(+), 74 deletions(-)

diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py
index 3730aa7208..9d0b72d31d 100644
--- a/programming/language/python/python-qt5/actions.py
+++ b/programming/language/python/python-qt5/actions.py
@@ -20,27 +20,6 @@ def setup():
                                     --qmake='/usr/bin/qmake-qt5' \
                                     --destdir='/usr/lib/python3.4/site-packages' \
                                     --sip-incdir='/usr/include/python3.4m' \
-                                    --enable=QtCore \
-                                    --enable=QtDBus \
-                                    --enable=QtDesigner \
-                                    --enable=QtGui \
-                                    --enable=QtHelp \
-                                    --enable=QtMultimedia\
-                                    --enable=QtMultimediaWidgets \
-                                    --enable=QtNetwork \
-                                    --enable=QtOpenGL \
-                                    --enable=QtPrintSupport \
-                                    --enable=QtQml \
-                                    --enable=QtQuick \
-                                    --enable=QtSensors \
-                                    --enable=QtSerialPort \
-                                    --enable=QtSql \
-                                    --enable=QtSvg \
-                                    --enable=QtTest \
-                                    --enable=QtWebKit \
-                                    --enable=QtWebKitWidgets \
-                                    --enable=QtWidgets \
-                                    --enable=QtXmlPatterns \
                                     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'")
 
@@ -50,28 +29,7 @@ def setup():
                                     --destdir='/usr/lib/python2.7/site-packages' \
                                     --sip-incdir='/usr/include/python2.7' \
                                     --sip /usr/bin/py2sip \
-                                    --qmake='/usr/bin/qmake-qt5'\
-                                    --enable=QtCore \
-                                    --enable=QtDBus \
-                                    --enable=QtDesigner \
-                                    --enable=QtGui \
-                                    --enable=QtHelp \
-                                    --enable=QtMultimedia\
-                                    --enable=QtMultimediaWidgets \
-                                    --enable=QtNetwork \
-                                    --enable=QtOpenGL \
-                                    --enable=QtPrintSupport \
-                                    --enable=QtQml \
-                                    --enable=QtQuick \
-                                    --enable=QtSensors \
-                                    --enable=QtSerialPort \
-                                    --enable=QtSql \
-                                    --enable=QtSvg \
-                                    --enable=QtTest \
-                                    --enable=QtWebKit \
-                                    --enable=QtWebKitWidgets \
-                                    --enable=QtWidgets \
-                                    --enable=QtXmlPatterns ")
+                                    --qmake='/usr/bin/qmake-qt5' ")
     shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'")
 
 def build():
@@ -81,14 +39,17 @@ def build():
 
 def install():
     shelltools.cd("%s/Py2Qt-gpl-5.5" % get.workDIR())
+    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()})
     # Fix conflicts with python3-pyqt5
     pisitools.rename("/usr/bin/pylupdate5", "py2lupdate5")
     pisitools.rename("/usr/bin/pyrcc5", "py2rcc5")    
     pisitools.rename("/usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so", "libpy2qt5qmlplugin.so")
     pisitools.rename("/usr/share/qt5/qsci/api/python/PyQt5.api", "Py2Qt5.api")
-    #pisitools.remove("/usr/lib/qt5/plugins/designer/libpyqt5.so")
-    pisitools.rename("/usr/bin/pyuic5", "python2-pyuic5")
+    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/PyQt-gpl-5.5" % get.workDIR())
     autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
@@ -100,4 +61,4 @@ def install():
 
     
     pisitools.dohtml("doc/html/*")
-    pisitools.dodoc("NEWS", "README","LICENSE*")
+    pisitools.dodoc("NEWS", "README","LICENSE*")
\ No newline at end of file
diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml
index 6ade5d5a81..0fc69904aa 100644
--- a/programming/language/python/python-qt5/pspec.xml
+++ b/programming/language/python/python-qt5/pspec.xml
@@ -34,27 +34,9 @@
             <Dependency>qt5-websockets-devel</Dependency>
             <Dependency>qt5-x11extras-devel</Dependency>
             <Dependency>qt5-xmlpatterns-devel</Dependency>
-            <Dependency versionFrom="4.16.6">sip-devel</Dependency>
         </BuildDependencies>
     </Source>
 
-    <Package>
-        <Name>python-qt5-common</Name>
-        <Summary>Common files shared between python-qt5 and python3-qt5</Summary>
-        <RuntimeDependencies>
-            <Dependency>libgcc</Dependency>
-            <Dependency versionFrom="5.5.1">qt5-base</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="executable">/usr/bin/pylupdate5</Path>
-            <Path fileType="executable">/usr/bin/py2lupdate5</Path>
-            <Path fileType="executable">/usr/bin/pyrcc5</Path>
-            <Path fileType="executable">/usr/bin/py2rcc5</Path>
-            <Path fileType="data">/usr/share/qt5/qsci/api</Path>
-            <Path fileType="data">/usr/share/sip/PyQt5</Path>            
-        </Files>
-    </Package>
-
     <Package>
         <Name>python-qt5</Name>
         <Summary>A set of Python 2.x bindings for the Qt 5.x Toolkit</Summary>
@@ -62,21 +44,40 @@
             <Dependency>libgcc</Dependency>
             <Dependency>dbus</Dependency>
             <Dependency>python</Dependency>
-            <Dependency release="current">python-qt5-common</Dependency>
             <Dependency versionFrom="5.5.1">qt5-base</Dependency>
-            <Dependency>qt5-declarative</Dependency>
             <Dependency>qt5-sensors</Dependency>
-            <Dependency>qt5-serialport</Dependency>
-            <Dependency>qt5-svg</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>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin/python2-pyuic5</Path>
+            <Path fileType="executable">/usr/bin/py2uic5</Path>
             <Path fileType="library">/usr/lib/python2.7/site-packages</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so</Path>
+            <Path fileType="data">/usr/share/qt5/qsci/api/python/Py2Qt5.api</Path>
+        </Files>
+    </Package>
+    <Package>
+        <Name>python-qt5-devel</Name>
+        <Summary>Development files for python3-qt5</Summary>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency versionFrom="5.5.1">qt5-base</Dependency>
+            <Dependency release="current">python-qt5</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin/py2lupdate5</Path>            
+            <Path fileType="executable">/usr/bin/py2rcc5</Path>
+            <Path fileType="data">/usr/share/sip/Py2Qt5</Path>
         </Files>
     </Package>
 
@@ -87,33 +88,42 @@
             <Dependency>libgcc</Dependency>
             <Dependency>dbus</Dependency>
             <Dependency>python3</Dependency>
-            <Dependency release="current">python-qt5-common</Dependency>
             <Dependency versionFrom="5.5.1">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>
         </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>
         </Files>
     </Package>
-
     <Package>
-        <Name>python3-qt5-docs</Name>
-        <Summary>Documentation for python-qt5 bindings</Summary>
+        <Name>python3-qt5-devel</Name>
+        <Summary>Development files for python3-qt5</Summary>
         <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency versionFrom="5.5.1">qt5-base</Dependency>
             <Dependency release="current">python3-qt5</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="executable">/usr/bin/pylupdate5</Path>
+            <Path fileType="executable">/usr/bin/pyrcc5</Path>            
+            <Path fileType="data">/usr/share/sip/PyQt5</Path>
         </Files>
     </Package>