* Re: [PR PATCH] [Updated] [WIP] py for Qt stack: update to 5.13.2
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16833@inbox.vuxu.org>
@ 2019-12-30 18:34 ` voidlinux-github
0 siblings, 0 replies; only message in thread
From: voidlinux-github @ 2019-12-30 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages pyqt.5.13.2.stack
https://github.com/void-linux/void-packages/pull/16833
[WIP] py for Qt stack: update to 5.13.2
* [x] have a look on Travis CI : too big to fit
* [x] need to rebuild FreeCAD : included
* [x] FreeCAD runtime test (basic): OK
* [x] test build against musl
* [ ] review/rework/update since python 3.8.1 is here
A patch file from https://github.com/void-linux/void-packages/pull/16833.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pyqt.5.13.2.stack-16833.patch --]
[-- Type: text/x-diff, Size: 13420 bytes --]
From 2703f80e1c945d999d70016313b4d58d65be5ccf Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 30 Dec 2019 08:20:55 +0100
Subject: [PATCH 1/4] shiboken2: update to 5.13.2, fix update detection
---
common/shlibs | 2 +-
.../patches/no-python-arch-sufix.patch | 38 +++++++++++++++++++
srcpkgs/shiboken2/template | 19 ++++------
srcpkgs/shiboken2/update | 3 ++
4 files changed, 50 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/shiboken2/patches/no-python-arch-sufix.patch
create mode 100644 srcpkgs/shiboken2/update
diff --git a/common/shlibs b/common/shlibs
index 8b1c87a98aa..2c9563a6341 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1624,7 +1624,7 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libXaw3d.so.8 libXaw3d-1.6.2_1
libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
-libshiboken2.so.5.11 libshiboken2-5.11.2_1
+libshiboken2.so.5.13 libshiboken2-5.13.2_1
libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
libpyside2.so.5.11 libpyside2-python3-5.11.2_1
diff --git a/srcpkgs/shiboken2/patches/no-python-arch-sufix.patch b/srcpkgs/shiboken2/patches/no-python-arch-sufix.patch
new file mode 100644
index 00000000000..1346a921302
--- /dev/null
+++ b/srcpkgs/shiboken2/patches/no-python-arch-sufix.patch
@@ -0,0 +1,38 @@
+Consistent file naming across architectures for so libs and cmake files:
+remove intermediate suffix like ".cpython-36m-x86_64-linux-gnu".
+Avoid overwriting the "real" cmake file with the generic wrapper's one (same
+name in such a case)
+
+--- sources/shiboken2/CMakeLists.txt.ORIG
++++ sources/shiboken2/CMakeLists.txt
+@@ -98,6 +98,11 @@
+ "PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.")
+ endif()
+
++# consistent file naming across architectures
++set(PYTHON_EXTENSION_SUFFIX "")
++set(PYTHON_CONFIG_SUFFIX "")
++set(PYTHON_SHARED_LIBRARY_SUFFIX "")
++
+ message(STATUS "PYTHON_EXTENSION_SUFFIX: ${PYTHON_EXTENSION_SUFFIX}")
+ message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}")
+ message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
+--- sources/shiboken2/data/CMakeLists.txt.ORIG
++++ sources/shiboken2/data/CMakeLists.txt
+@@ -37,16 +37,11 @@
+ PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
+ )
+
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2Config.cmake.in"
+- "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2ConfigVersion.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2ConfigVersion.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken2.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/shiboken2${shiboken2_SUFFIX}.pc" @ONLY)
+
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake"
+- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
+-
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}")
+
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index bea32ddab46..f804d3ed39b 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,12 @@
# Template file for 'shiboken2'
pkgname=shiboken2
-version=5.11.2
-revision=4
-_pkgname="pyside-setup-everywhere-src-${version}"
+version=5.13.2
+revision=1
+_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="$_pkgname"
configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF"
-hostmakedepends="cmake"
+hostmakedepends="cmake python3-devel"
makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
libxslt-devel python3-numpy"
short_desc="Python binding generator of Qt5 C++ API"
@@ -14,12 +14,8 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=18f572f1f832e476083d30fccabab167450f2a8cbe5cd9c6e6e4fa078ccb86c2
-
-pre_build() {
- # Fix inconsistent naming of .so and .cmake files
- sed -i "/get_python_extension_suffix()/d" sources/shiboken2/CMakeLists.txt
-}
+checksum=3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
+python_version=3
do_build() {
[ ! -d build ] && mkdir build
@@ -36,7 +32,7 @@ do_install() {
libshiboken2-devel_package() {
depends="${sourcepkg}-${version}_${revision}
- libshiboken2-${version}_${revision}"
+ libshiboken2-${version}_${revision} python3-shiboken2-${version}_${revision}"
short_desc+=" - common development files"
pkg_install() {
vmove usr/include
@@ -55,6 +51,7 @@ libshiboken2_package() {
python3-shiboken2_package() {
short_desc="Python3 shiboken2 bindings"
+ pycompile_module="shiboken2"
pkg_install() {
vmove ${py3_sitelib}
}
diff --git a/srcpkgs/shiboken2/update b/srcpkgs/shiboken2/update
new file mode 100644
index 00000000000..1c0e6e5fef6
--- /dev/null
+++ b/srcpkgs/shiboken2/update
@@ -0,0 +1,3 @@
+pkgname=pyside-setup-opensource-src
+vdprefix=PySide2-
+vdsuffix=-src
From ddb6f2c25afd95f160fb51257f703dced2cc1ee9 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 30 Dec 2019 08:20:59 +0100
Subject: [PATCH 2/4] python3-pyside2: update to 5.13.2, fix update detection
---
common/shlibs | 2 +-
.../patches/no-python-arch-sufix.patch | 26 +++++++++++++++++++
srcpkgs/python3-pyside2/template | 21 +++++++--------
srcpkgs/python3-pyside2/update | 3 +++
4 files changed, 39 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/python3-pyside2/patches/no-python-arch-sufix.patch
create mode 100644 srcpkgs/python3-pyside2/update
diff --git a/common/shlibs b/common/shlibs
index 2c9563a6341..1978cdeccda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1627,7 +1627,7 @@ libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4
libshiboken2.so.5.13 libshiboken2-5.13.2_1
libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6
-libpyside2.so.5.11 libpyside2-python3-5.11.2_1
+libpyside2.so.5.13 libpyside2-python3-5.13.2_1
libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
diff --git a/srcpkgs/python3-pyside2/patches/no-python-arch-sufix.patch b/srcpkgs/python3-pyside2/patches/no-python-arch-sufix.patch
new file mode 100644
index 00000000000..67a52d3efa0
--- /dev/null
+++ b/srcpkgs/python3-pyside2/patches/no-python-arch-sufix.patch
@@ -0,0 +1,26 @@
+As for shiboken2 package, makes file naming consistent across architectures for
+so libs and cmake files: removes intermediate suffix like ".cpython-36m-x86_64-linux-gnu".
+Avoid overwriting the "real" cmake file with the generic wrapper's one (same
+name in such a case)
+
+--- sources/pyside2/libpyside/CMakeLists.txt.ORIG
++++ sources/pyside2/libpyside/CMakeLists.txt
+@@ -177,8 +177,6 @@
+ PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE
+ )
+
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide2Config.cmake.in"
+- "${CMAKE_CURRENT_BINARY_DIR}/PySide2Config.cmake" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide2ConfigVersion.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/PySide2ConfigVersion.cmake" @ONLY)
+
+@@ -195,9 +193,6 @@
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside2${pyside2_SUFFIX}.pc"
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide2Config.cmake"
+- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide2-${BINDING_API_VERSION}")
+-
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/PySide2Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide2-${BINDING_API_VERSION}")
+
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index 2f96763bbff..7e90b1bad0c 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,11 +1,11 @@
# Template file for 'python3-pyside2'
pkgname=python3-pyside2
-version=5.11.2
-revision=3
-_pkgname="pyside-setup-everywhere-src-${version}"
+version=5.13.2
+revision=1
+_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="$_pkgname"
configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF"
+ -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python"
pycompile_module="PySide2"
hostmakedepends="cmake"
makedepends="python3-devel libshiboken2-devel qt5-devel
@@ -14,18 +14,14 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
qt5-xmlpatterns-devel qt5-location-devel qt5-declarative-devel qt5-scxml-devel
qt5-script-devel qt5-sensors-devel qt5-speech-devel qt5-charts-devel
qt5-svg-devel qt5-datavis3d-devel qt5-webchannel-devel qt5-webengine-devel
- qt5-websockets-devel qt5-3d-devel qt5-gamepad-devel"
+ qt5-websockets-devel qt5-3d-devel qt5-gamepad-devel qt5-remoteobjects-devel"
+depends="python3-shiboken2"
short_desc="Python3 bindings for the Qt5 toolkit"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=18f572f1f832e476083d30fccabab167450f2a8cbe5cd9c6e6e4fa078ccb86c2
-
-pre_build() {
- # Fix inconsistent naming of .so and .cmake files
- sed -i "/get_python_extension_suffix()/d" sources/pyside2/CMakeLists.txt
-}
+checksum=3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
do_build() {
[ ! -d build ] && mkdir build
@@ -41,7 +37,8 @@ do_install() {
}
libpyside2-python3-devel_package() {
- depends="libpyside2-python3-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision}
+ libpyside2-python3-${version}_${revision}"
short_desc+=" - shared library (development files)"
pkg_install() {
vmove usr/include
diff --git a/srcpkgs/python3-pyside2/update b/srcpkgs/python3-pyside2/update
new file mode 100644
index 00000000000..1c0e6e5fef6
--- /dev/null
+++ b/srcpkgs/python3-pyside2/update
@@ -0,0 +1,3 @@
+pkgname=pyside-setup-opensource-src
+vdprefix=PySide2-
+vdsuffix=-src
From e666b1921e3e49a7431c8a4618c68dd526f283eb Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 30 Dec 2019 08:21:05 +0100
Subject: [PATCH 3/4] pyside2-tools: update to 5.13.2, fix update detection
---
srcpkgs/pyside2-tools/template | 17 ++++++-----------
srcpkgs/pyside2-tools/update | 3 +++
2 files changed, 9 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/pyside2-tools/update
diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template
index 0a153de8c15..cba873a6c27 100644
--- a/srcpkgs/pyside2-tools/template
+++ b/srcpkgs/pyside2-tools/template
@@ -1,27 +1,22 @@
# Template file for 'pyside2-tools'
pkgname=pyside2-tools
-version=5.11.2
-revision=2
-_pkgname="pyside-setup-everywhere-src-${version}"
+version=5.13.2
+revision=1
+_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="$_pkgname"
configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-DBUILD_TESTS=OFF"
pycompile_module="pyside2uic"
-hostmakedepends="cmake"
+hostmakedepends="cmake python3-devel"
makedepends="python3-devel libshiboken2-devel qt5-devel
libpyside2-python3-devel"
-depends="python3"
short_desc="Python3 bindings for the Qt5 toolkit"
maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=18f572f1f832e476083d30fccabab167450f2a8cbe5cd9c6e6e4fa078ccb86c2
-
-pre_build() {
- # Fix inconsistent naming of .so and .cmake files
- sed -i "/get_python_extension_suffix()/d" sources/pyside2-tools/CMakeLists.txt
-}
+checksum=3e255d64df08880d0281ebe86009d5ea45f24332b308954d967c33995f75e543
+python_version=3
do_build() {
[ ! -d build ] && mkdir build
diff --git a/srcpkgs/pyside2-tools/update b/srcpkgs/pyside2-tools/update
new file mode 100644
index 00000000000..1c0e6e5fef6
--- /dev/null
+++ b/srcpkgs/pyside2-tools/update
@@ -0,0 +1,3 @@
+pkgname=pyside-setup-opensource-src
+vdprefix=PySide2-
+vdsuffix=-src
From eae6c2bb09510fae6deb2b3b0dd27466ed1c9d2e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 30 Dec 2019 08:21:09 +0100
Subject: [PATCH 4/4] freecad: rebuild for PyQt/pyside2 5.13.2
[ci skip]
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 54759a77399..30e1d37fba4 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.18.4
-revision=2
+revision=3
wrksrc="FreeCAD-${version}"
build_style=cmake
^ permalink raw reply [flat|nested] only message in thread