From 7a2b30602925724a14f6eabbd84d0982a40e0451 Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 30 Dec 2019 08:20:55 +0100 Subject: [PATCH 1/4] shiboken2: update to 5.14.0, fix update detection --- common/shlibs | 2 +- .../patches/no-python-arch-suffix.patch | 38 +++++++++++++++++++ srcpkgs/shiboken2/template | 18 ++++----- srcpkgs/shiboken2/update | 3 ++ 4 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/shiboken2/patches/no-python-arch-suffix.patch create mode 100644 srcpkgs/shiboken2/update diff --git a/common/shlibs b/common/shlibs index 9597430acef..7fdca711b8f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1620,7 +1620,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.14 libshiboken2-5.14.0_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-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch new file mode 100644 index 00000000000..1346a921302 --- /dev/null +++ b/srcpkgs/shiboken2/patches/no-python-arch-suffix.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..027fc32222c 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.14.0 +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 " 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=8c2ad1901a99165ed7bac8f522ee351ae3ebadd580024248f5a1db52e4a94b30 +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 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 b5644d71195de21463aff7030ad96d9f12630e3e Mon Sep 17 00:00:00 2001 From: yopito Date: Mon, 30 Dec 2019 08:20:59 +0100 Subject: [PATCH 2/4] python3-pyside2: update to 5.14.0 w/ Qt 5.13.2 support, fix update detection fix #18353 --- common/shlibs | 2 +- .../patches/no-python-arch-suffix.patch | 26 +++++++++++++++++++ ...5.13-support-core-qmessagelogcontext.patch | 16 ++++++++++++ srcpkgs/python3-pyside2/template | 26 +++++++++---------- srcpkgs/python3-pyside2/update | 3 +++ 5 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch create mode 100644 srcpkgs/python3-pyside2/patches/qt-5.13-support-core-qmessagelogcontext.patch create mode 100644 srcpkgs/python3-pyside2/update diff --git a/common/shlibs b/common/shlibs index 7fdca711b8f..60f082055a3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1623,7 +1623,7 @@ libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4 libshiboken2.so.5.14 libshiboken2-5.14.0_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.14 libpyside2-python3-5.14.0_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-suffix.patch b/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch new file mode 100644 index 00000000000..67a52d3efa0 --- /dev/null +++ b/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.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/patches/qt-5.13-support-core-qmessagelogcontext.patch b/srcpkgs/python3-pyside2/patches/qt-5.13-support-core-qmessagelogcontext.patch new file mode 100644 index 00000000000..96644b596bf --- /dev/null +++ b/srcpkgs/python3-pyside2/patches/qt-5.13-support-core-qmessagelogcontext.patch @@ -0,0 +1,16 @@ +Revert to Qt 5.13 support +source: https://codereview.qt-project.org/c/pyside/pyside-setup/+/272581 + +--- sources/pyside2/PySide2/QtCore/typesystem_core_common.xml.ORIG ++++ sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +@@ -2830,7 +2830,9 @@ + + + +- ++ ++ ++ + + + diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template index 2f96763bbff..26a6bb82d47 100644 --- a/srcpkgs/python3-pyside2/template +++ b/srcpkgs/python3-pyside2/template @@ -1,12 +1,13 @@ # Template file for 'python3-pyside2' +# XXX CAUTION patched to support Qt 5.13.2 and *NOT* Qt 5.14 +# warning: python3-pyside2 is supposed to be aligned with Qt version pkgname=python3-pyside2 -version=5.11.2 -revision=3 -_pkgname="pyside-setup-everywhere-src-${version}" +version=5.14.0 +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" -pycompile_module="PySide2" +configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + -DBUILD_TESTS=OFF -DPYTHON_EXECUTABLE=/usr/bin/python" hostmakedepends="cmake" makedepends="python3-devel libshiboken2-devel qt5-devel qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc @@ -14,18 +15,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 " 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=8c2ad1901a99165ed7bac8f522ee351ae3ebadd580024248f5a1db52e4a94b30 do_build() { [ ! -d build ] && mkdir build @@ -41,7 +38,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 89b2d891c80e54e8811ae490b8f471919db1ef22 Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 17 Jan 2020 00:03:25 +0100 Subject: [PATCH 3/4] pyside2-tools: update to 5.13.2, fix update detection --- srcpkgs/pyside2-tools/template | 20 ++++++++------------ srcpkgs/pyside2-tools/update | 3 +++ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/pyside2-tools/update diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template index 0a153de8c15..e7f10cbee4f 100644 --- a/srcpkgs/pyside2-tools/template +++ b/srcpkgs/pyside2-tools/template @@ -1,27 +1,23 @@ # Template file for 'pyside2-tools' +# XXX keep pyside2-tools version 5.13.2 to support Qt 5.13.2: +# pyside2-tools 5.14 rely on rcc and ui tools provided by Qt 5.14 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 " 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 ae42d832c3a2e7425a9fa173b953de626e947208 Mon Sep 17 00:00:00 2001 From: yopito Date: Fri, 17 Jan 2020 00:04:23 +0100 Subject: [PATCH 4/4] freecad: rebuild with pyside2 5.14.0 w/Qt 5.13.2 support [ci skip] fix #18353 --- 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