diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py
index afd125bec1..90b38c0ef5 100644
--- a/programming/language/python/python-qt5/actions.py
+++ b/programming/language/python/python-qt5/actions.py
@@ -18,22 +18,58 @@ def setup():
--assume-shared \
--no-timestamp \
--qsci-api \
+ --enable=QtDBus \
+ --enable=QtQml \
+ --enable=QtQuick \
+ --enable=QtQuickWidgets \
+ --enable=QtOpenGL \
+ --enable=QtTest \
+ --enable=QtSql \
+ --enable=QtSensors \
+ --enable=QtCore \
+ --enable=QtWidgets \
+ --enable=QtWebKitWidgets \
+ --enable=QtXml \
+ --enable=QtGui \
+ --enable=QtNetwork \
+ --enable=QtWebKit \
+ --enable=QtPrintSupport \
+ --enable=QtX11Extras \
--sip /usr/bin/sip \
--qmake='/usr/lib/qt5/bin/qmake' \
- --destdir='/usr/lib/python3.4/site-packages/' \
+ --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/Py2Qt-gpl-5.4.2" % get.workDIR())
shelltools.system("python configure.py --confirm-license \
--assume-shared \
--no-timestamp \
--qsci-api \
- --destdir='/usr/lib/python2.7/site-packages/' \
+ --enable=QtDBus \
+ --enable=QtQml \
+ --enable=QtQuick \
+ --enable=QtQuickWidgets \
+ --enable=QtOpenGL \
+ --enable=QtTest \
+ --enable=QtSql \
+ --enable=QtSensors \
+ --enable=QtCore \
+ --enable=QtWidgets \
+ --enable=QtWebKitWidgets \
+ --enable=QtXml \
+ --enable=QtGui \
+ --enable=QtNetwork \
+ --enable=QtWebKit \
+ --enable=QtPrintSupport \
+ --enable=QtX11Extras \
+ --destdir='/usr/lib/python2.7/site-packages' \
--sip-incdir='/usr/include/python2.7' \
- --sip /usr/bin/sip2 \
+ --sip /usr/bin/python2-sip \
--qmake='/usr/lib/qt5/bin/qmake'")
- 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'")
def build():
autotools.make()
@@ -41,14 +77,24 @@ def build():
autotools.make()
def install():
+ shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR())
+ 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")
+
+ shelltools.cd("%s/PyQt-gpl-5.4.2" % 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()})
- pisitools.rename("/usr/bin/pyuic5", "py3uic5")
-
- shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR())
- autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
- pisitools.rename("/usr/bin/pyuic5", "pyuic5")
+ #pisitools.insinto("/usr/share/sip/PyQt5", "./sip/*")
+ # Fix conflicts with python-pyqt5
+ #pisitools.rename("/usr/bin/pyuic5", "python3-pyuic5")
+
pisitools.dohtml("doc/html/*")
pisitools.dodoc("NEWS", "README","LICENSE*")
diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml
index d9a7b4b18e..10e260f649 100644
--- a/programming/language/python/python-qt5/pspec.xml
+++ b/programming/language/python/python-qt5/pspec.xml
@@ -18,6 +18,7 @@
python3-devel
python-devel
python3-sip
+ python-sip
qt5-base-devel
qt5-connectivity-devel
qt5-declarative-devel
@@ -48,11 +49,11 @@
/usr/bin/pylupdate5
+ /usr/bin/py2lupdate5
/usr/bin/pyrcc5
+ /usr/bin/py2rcc5
/usr/share/qt5/qsci/api
- /usr/share/sip/PyQt5
- /usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
- /usr/lib/qt5/plugins/designer/libpyqt5.so
+ /usr/share/sip/PyQt5
@@ -74,8 +75,9 @@
qt5-xmlpatterns
- /usr/bin/pyuic5
+ /usr/bin/python2-pyuic5
/usr/lib/python2.7/site-packages
+ /usr/lib/qt5/plugins/PyQt5/libpy2qt5qmlplugin.so
@@ -97,8 +99,10 @@
qt5-xmlpatterns
- /usr/bin/py3uic5
+ /usr/bin/pyuic5
/usr/lib/python3.4/site-packages
+ /usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so
+ /usr/lib/qt5/plugins/designer/libpyqt5.so
diff --git a/programming/language/python/python-qt5/translations.xml b/programming/language/python/python-qt5/translations.xml
index 0717cc7f9f..55d0863a84 100644
--- a/programming/language/python/python-qt5/translations.xml
+++ b/programming/language/python/python-qt5/translations.xml
@@ -1,7 +1,7 @@
python-qt5
- Qt5 4.x araçları için python bağlayıcıları
+ Qt5.x araçları için python bağlayıcıları
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.
@@ -12,4 +12,3 @@
-