Page MenuHomeSolus
Files F10771542

D6248.id15065.diff
No OneTemporary
Actions

D6248.id15065.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -5,11 +5,14 @@
libQt5Designer.so.5
libQt5Gui.so.5
libQt5Help.so.5
+libQt5Location.so.5
libQt5Multimedia.so.5
libQt5MultimediaWidgets.so.5
libQt5Network.so.5
libQt5Nfc.so.5
libQt5OpenGL.so.5
+libQt5Positioning.so.5
+libQt5PositioningQuick.so.5
libQt5PrintSupport.so.5
libQt5Qml.so.5
libQt5Quick.so.5
@@ -19,6 +22,7 @@
libQt5Sql.so.5
libQt5Svg.so.5
libQt5Test.so.5
+libQt5WebChannel.so.5
libQt5WebKit.so.5
libQt5WebKitWidgets.so.5
libQt5WebSockets.so.5
@@ -34,5 +38,5 @@
libpthread.so.0
libpulse-mainloop-glib.so.0
libpulse.so.0
-libpython2.7.so.1.0
+libpython3.6m.so.1.0
libstdc++.so.6
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,43 +1,93 @@
name : python-qt5
version : 5.12.2
-release : 27
+release : 28
source :
- https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.12.2/PyQt5_gpl-5.12.2.tar.gz : c565829e77dc9c281aa1a0cdf2eddaead4e0f844cbaf7a4408441967f03f5f0f
license : GPL-3.0-or-later
-component : programming.python
-summary : python-qt5 are the python2 bindings for Qt5.
+component :
+ - programming.python
+ - ^python-qt5-common : programming.python
+ - ^python3-qt5 : programming.python
+summary :
+ - python-qt5 are the python2 bindings for Qt5.
+ - ^python-qt5-common : Common PyQt files shared between python-pyqt5 and python3-pyqt5
+ - ^python3-qt5 : python3-qt5 are the python3 bindings for Qt5.
description: |
python-qt5 are the python2 bindings for Qt5.
builddeps :
- pkgconfig(dbus-python)
- pkgconfig(gl)
+ - pkgconfig(python3)
- pkgconfig(Qt5Bluetooth)
- pkgconfig(Qt5Help)
+ - pkgconfig(Qt5Location)
- pkgconfig(Qt5Multimedia)
- pkgconfig(Qt5Qml)
- pkgconfig(Qt5Sensors)
- pkgconfig(Qt5SerialPort)
- pkgconfig(Qt5Svg)
- pkgconfig(Qt5WebKit)
+ - pkgconfig(Qt5WebChannel)
- pkgconfig(Qt5WebSockets)
- pkgconfig(Qt5X11Extras)
- pkgconfig(Qt5XmlPatterns)
- python-enum34
- python-sip-devel
+ - python3-dbus
+ - python3-sip-devel
+patterns :
+ - /usr/lib/python2*
+ - ^python3-qt5 :
+ - /usr/lib/python3*
+ - ^python-qt5-common :
+ - /usr/bin/*
+ - /usr/lib64/qt5/plugins/*
+ - /usr/share/sip/PyQt5/*
+ - /usr/share/qt5/qsci/api/python/*
rundeps :
- python-sip
+ - python-qt5-common
+ - ^python3-qt5 :
+ - python3-sip
+ - python-qt5-common
+ - python-enum34
setup : |
- python2 configure.py --confirm-license \
- --no-sip-files \
- --qsci-api \
- -q /usr/bin/qmake \
- QMAKE_CFLAGS_RELEASE="$CFLAGS" \
- QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
- QMAKE_LFLAGS_RELEASE="$LDFLAGS"
+ instdir=$(basename $PWD)
+ cd ..
+ echo python-qt5 python3-qt5 | xargs -n 1 cp -a $instdir
+ rm -fr $instdir
+ pushd python-qt5
+ python2 configure.py \
+ --confirm-license \
+ --no-sip-files \
+ --qsci-api \
+ -q /usr/bin/qmake \
+ QMAKE_CFLAGS_RELEASE="$CFLAGS" \
+ QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+ QMAKE_LFLAGS_RELEASE="$LDFLAGS"
+ popd
+ %make -C python-qt5
+
+ # generate python-qt5
+ %make_install -C python-qt5 INSTALL_ROOT="$installdir" -j1
+
+ pushd python3-qt5
+ python3 configure.py \
+ --confirm-license \
+ --no-sip-files \
+ -q /usr/bin/qmake \
+ QMAKE_CFLAGS_RELEASE="$CFLAGS" \
+ QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+ QMAKE_LFLAGS_RELEASE="$LDFLAGS"
+ popd
build : |
- %make
+ %make -C python3-qt5
install : |
- %make_install INSTALL_ROOT="$installdir" -j1
- install -d $installdir/usr/share/sip/PyQt5
- cp -a sip/* $installdir/usr/share/sip/PyQt5
- mv $installdir/usr/bin/{,python2-}pyuic5
+ # generate python-qt5-common
+ for i in python-qt5/sip; do
+ install -d $installdir/usr/share/sip/PyQt5
+ cp -a python-qt5/sip/* $installdir/usr/share/sip/PyQt5
+ done
+
+ # generate python3-qt5
+ %make_install -C python3-qt5 INSTALL_ROOT="$installdir" -j1
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -18,10 +18,10 @@
<Description xml:lang="en">python-qt5 are the python2 bindings for Qt5.
</Description>
<PartOf>programming.python</PartOf>
+ <RuntimeDependencies>
+ <Dependency releaseFrom="28">python-qt5-common</Dependency>
+ </RuntimeDependencies>
<Files>
- <Path fileType="executable">/usr/bin/pylupdate5</Path>
- <Path fileType="executable">/usr/bin/pyrcc5</Path>
- <Path fileType="executable">/usr/bin/python2-pyuic5</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5-5.12.2.dist-info/INSTALLER</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5-5.12.2.dist-info/METADATA</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5-5.12.2.dist-info/RECORD</Path>
@@ -32,11 +32,13 @@
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtDesigner.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtGui.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtHelp.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtLocation.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtMultimedia.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtMultimediaWidgets.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtNetwork.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtNfc.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtOpenGL.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtPositioning.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtPrintSupport.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtQml.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtQuick.so</Path>
@@ -46,6 +48,7 @@
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtSql.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtSvg.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtTest.so</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtWebChannel.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtWebKit.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtWebKitWidgets.so</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/QtWebSockets.so</Path>
@@ -97,6 +100,18 @@
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/uic/widget-plugins/qtwebenginewidgets.py</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/PyQt5/uic/widget-plugins/qtwebkit.py</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/dbus/mainloop/pyqt5.so</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>python-qt5-common</Name>
+ <Summary xml:lang="en">Common PyQt files shared between python-pyqt5 and python3-pyqt5</Summary>
+ <Description xml:lang="en">python-qt5 are the python2 bindings for Qt5.
+</Description>
+ <PartOf>programming.python</PartOf>
+ <Files>
+ <Path fileType="executable">/usr/bin/pylupdate5</Path>
+ <Path fileType="executable">/usr/bin/pyrcc5</Path>
+ <Path fileType="executable">/usr/bin/pyuic5</Path>
<Path fileType="library">/usr/lib64/qt5/plugins/PyQt5/libpyqt5qmlplugin.so</Path>
<Path fileType="library">/usr/lib64/qt5/plugins/designer/libpyqt5.so</Path>
<Path fileType="data">/usr/share/qt5/qsci/api/python/PyQt5.api</Path>
@@ -898,9 +913,129 @@
<Path fileType="data">/usr/share/sip/PyQt5/pyrcc/pyrccmod.sip</Path>
</Files>
</Package>
+ <Package>
+ <Name>python3-qt5</Name>
+ <Summary xml:lang="en">python3-qt5 are the python3 bindings for Qt5.</Summary>
+ <Description xml:lang="en">python-qt5 are the python2 bindings for Qt5.
+</Description>
+ <PartOf>programming.python</PartOf>
+ <RuntimeDependencies>
+ <Dependency releaseFrom="28">python-qt5-common</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5-5.12.2.dist-info/INSTALLER</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5-5.12.2.dist-info/METADATA</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5-5.12.2.dist-info/RECORD</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/Qt.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtBluetooth.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtBluetooth.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtCore.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtCore.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtDBus.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtDBus.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtDesigner.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtDesigner.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtGui.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtGui.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtHelp.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtHelp.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtLocation.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtLocation.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtMultimedia.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtMultimedia.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtMultimediaWidgets.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtMultimediaWidgets.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtNetwork.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtNetwork.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtNfc.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtNfc.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtOpenGL.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtOpenGL.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtPositioning.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtPositioning.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtPrintSupport.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtPrintSupport.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQml.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQml.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQuick.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQuick.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQuickWidgets.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtQuickWidgets.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSensors.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSensors.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSerialPort.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSerialPort.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSql.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSql.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSvg.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtSvg.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtTest.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtTest.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebChannel.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebChannel.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebKit.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebKit.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebKitWidgets.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebKitWidgets.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebSockets.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWebSockets.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWidgets.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtWidgets.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtX11Extras.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtX11Extras.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtXml.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtXml.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtXmlPatterns.pyi</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/QtXmlPatterns.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/_QOpenGLFunctions_2_0.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/_QOpenGLFunctions_2_1.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/_QOpenGLFunctions_4_1_Core.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/pylupdate.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/pylupdate_main.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/pyrcc.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/pyrcc_main.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/compiler.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/indenter.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/misc.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/proxy_metaclass.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/qobjectcreator.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Compiler/qtproxies.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Loader/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Loader/loader.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/Loader/qobjectcreator.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/driver.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/exceptions.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/icon_cache.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/objcreator.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v2/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v2/as_string.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v2/ascii_upper.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v2/proxy_base.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v2/string_io.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v3/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v3/as_string.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v3/ascii_upper.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v3/proxy_base.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/port_v3/string_io.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/properties.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/pyuic.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/uiparser.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qaxcontainer.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qscintilla.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qtcharts.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qtprintsupport.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qtquickwidgets.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qtwebenginewidgets.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/PyQt5/uic/widget-plugins/qtwebkit.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/dbus/mainloop/pyqt5.so</Path>
+ </Files>
+ </Package>
<History>
- <Update release="27">
- <Date>2019-05-07</Date>
+ <Update release="28">
+ <Date>2019-05-13</Date>
<Version>5.12.2</Version>
<Comment>Packaging update</Comment>
<Name>F. von Gellhorn</Name>

File Metadata

Mime Type
text/plain
Expires
May 22 2023, 6:49 AM (11 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5798866
Default Alt Text
D6248.id15065.diff (19 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.