This repository has been archived by the owner on May 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to Qt 5.15.2 and PyQt 5.15.3
See #31
- Loading branch information
1 parent
eafc3cb
commit 4566e70
Showing
48 changed files
with
539 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,4 +38,4 @@ qt5-x11extras | |
| qt5-xmlpatterns | ||
| qt5-webkit | ||
| pyqt5 | ||
| pyqtwebengine | ||
| pyqt5-webengine | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Maintainer: Antonio Rojas <[email protected]> | ||
| # Maintainer: Felix Yan <[email protected]> | ||
|
|
||
| pkgbase=pyqt5-webengine-debug | ||
| pkgname=(python-pyqt5-webengine-debug) | ||
| _orig_pkgname=${pkgname/-debug/} | ||
| pkgdesc="Python bindings for QtWebEngine" | ||
| pkgver=5.15.3 | ||
| pkgrel=1 | ||
| arch=(x86_64) | ||
| url="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" | ||
| license=(GPL) | ||
| options=("debug" "!strip") | ||
| groups=(pyqt5) | ||
| depends=(python-pyqt5 qt5-webengine) | ||
| makedepends=(sip pyqt-builder) | ||
| conflicts=(pyqtwebengine-common python-pyqtwebwengine 'pyqt5-webengine-debug') | ||
| provides=("python-pyqt5-webengine=$pkgver" "pyqt5-webengine-debug=$pkgver" python-pyqtwebengine) | ||
| options=("debug" "!strip") | ||
| replaces=(python-pyqtwebengine) | ||
| source=("https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-$pkgver.tar.gz") | ||
| sha256sums=('0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6') | ||
|
|
||
| build() { | ||
| cd PyQtWebEngine-$pkgver | ||
| sip-build \ | ||
| --no-make \ | ||
| --api-dir /usr/share/qt/qsci/api/python | ||
| cd build | ||
| make | ||
| } | ||
|
|
||
| package_python-pyqt5-webengine-debug() { | ||
| conflicts=("python-pyqt5-webengine") | ||
| cd PyQtWebEngine-$pkgver/build | ||
| make INSTALL_ROOT="$pkgdir" install | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,66 +6,52 @@ | |
| # Contributor: riai <[email protected]> Ben <[email protected]> | ||
|
|
||
| pkgbase=pyqt5-debug | ||
| pkgname=('python-pyqt5-debug' 'python2-pyqt5-debug') | ||
| pkgver=5.15.1 | ||
| pkgname=('python-pyqt5-debug') | ||
| pkgdesc="A set of Python bindings for the Qt5 toolkit" | ||
| pkgver=5.15.3 | ||
| pkgrel=1 | ||
| arch=('x86_64') | ||
| url="https://riverbankcomputing.com/software/pyqt/intro" | ||
| license=('GPL') | ||
| options=("debug" "!strip") | ||
| makedepends=('sip5' 'pyqt-builder' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'python2-opengl' 'python2-enum34' | ||
| 'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-speech' 'qt5-svg' | ||
| 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth' 'qt5-xmlpatterns' 'qt5-remoteobjects' 'qt5-quick3d') | ||
| groups=(pyqt5-debug) | ||
| depends=('python-pyqt5-sip' 'qt5-base') | ||
| optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications' | ||
| 'python-dbus: for python-dbus mainloop support' | ||
| 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' | ||
| 'qt5-tools: QtHelp, QtDesigner' | ||
| 'qt5-svg: QtSvg' | ||
| 'qt5-webkit: QtWebKit, QtWebKitWidgets' | ||
| 'qt5-xmlpatterns: QtXmlPatterns' | ||
| 'qt5-declarative: QtQml, qmlplugin' | ||
| 'qt5-serialport: QtSerialPort' | ||
| 'qt5-websockets: QtWebSockets' | ||
| 'qt5-connectivity: QtNfc, QtBluetooth' | ||
| 'qt5-x11extras: QtX11Extras' | ||
| 'qt5-remoteobjects: QtRemoteObjects' | ||
| 'qt5-speech: QtTextToSpeech' | ||
| 'qt5-quick3d: QtQuick3D') | ||
| provides=("python-pyqt5=$pkgver" qt5-python-bindings) | ||
| makedepends=('sip' 'pyqt-builder' 'python-opengl' 'python-dbus' | ||
| 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-speech' 'qt5-svg' | ||
| 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-xmlpatterns' 'qt5-remoteobjects' 'qt5-quick3d') | ||
| conflicts=('pyqt5-common-debug') | ||
| source=("https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$pkgver.tar.gz") | ||
| sha256sums=('d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1') | ||
|
|
||
| prepare() { | ||
| cp -a PyQt5-$pkgver{,-py2} | ||
| } | ||
| sha256sums=('965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838') | ||
|
|
||
| build() { | ||
| cd "$srcdir"/PyQt5-$pkgver | ||
| cd PyQt5-$pkgver | ||
| sip-build \ | ||
| --confirm-license \ | ||
| --debug \ | ||
| --no-make \ | ||
| --api-dir /usr/share/qt/qsci/api/python | ||
| cd build | ||
| make | ||
|
|
||
| cd "$srcdir"/PyQt5-$pkgver-py2 | ||
| python2 configure.py \ | ||
| --confirm-license \ | ||
| --debug \ | ||
| --sip='/usr/bin/sip' | ||
| make | ||
| } | ||
|
|
||
| package_python-pyqt5-debug(){ | ||
| conflicts=("python-pyqt5") | ||
| options=("debug" "!strip") | ||
| pkgdesc="A set of Python bindings for the Qt5 toolkit" | ||
| groups=(pyqt5-debug) | ||
| depends=('python-pyqt5-sip' 'qt5-base') | ||
| optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications' | ||
| 'python-dbus: for python-dbus mainloop support' | ||
| 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' | ||
| 'qt5-tools: QtHelp, QtDesigner' | ||
| 'qt5-svg: QtSvg' | ||
| 'qt5-webkit: QtWebKit, QtWebKitWidgets' | ||
| 'qt5-xmlpatterns: QtXmlPatterns' | ||
| 'qt5-declarative: QtQml, qmlplugin' | ||
| 'qt5-serialport: QtSerialPort' | ||
| 'qt5-websockets: QtWebSockets' | ||
| 'qt5-connectivity: QtNfc, QtBluetooth' | ||
| 'qt5-x11extras: QtX11Extras' | ||
| 'qt5-networkauth: QtNetworkAuth' | ||
| 'qt5-remoteobjects: QtRemoteObjects' | ||
| 'qt5-speech: QtTextToSpeech' | ||
| 'qt5-quick3d: QtQuick3D') | ||
| provides=("python-pyqt5=$pkgver" qt5-python-bindings) | ||
|
|
||
| cd PyQt5-$pkgver/build | ||
| make INSTALL_ROOT="$pkgdir" install -j1 | ||
|
|
||
|
|
@@ -76,46 +62,3 @@ package_python-pyqt5-debug(){ | |
| python -m compileall -d / "$pkgdir"/usr/lib | ||
| python -O -m compileall -d / "$pkgdir"/usr/lib | ||
| } | ||
|
|
||
| package_python2-pyqt5-debug(){ | ||
| provides=("python2-pyqt5=$pkgver") | ||
| conflicts=("python2-pyqt5") | ||
| options=("debug" "!strip") | ||
| pkgdesc="A set of Python 2 bindings for the Qt5 toolkit" | ||
| depends=('python2-sip-pyqt5' 'qt5-base' 'python2-enum34') | ||
| optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications' | ||
| 'python-dbus: for python-dbus mainloop support' | ||
| 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' | ||
| 'qt5-tools: QtHelp, QtDesigner' | ||
| 'qt5-svg: QtSvg' | ||
| 'qt5-webkit: QtWebKit, QtWebKitWidgets' | ||
| 'qt5-xmlpatterns: QtXmlPatterns' | ||
| 'qt5-declarative: QtQml, qmlplugin' | ||
| 'qt5-serialport: QtSerialPort' | ||
| 'qt5-websockets: QtWebSockets' | ||
| 'qt5-connectivity: QtNfc, QtBluetooth' | ||
| 'qt5-x11extras: QtX11Extras' | ||
| 'qt5-networkauth: QtNetworkAuth' | ||
| 'qt5-remoteobjects: QtRemoteObjects' | ||
| 'qt5-speech: QtTextToSpeech' | ||
| 'qt5-quick3d: QtQuick3D') | ||
|
|
||
| cd PyQt5-$pkgver-py2 | ||
| # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR | ||
| make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install -j1 | ||
|
|
||
| # Remove unused py3 version of uic modules: | ||
| rm -r "$pkgdir"/usr/lib/python*/site-packages/PyQt5/uic/port_v3 | ||
|
|
||
| # compile Python bytecode | ||
| python2 -m compileall -d / "$pkgdir"/usr/lib | ||
| python2 -O -m compileall -d / "$pkgdir"/usr/lib | ||
|
|
||
| # Fix conflicts with python-pyqt5-debug | ||
| mv "$pkgdir"/usr/bin/{,python2-}pyuic5 | ||
| mv "$pkgdir"/usr/bin/{,python2-}pylupdate5 | ||
| mv "$pkgdir"/usr/bin/{,python2-}pyrcc5 | ||
|
|
||
| rm "$pkgdir"/usr/lib/qt/plugins/designer/libpyqt5.so | ||
| rm "$pkgdir"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | ||
| index 99d77156fd..fc840fe9f6 100644 | ||
| --- a/mkspecs/common/gcc-base.conf | ||
| +++ b/mkspecs/common/gcc-base.conf | ||
| @@ -31,6 +31,8 @@ | ||
| # you can use the manual test in tests/manual/mkspecs. | ||
| # | ||
|
|
||
| +CONFIG += nostrip | ||
| + | ||
| QMAKE_CFLAGS_OPTIMIZE = -O2 | ||
| QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 | ||
| QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.