From 910023ce712b53c1ef4ada23bfacb9ad810c027d Mon Sep 17 00:00:00 2001 From: chrysos349 Date: Tue, 21 May 2024 11:12:14 +0300 Subject: [PATCH 1/6] New package: python3-pyside6-6.7.2 closes: #50452 --- common/shlibs | 3 + srcpkgs/libpyside6 | 1 + srcpkgs/libpyside6-devel | 1 + srcpkgs/libshiboken6 | 1 + srcpkgs/libshiboken6-devel | 1 + srcpkgs/python3-pyside6-webengine | 1 + .../python3-pyside6/patches/fix-build.patch | 14 ++ .../patches/no-python-suffix.patch | 60 ++++++++ srcpkgs/python3-pyside6/template | 136 ++++++++++++++++++ srcpkgs/python3-pyside6/update | 3 + srcpkgs/python3-shiboken6 | 1 + srcpkgs/shiboken6 | 1 + 12 files changed, 223 insertions(+) create mode 120000 srcpkgs/libpyside6 create mode 120000 srcpkgs/libpyside6-devel create mode 120000 srcpkgs/libshiboken6 create mode 120000 srcpkgs/libshiboken6-devel create mode 120000 srcpkgs/python3-pyside6-webengine create mode 100644 srcpkgs/python3-pyside6/patches/fix-build.patch create mode 100644 srcpkgs/python3-pyside6/patches/no-python-suffix.patch create mode 100644 srcpkgs/python3-pyside6/template create mode 100644 srcpkgs/python3-pyside6/update create mode 120000 srcpkgs/python3-shiboken6 create mode 120000 srcpkgs/shiboken6 diff --git a/common/shlibs b/common/shlibs index 8503c3e4bb7729..828c6aa855e040 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4542,3 +4542,6 @@ libsfdo-desktop-file.so.0 libsfdo-0.1.3_1 libsfdo-icon.so.0 libsfdo-0.1.3_1 libKMahjongg6.so.6 libkmahjongg-24.08.2_1 libflashrom.so.1 flashrom-1.4.0_1 +libpyside6.so.6.7 libpyside6-6.7.2_1 +libpyside6qml.so.6.7 libpyside6-6.7.2_1 +libshiboken6.so.6.7 libshiboken6-6.7.2_1 diff --git a/srcpkgs/libpyside6 b/srcpkgs/libpyside6 new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/libpyside6 @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/libpyside6-devel b/srcpkgs/libpyside6-devel new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/libpyside6-devel @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/libshiboken6 b/srcpkgs/libshiboken6 new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/libshiboken6 @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/libshiboken6-devel b/srcpkgs/libshiboken6-devel new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/libshiboken6-devel @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/python3-pyside6-webengine b/srcpkgs/python3-pyside6-webengine new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/python3-pyside6-webengine @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/python3-pyside6/patches/fix-build.patch b/srcpkgs/python3-pyside6/patches/fix-build.patch new file mode 100644 index 00000000000000..bb3f763ef0dfcd --- /dev/null +++ b/srcpkgs/python3-pyside6/patches/fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/sources/pyside6/qtexampleicons/CMakeLists.txt b/sources/pyside6/qtexampleicons/CMakeLists.txt +index 1562f7b27..58ecc7c17 100644 +--- a/sources/pyside6/qtexampleicons/CMakeLists.txt ++++ b/sources/pyside6/qtexampleicons/CMakeLists.txt +@@ -32,6 +32,9 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + target_compile_definitions(QtExampleIcons PRIVATE "-DNDEBUG") + endif() + ++get_property(SHIBOKEN_PYTHON_LIBRARIES GLOBAL PROPERTY shiboken_python_libraries) ++get_property(SHIBOKEN_PYTHON_INCLUDE_DIRS GLOBAL PROPERTY shiboken_python_include_dirs) ++ + target_include_directories(QtExampleIcons PRIVATE ${SHIBOKEN_PYTHON_INCLUDE_DIRS}) + + get_property(SHIBOKEN_PYTHON_LIBRARIES GLOBAL PROPERTY shiboken_python_libraries) diff --git a/srcpkgs/python3-pyside6/patches/no-python-suffix.patch b/srcpkgs/python3-pyside6/patches/no-python-suffix.patch new file mode 100644 index 00000000000000..d7f2072d012f96 --- /dev/null +++ b/srcpkgs/python3-pyside6/patches/no-python-suffix.patch @@ -0,0 +1,60 @@ +no python suffix like ".cpython-36m-x86_64-linux-gnu": provides a consistent +naming across architecture. + +Also don't overwrite the "real" cmake file with the generic wrapper's one: they +have the same name if no python suffix. + +--- a/sources/shiboken6/cmake/ShibokenSetup.cmake.ORIG ++++ b/sources/shiboken6/cmake/ShibokenSetup.cmake +@@ -73,6 +73,11 @@ + "PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.") + endif() + ++# no suffix like '.cpython-36m-x86_64-linux-gnu' ++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}") +--- a/sources/shiboken6/data/CMakeLists.txt.ORIG ++++ b/sources/shiboken6/data/CMakeLists.txt +@@ -36,16 +36,11 @@ + PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR + ) + +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config.cmake.in" +- "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6ConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6ConfigVersion.cmake" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" @ONLY) + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake" +- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6") +- + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake" + DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6") + +--- a/sources/pyside6/libpyside/CMakeLists.txt ++++ b/sources/pyside6/libpyside/CMakeLists.txt +@@ -166,8 +166,6 @@ + PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE + ) + +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config.cmake.in" +- "${CMAKE_CURRENT_BINARY_DIR}/PySide6Config.cmake" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6ConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake" @ONLY) + +@@ -184,9 +182,6 @@ + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside6${pyside6_SUFFIX}.pc" + DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") + +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6Config.cmake" +- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6") +- + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake" + DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6") + diff --git a/srcpkgs/python3-pyside6/template b/srcpkgs/python3-pyside6/template new file mode 100644 index 00000000000000..2ca7efaaffae3a --- /dev/null +++ b/srcpkgs/python3-pyside6/template @@ -0,0 +1,136 @@ +# Template file for 'python3-pyside6' +# NOTE: keep in sync with Qt6 +pkgname=python3-pyside6 +version=6.7.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_TESTS=OFF -DFORCE_LIMITED_API=no -DNO_QT_TOOLS=yes + -DNUMPY_INCLUDE_DIR=/${py3_sitelib}/numpy/_core/include + -DPYTHON_EXECUTABLE=/usr/bin/python3 -Wno-dev" +hostmakedepends="python3-numpy python3-setuptools qt6-base" +makedepends="libedit-devel libxslt-devel llvm17-devel python3-devel qt6-3d-devel + qt6-base-private-devel qt6-charts-devel qt6-connectivity-devel + qt6-declarative-private-devel qt6-location-devel qt6-multimedia-devel + qt6-networkauth-devel qt6-position-devel qt6-quick3d-devel + qt6-remoteobjects-devel qt6-scxml-devel qt6-sensors-devel qt6-serialport-devel + qt6-shadertools-devel qt6-speech-devel qt6-speech-plugin-flite + qt6-speech-plugin-mock qt6-speech-plugin-speechd qt6-svg-devel qt6-tools-devel + qt6-webchannel-devel qt6-websockets-devel $(vopt_if pdf qt6-pdf-devel) + $(vopt_if webengine qt6-webengine-devel)" +depends="python3-shiboken6" +short_desc="Python bindings of Qt6-based libraries" +maintainer="chrysos349 " +license="LGPL-3.0-only, GPL-2.0-only" +homepage="https://doc.qt.io/qtforpython-6" +distfiles="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz" +checksum=3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7 +conflicts="pyside2-tools" + +build_options="pdf webengine" + +subpackages="libpyside6 libpyside6-devel libshiboken6 libshiboken6-devel python3-shiboken6" + +case "$XBPS_TARGET_MACHINE" in + armv5*|armv6*) build_options_default="" ;; + *) build_options_default="pdf" ;; +esac + +export LLVM_INSTALL_DIR=${XBPS_CROSS_BASE}/usr +export PYTHONPATH=$PYTHONPATH:${XBPS_BUILDDIR}/${pkgname}-${version}/build/sources + +if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then + build_options_default+=" webengine" + subpackages+=" python3-pyside6-webengine" +fi + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" libglvnd-devel libshiboken6-devel shiboken6" + + case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*) makedepends+=" libomp-devel" ;; + esac + + configure_args+=" + -DQFP_PYTHON_HOST_PATH=/usr/bin/python3 + -DQFP_PYTHON_SITE_PACKAGES=/${py3_sitelib}" +else + subpackages+=" shiboken6" +fi + +post_patch() { + if [ "$CROSS_BUILD" ]; then + # fix pkg-config file on cross + vsed -i sources/shiboken6/data/shiboken6.pc.in \ + -e "s/Python_EXECUTABLE/QFP_PYTHON_HOST_PATH/" + fi +} + +post_install() { + # remove extraneous scripts/files + find "$DESTDIR"/usr/bin -not -name shiboken6 -type f -delete +} + +libpyside6_package() { + short_desc+=" - shared library" + pkg_install() { + vmove "usr/lib/libpyside*.so.*" + } +} + +libpyside6-devel_package() { + depends="libpyside6-${version}_${revision} python3-pyside6-${version}_${revision} + libshiboken6-devel-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/cmake/PySide*" + vmove "usr/lib/libpyside*.so" + vmove usr/lib/qt6 + vmove usr/include/PySide6 + vmove usr/lib/pkgconfig/pyside6.pc + vmove usr/share + } +} + +libshiboken6_package() { + short_desc="CPython bindings generator for C++ libraries - shared library" + pkg_install() { + vmove "usr/lib/libshiboken6.so.*" + } +} + +libshiboken6-devel_package() { + depends="libshiboken6-${version}_${revision} python3-shiboken6-${version}_${revision}" + short_desc="CPython bindings generator for C++ libraries - development files" + pkg_install() { + vmove "usr/lib/cmake/Shiboken*" + vmove usr/include/shiboken6 + vmove usr/lib/libshiboken6.so + vmove usr/lib/pkgconfig/shiboken6.pc + } +} + +python3-shiboken6_package() { + short_desc="Python shiboken6 bindings" + depends="python3" + pkg_install() { + vmove ${py3_sitelib}/shiboken6 + } +} + +shiboken6_package() { + short_desc="CPython bindings generator for C++ libraries" + depends="python3" + conflicts="shiboken2" + pkg_install() { + vmove "usr/bin/shiboken*" + vmove ${py3_sitelib}/shiboken6_generator + } +} + +python3-pyside6-webengine_package() { + depends="python3-pyside6-${version}_${revision}" + short_desc+=" - WebEngine component" + pkg_install() { + vmove "${py3_sitelib}/PySide6/QtWebEngine*" + } +} diff --git a/srcpkgs/python3-pyside6/update b/srcpkgs/python3-pyside6/update new file mode 100644 index 00000000000000..38f0b57b82d932 --- /dev/null +++ b/srcpkgs/python3-pyside6/update @@ -0,0 +1,3 @@ +pkgname=pyside-setup-everywhere +vdprefix=PySide6- +vdsuffix=-src diff --git a/srcpkgs/python3-shiboken6 b/srcpkgs/python3-shiboken6 new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/python3-shiboken6 @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file diff --git a/srcpkgs/shiboken6 b/srcpkgs/shiboken6 new file mode 120000 index 00000000000000..6491748d6ac687 --- /dev/null +++ b/srcpkgs/shiboken6 @@ -0,0 +1 @@ +python3-pyside6 \ No newline at end of file From 52b15c817ca4cc536d7f5c5ecb5b73b625dfff9f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 01:04:16 -0500 Subject: [PATCH 2/6] freecad: update to 1.0.0. --- srcpkgs/freecad/patches/pyregex.patch | 273 ++------------------------ srcpkgs/freecad/patches/vtk.patch | 32 --- srcpkgs/freecad/template | 72 +++---- 3 files changed, 55 insertions(+), 322 deletions(-) delete mode 100644 srcpkgs/freecad/patches/vtk.patch diff --git a/srcpkgs/freecad/patches/pyregex.patch b/srcpkgs/freecad/patches/pyregex.patch index 7eb032a13037a2..0c9484d4fcc8d0 100644 --- a/srcpkgs/freecad/patches/pyregex.patch +++ b/srcpkgs/freecad/patches/pyregex.patch @@ -1,81 +1,6 @@ ---- a/src/Mod/Arch/ArchAxis.py -+++ b/src/Mod/Arch/ArchAxis.py -@@ -451,7 +451,7 @@ class _ViewProviderAxis: - except Exception: - # workaround for pivy SoInput.setBuffer() bug - buf = buf.replace("\n","") -- pts = re.findall("point \[(.*?)\]",buf)[0] -+ pts = re.findall(r"point \[(.*?)\]",buf)[0] - pts = pts.split(",") - pc = [] - for point in pts: ---- a/src/Mod/Arch/ArchRebar.py -+++ b/src/Mod/Arch/ArchRebar.py -@@ -556,7 +556,7 @@ class _ViewProviderRebar(ArchComponent.ViewProviderComponent): - import re - self.centerline = coin.SoSeparator() - comp = Part.makeCompound(obj.Proxy.wires) -- pts = re.findall("point \[(.*?)\]",comp.writeInventor().replace("\n","")) -+ pts = re.findall(r"point \[(.*?)\]",comp.writeInventor().replace("\n","")) - pts = [p.split(",") for p in pts] - for pt in pts: - ps = coin.SoSeparator() ---- a/src/Mod/Arch/ArchSectionPlane.py -+++ b/src/Mod/Arch/ArchSectionPlane.py -@@ -748,7 +748,7 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face - wp.alignToPointAndAxis_SVG(Vector(0,0,0),cutplane.normalAt(0,0),0) - p = wp.getLocalCoords(markervec) - orlength = FreeCAD.Vector(p.x,p.y,0).Length -- marker = re.findall("",svg) -+ marker = re.findall(r'',svg) - if marker: - marker = marker[0].split("\"") - x1 = float(marker[1]) -@@ -764,7 +764,7 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face - scaledp1 = FreeCAD.Vector(p1.x*factor,p1.y*factor,0) - trans = orig.sub(scaledp1) - # remove marker -- svg = re.sub("","",svg,count=1) -+ svg = re.sub(r'',"",svg,count=1) - - # remove background rectangle - svg = re.sub("","",svg,count=1,flags=re.MULTILINE|re.DOTALL) -@@ -792,9 +792,9 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face - QtCore.QTimer.singleShot(1,lambda: closeViewer(view_window_name)) - - # strip svg tags (needed for TD Arch view) -- svg = re.sub("<\?xml.*?>","",svg,flags=re.MULTILINE|re.DOTALL) -- svg = re.sub("","",svg,flags=re.MULTILINE|re.DOTALL) -- svg = re.sub("<\/svg>","",svg,flags=re.MULTILINE|re.DOTALL) -+ svg = re.sub(r"<\?xml.*?>","",svg,flags=re.MULTILINE|re.DOTALL) -+ svg = re.sub(r"","",svg,flags=re.MULTILINE|re.DOTALL) -+ svg = re.sub(r"<\/svg>","",svg,flags=re.MULTILINE|re.DOTALL) - - ISRENDERING = False - ---- a/src/Mod/Arch/ArchSite.py -+++ b/src/Mod/Arch/ArchSite.py -@@ -92,7 +92,7 @@ def toNode(shape): - from pivy import coin - buf = shape.writeInventor(2,0.01) - buf = buf.replace("\n","") -- buf = re.findall("point \[(.*?)\]",buf) -+ buf = re.findall(r"point \[(.*?)\]",buf) - pts = [] - for c in buf: - pts.extend(c.split(",")) ---- a/src/Mod/Arch/importIFClegacy.py -+++ b/src/Mod/Arch/importIFClegacy.py -@@ -39,7 +39,7 @@ SCHEMA = "http://www.steptools.com/support/stdev_docs/ifcbim/ifc4.exp" # only fo - MAKETEMPFILES = False # if True, shapes are passed from ifcopenshell to freecad through temp files - DEBUG = True # this is only for the python console, this value is overridden when importing through the GUI - SKIP = ["IfcBuildingElementProxy","IfcFlowTerminal","IfcFurnishingElement"] # default. overwritten by the GUI options --IFCLINE_RE = re.compile("#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\\r]?$") -+IFCLINE_RE = re.compile(r"#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\r]?$") - PRECISION = 4 # rounding value, in number of digits - APPLYFIX = True # if true, the ifcopenshell bug-fixing function is applied when saving files - # end config -@@ -1440,9 +1440,9 @@ class IfcSchema: +--- a/src/Mod/BIM/importers/importIFClegacy.py ++++ b/src/Mod/BIM/importers/importIFClegacy.py +@@ -1433,9 +1433,9 @@ entity = {} raw_entity_str = m.groups()[0] @@ -87,172 +12,21 @@ entity["supertype"] = subtypeofmatch.groups()[0].upper() if subtypeofmatch else None # find the shortest string matched from the end of the entity type header to the ---- a/src/Mod/Draft/draftguitools/gui_trackers.py -+++ b/src/Mod/Draft/draftguitools/gui_trackers.py -@@ -423,7 +423,7 @@ class bsplineTracker(Tracker): - except Exception: - # workaround for pivy SoInput.setBuffer() bug - buf = buf.replace("\n", "") -- pts = re.findall("point \[(.*?)\]", buf)[0] -+ pts = re.findall(r"point \[(.*?)\]", buf)[0] - pts = pts.split(",") - pc = [] - for p in pts: -@@ -501,7 +501,7 @@ class bezcurveTracker(Tracker): - except Exception: - # workaround for pivy SoInput.setBuffer() bug - buf = buf.replace("\n","") -- pts = re.findall("point \[(.*?)\]", buf)[0] -+ pts = re.findall(r"point \[(.*?)\]", buf)[0] - pts = pts.split(",") - pc = [] - for p in pts: -@@ -636,7 +636,7 @@ class arcTracker(Tracker): - except Exception: - # workaround for pivy SoInput.setBuffer() bug - buf = buf.replace("\n", "") -- pts = re.findall("point \[(.*?)\]", buf)[0] -+ pts = re.findall(r"point \[(.*?)\]", buf)[0] - pts = pts.split(",") - pc = [] - for p in pts: ---- a/src/Mod/Draft/importAirfoilDAT.py -+++ b/src/Mod/Draft/importAirfoilDAT.py -@@ -4,12 +4,6 @@ - # \brief Airfoil (.dat) file importer - # - # This module provides support for importing airfoil .dat files --'''@package importAirfoilDAT --\ingroup DRAFT --\brief Airfoil (.dat) file importer -- --This module provides support for importing airfoil .dat files. --''' - # Check code with - # flake8 --ignore=E226,E266,E401,W503 - ---- a/src/Mod/Draft/importDXF.py -+++ b/src/Mod/Draft/importDXF.py -@@ -233,9 +233,9 @@ def deformat(text): - # t = re.sub('{([^!}]([^}]|\n)*)}', '', text) - # print("input text: ",text) - t = text.strip("{}") -- t = re.sub("\\\.*?;", "", t) -+ t = re.sub(r"\\.*?;", "", t) - # replace UTF codes by utf chars -- sts = re.split("\\\\(U\+....)", t) -+ sts = re.split(r"\\(U\+....)", t) - t = u"".join(sts) - # replace degrees, diameters chars - t = re.sub('%%d', u'°', t) -@@ -3863,7 +3863,7 @@ def exportPage(page, filename): - blocks = "" - entities = "" - r12 = False -- ver = re.findall("\$ACADVER\n.*?\n(.*?)\n", template) -+ ver = re.findall(r"\$ACADVER\n.*?\n(.*?)\n", template) - if ver: - # at the moment this is not used. - # TODO: if r12, do not print ellipses or splines ---- a/src/Mod/Draft/importOCA.py -+++ b/src/Mod/Draft/importOCA.py -@@ -2,17 +2,14 @@ - ## @package importOCA - # \ingroup DRAFT - # \brief OCA (Open CAD Format) file importer & exporter --'''@package importOCA --\ingroup DRAFT --\brief OCA (Open CAD Format) file importer & exporter -+# -+# This module provides support for importing from and exporting to -+# the OCA format or GCAD format from GCAD3D (http://www.gcad3d.org/). -+# See: https://groups.google.com/forum/#!forum/open_cad_format -+# -+# As of 2019 this file format is practically obsolete, and this module is not -+# maintained. - --This module provides support for importing from and exporting to --the OCA format or GCAD format from GCAD3D (http://www.gcad3d.org/). --See: https://groups.google.com/forum/#!forum/open_cad_format -- --As of 2019 this file format is practically obsolete, and this module is not --maintained. --''' - # Check code with - # flake8 --ignore=E226,E266,E401,W503 +--- a/src/Mod/CAM/CAMTests/TestPathPost.py ++++ b/src/Mod/CAM/CAMTests/TestPathPost.py +@@ -40,7 +40,7 @@ ---- a/src/Mod/Draft/importSVG.py -+++ b/src/Mod/Draft/importSVG.py -@@ -73,8 +73,7 @@ else: - draftui = None - # Save the native open function to avoid collisions --if open.__module__ in ['__builtin__', 'io']: -- pythonopen = open -+pythonopen = open - - svgcolors = { - 'Pink': (255, 192, 203), -@@ -413,8 +412,8 @@ def getsize(length, mode='discard', base=1): - } - - # Extract a number from a string like '+56215.14565E+6mm' -- _num = '([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)' -- _unit = '(px|pt|pc|mm|cm|in|em|ex|%)?' -+ _num = r"([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)" -+ _unit = r"(px|pt|pc|mm|cm|in|em|ex|%)?" - _full_num = _num + _unit - number, exponent, unit = re.findall(_full_num, length)[0] - if mode == 'discard': -@@ -729,7 +728,7 @@ class svgHandler(xml.sax.ContentHandler): - if 'inkscape:version' in data: - inks_doc_name = attrs.getValue('sodipodi:docname') - inks_full_ver = attrs.getValue('inkscape:version') -- inks_ver_pars = re.search("\d+\.\d+", inks_full_ver) -+ inks_ver_pars = re.search(r"\d+\.\d+", inks_full_ver) - if inks_ver_pars is not None: - inks_ver_f = float(inks_ver_pars.group(0)) - else: -@@ -930,13 +929,13 @@ class svgHandler(xml.sax.ContentHandler): - self.lastdim = obj - data['d'] = [] - -- _op = '([mMlLhHvVaAcCqQsStTzZ])' -- _op2 = '([^mMlLhHvVaAcCqQsStTzZ]*)' -- _command = '\s*?' + _op + '\s*?' + _op2 + '\s*?' -+ _op = r"([mMlLhHvVaAcCqQsStTzZ])" -+ _op2 = r"([^mMlLhHvVaAcCqQsStTzZ]*)" -+ _command = r"\s*?" + _op + r"\s*?" + _op2 + r"\s*?" - pathcommandsre = re.compile(_command, re.DOTALL) - -- _num = '[-+]?[0-9]*\.?[0-9]+' -- _exp = '([eE][-+]?[0-9]+)?' -+ _num = r"[-+]?[0-9]*\.?[0-9]+" -+ _exp = r"([eE][-+]?[0-9]+)?" - _point = '(' + _num + _exp + ')' - pointsre = re.compile(_point, re.DOTALL) - _commands = pathcommandsre.findall(' '.join(data['d'])) -@@ -1616,9 +1615,9 @@ class svgHandler(xml.sax.ContentHandler): - Base::Matrix4D - The translated matrix. - """ -- _op = '(matrix|translate|scale|rotate|skewX|skewY)' -- _val = '\((.*?)\)' -- _transf = _op + '\s*?' + _val -+ _op = r"(matrix|translate|scale|rotate|skewX|skewY)" -+ _val = r"\((.*?)\)" -+ _transf = _op + r"\s*?" + _val - transformre = re.compile(_transf, re.DOTALL) - m = FreeCAD.Matrix() - for transformation, arguments in transformre.findall(tr): ---- a/src/Mod/Path/Path/Post/scripts/gcode_pre.py -+++ b/src/Mod/Path/Path/Post/scripts/gcode_pre.py -@@ -191,10 +191,10 @@ def _identifygcodeByToolNumberList(filename): - gfile.close() - - # Regular expression to match tool changes in the format 'M6 Tn' -- p = re.compile("[mM]+?\s?0?6\s?T\d*\s") -+ p = re.compile(r"[mM]+?\s?0?6\s?T\d*\s") + class TestFileNameGenerator(unittest.TestCase): +- """ ++ r""" + String substitution allows the following: + %D ... directory of the active document + %d ... name of the active document (with extension) +--- a/src/Mod/CAM/Path/Post/scripts/gcode_pre.py ++++ b/src/Mod/CAM/Path/Post/scripts/gcode_pre.py +@@ -191,7 +191,7 @@ + p = re.compile(r"[mM]+?\s?0?6\s?T\d*\s") # split the gcode on tool changes - paths = re.split("([mM]+?\s?0?6\s?T\d*\s)", gcode) @@ -260,20 +34,9 @@ # iterate the gcode sections and add customs for each toolnumber = 0 ---- a/src/Mod/Path/PathTests/TestPathPost.py -+++ b/src/Mod/Path/PathTests/TestPathPost.py -@@ -352,7 +352,7 @@ class TestBuildPostList(unittest.TestCase): - - class TestOutputNameSubstitution(unittest.TestCase): - -- """ -+ r""" - String substitution allows the following: - %D ... directory of the active document - %d ... name of the active document (with extension) --- a/src/Mod/Robot/KukaExporter.py +++ b/src/Mod/Robot/KukaExporter.py -@@ -21,7 +21,7 @@ DECL FDAT FP4={TOOL_NO 1,BASE_NO 0,IPO_FRAME #BASE,POINT2[] " "} +@@ -21,7 +21,7 @@ DECL LDAT LCPDAT1={VEL 2.0,ACC 100.0,APO_DIST 100.0,APO_FAC 50.0,ORI_TYP #VAR} """ @@ -281,4 +44,4 @@ +HeaderSrc = r"""&ACCESS RVP &REL 1 &PARAM TEMPLATE = C:\KRC\Roboter\Template\ExpertVorgabe - &PARAM EDITMASK = * + &PARAM EDITMASK = * diff --git a/srcpkgs/freecad/patches/vtk.patch b/srcpkgs/freecad/patches/vtk.patch deleted file mode 100644 index bcaf68d0855e65..00000000000000 --- a/srcpkgs/freecad/patches/vtk.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -index 7f89573efd..47a52fe585 100644 ---- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -@@ -39,10 +39,6 @@ - #define SMDS_EXPORT - #endif - --#ifdef VTK_HAS_MTIME_TYPE - #define VTK_MTIME_TYPE vtkMTimeType --#else --#define VTK_MTIME_TYPE unsigned long --#endif - - #endif -diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -index 7e3de0070a..e9895d6157 100644 ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() - GetLinks()->Allocate(this->GetNumberOfPoints()); - GetLinks()->Register(this); - //FIXME: vtk9 -+ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) - GetLinks()->BuildLinks(this); -+ #else -+ GetLinks()->SetDataSet(this); -+ GetLinks()->BuildLinks(); -+ #endif - GetLinks()->Delete(); - #else - this->Links = SMDS_CellLinks::New(); diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index 3d5e31790bb62b..7fe70c0d5c0f78 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,58 +1,60 @@ # Template file for 'freecad' pkgname=freecad -version=0.21.2 -revision=2 -build_wrksrc="FreeCAD-${version}" +version=1.0.0 +revision=1 +_pycxx_ver=7.1.8 +_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c build_style=cmake pycompile_dirs="usr/lib/${pkgname}/Mod" _inst_prefix=/usr/lib/${pkgname} -configure_args=" - -DPYTHON_EXECUTABLE=/usr/bin/python3 - -DBUILD_QT5=ON - -DBUILD_FEM_NETGEN=OFF - -DBUILD_FLAT_MESH=ON - -DCMAKE_INSTALL_PREFIX=${_inst_prefix} - -DCMAKE_INSTALL_DATAROOTDIR=/usr/share - -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname} - -DMEDFILE_INCLUDE_DIRS=/usr/include/med - -DPYSIDE2RCCBINARY=/usr/bin/rcc-qt5 - -DPYSIDE2UICBINARY=/usr/bin/uic-qt5 -" +configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON + -DFREECAD_QT_VERSION=6 -DBUILD_FEM_NETGEN=OFF -DBUILD_FLAT_MESH=ON + -DFREECAD_USE_EXTERNAL_PIVY=ON -DCMAKE_INSTALL_PREFIX=${_inst_prefix} + -DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname} + -DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3" hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools python3-matplotlib" makedepends="boost-devel libxerces-c-devel zlib-devel occt-devel vtk-devel hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel - coin3-devel libshiboken2-devel libspnav-devel liblz4-devel netcdf-devel - jsoncpp-devel coin3-doc glew-devel python3-devel pyside2-tools - libpyside2-python3-devel qt5-devel qt5-svg-devel qt5-tools-devel - qt5-declarative-devel qt5-webengine-devel qt5-webchannel-devel - qt5-location-devel qt5-xmlpatterns-devel" -depends="python3-matplotlib python3-pyside2-webengine python3-pivy - python3-GitPython python3-Markdown" + coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel + glew-devel python3-devel yaml-cpp-devel guidelines-support-library + qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel" +depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown + python3-pyside6" +checkdepends="gtest-devel" short_desc="General purpose 3D CAD modeler" maintainer="yopito " license="LGPL-2.0-or-later" homepage="https://freecadweb.org/" -_pycxxver=7.1.8 -distfiles=" - https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz - ${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz -" -checksum="ceaf77cd12e8ad533d1535cc27ae4ca2a6e80778502dc9cdec906415d674b674 - 4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6" +distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz + ${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxx_ver}.tar.gz + https://github.com/Ondsel-Development/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz" +checksum="51115afd8e3b89f4bac343b986b0800d8e1c68fc1e322c3cd179cfe1033ef937 + 4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6 + 061f651f503f1ec5a9814e174cdb8a9ba84d511a3b8be3d94852e84976c6b158" python_version=3 -patch_args="-Np1 -d ${build_wrksrc}" + +skip_extraction="pycxx-${_pycxx_ver}.tar.gz + OndselSolver-${_ondsel_ver}.tar.gz" if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" LDFLAGS="-lexecinfo" fi +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DENABLE_DEVELOPER_TESTS=ON" +else + configure_args+=" -DENABLE_DEVELOPER_TESTS=OFF" +fi + CXXFLAGS="-DPYCXX_PYTHON_2TO3" post_extract() { - rm -r "${build_wrksrc}/src/CXX" - ln -Tsr "./pycxx-${_pycxxver}/CXX" "${build_wrksrc}/src/CXX" + vsrcextract -C src/3rdParty/OndselSolver "OndselSolver-${_ondsel_ver}.tar.gz" + vsrcextract -C pycxx "pycxx-${_pycxx_ver}.tar.gz" + rm -r src/CXX + ln -Tsr ./pycxx/CXX src/CXX } post_patch() { @@ -65,13 +67,13 @@ post_patch() { # SubWCRev.py (SCM check) reports "unknown" for these fields vsed -e "s,\${PACKAGE_WCREF},${revision}_voidlinux," \ -e "s,\${PACKAGE_WCDATE},(from release)," \ - -e "s,\${PACKAGE_WCURL},VoidLinux package ${pkgname}," \ + -e "s,\${PACKAGE_WCURL},Void Linux package ${pkgname}," \ -i src/Build/Version.h.cmake } pre_configure() { - configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx-${_pycxxver}" - configure_args+=" -DPYCXX_SOURCE_DIR=${wrksrc}/pycxx-${_pycxxver}/Src" + configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx + -DPYCXX_SOURCE_DIR=${wrksrc}/pycxx/Src" } post_install() { From 1c00f1b2e7603edd0ded558b0a9c0af9cda01123 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 21:53:20 -0500 Subject: [PATCH 3/6] syncplay: update to 1.7.3. --- .../patches/python3-12-compatibility.patch | 86 ------------------- srcpkgs/syncplay/template | 16 ++-- 2 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 srcpkgs/syncplay/patches/python3-12-compatibility.patch diff --git a/srcpkgs/syncplay/patches/python3-12-compatibility.patch b/srcpkgs/syncplay/patches/python3-12-compatibility.patch deleted file mode 100644 index b407c11135877f..00000000000000 --- a/srcpkgs/syncplay/patches/python3-12-compatibility.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a637befbdebd7f8e834ccd782f09823bf04146a8 Mon Sep 17 00:00:00 2001 -From: Floris Vastenhout -Date: Tue, 10 Oct 2023 19:20:26 +0200 -Subject: Update to python 3.12 - -Backport of fix to make Syncplay work on Python 3.12. - -Source: https://github.com/Syncplay/syncplay/pull/636 - ---- - syncplay/ui/ConfigurationGetter.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py -index 22525922..4b36ca4f 100755 ---- a/syncplay/ui/ConfigurationGetter.py -+++ b/syncplay/ui/ConfigurationGetter.py -@@ -5,7 +5,7 @@ - import re - import os - import sys --from configparser import SafeConfigParser, DEFAULTSECT -+from configparser import ConfigParser, DEFAULTSECT - - from syncplay import constants, utils, version, milestone - from syncplay.messages import getMessage, setLanguage, isValidLanguage -@@ -389,7 +389,7 @@ def _parseConfigFile(self, iniPath, createConfig=True): - open(iniPath, 'w').close() - else: - return -- parser.readfp(codecs.open(iniPath, "r", "utf_8_sig")) -+ parser.read(codecs.open(iniPath, "r", "utf_8_sig")) - for section, options in list(self._iniStructure.items()): - if parser.has_section(section): - for option in options: -@@ -432,7 +432,7 @@ def _saveConfig(self, iniPath): - if self._config['noStore']: - return - parser = SafeConfigParserUnicode(strict=False) -- parser.readfp(codecs.open(iniPath, "r", "utf_8_sig")) -+ parser.read(codecs.open(iniPath, "r", "utf_8_sig")) - for section, options in list(self._iniStructure.items()): - if not parser.has_section(section): - parser.add_section(section) -@@ -593,7 +593,7 @@ def setConfigOption(self, option, value): - self._config = backup - - --class SafeConfigParserUnicode(SafeConfigParser): -+class SafeConfigParserUnicode(ConfigParser): - def write(self, fp): - """Write an .ini-format representation of the configuration state.""" - if self._defaults: - -From cc5a389faeb0a7edb9e6358400d6a37507e26dd4 Mon Sep 17 00:00:00 2001 -From: Floris Vastenhout -Date: Tue, 10 Oct 2023 19:43:36 +0200 -Subject: [PATCH 2/2] Use read_file instead of read - ---- - syncplay/ui/ConfigurationGetter.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py -index 4b36ca4f..f0a7f32a 100755 ---- a/syncplay/ui/ConfigurationGetter.py -+++ b/syncplay/ui/ConfigurationGetter.py -@@ -389,7 +389,7 @@ def _parseConfigFile(self, iniPath, createConfig=True): - open(iniPath, 'w').close() - else: - return -- parser.read(codecs.open(iniPath, "r", "utf_8_sig")) -+ parser.read_file(codecs.open(iniPath, "r", "utf_8_sig")) - for section, options in list(self._iniStructure.items()): - if parser.has_section(section): - for option in options: -@@ -432,7 +432,7 @@ def _saveConfig(self, iniPath): - if self._config['noStore']: - return - parser = SafeConfigParserUnicode(strict=False) -- parser.read(codecs.open(iniPath, "r", "utf_8_sig")) -+ parser.read_file(codecs.open(iniPath, "r", "utf_8_sig")) - for section, options in list(self._iniStructure.items()): - if not parser.has_section(section): - parser.add_section(section) - diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template index 31579881411673..1feb6f504fad29 100644 --- a/srcpkgs/syncplay/template +++ b/srcpkgs/syncplay/template @@ -1,21 +1,15 @@ # Template file for 'syncplay' pkgname=syncplay -version=1.7.0 -revision=3 +version=1.7.3 +revision=1 build_style=gnu-makefile pycompile_dirs="usr/lib/syncplay/syncplay" -depends="desktop-file-utils python3-pyside2 python3-Twisted - qt5-declarative python3-service_identity" +depends="desktop-file-utils python3-pyside6 python3-Twisted + qt6-declarative python3-service_identity" short_desc="Free software that synchronises media players" maintainer="KeepBotting " license="Apache-2.0" homepage="https://syncplay.pl/" distfiles="https://github.com/syncplay/syncplay/archive/v${version}.tar.gz" -checksum=d65c402869a5b5906a601cb08452363d29d7f08a4e5df0edd29676d8c0c7b81d +checksum=5aaea59dab1a9f673019b6e59742ec8bb94248b7913b5f57423775ca905f1c0e python_version=3 - -post_install() { - for res in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do - rm -rf ${DESTDIR}/usr/share/icons/${res} - done -} From 89913f5bf1e0631a34fbd194f90932ab813dd371 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 22:00:11 -0500 Subject: [PATCH 4/6] python3-pyside2: remove package no longer needed by any other packages --- common/shlibs | 1 - srcpkgs/libpyside2-python3 | 1 - srcpkgs/libpyside2-python3-devel | 1 - srcpkgs/python3-pyside2-webengine | 1 - .../patches/cmake-qtquick-includes.patch | 15 -- .../patches/crossbuild-for-shiboken2.patch | 11 - .../crossbuild-no-pyi-generation.patch | 31 --- .../patches/no-python-arch-suffix.patch | 26 --- .../python3-pyside2/patches/python3.11.patch | 211 ------------------ .../python3-pyside2/patches/python3.12.patch | 152 ------------- .../patches/tests-correct-build_dir.patch | 14 -- .../patches/tests-disable-invalid-ones.patch | 74 ------ ...tests-find-python-modules-from-build.patch | 21 -- srcpkgs/python3-pyside2/template | 101 --------- srcpkgs/python3-pyside2/update | 3 - srcpkgs/removed-packages/template | 4 + 16 files changed, 4 insertions(+), 663 deletions(-) delete mode 120000 srcpkgs/libpyside2-python3 delete mode 120000 srcpkgs/libpyside2-python3-devel delete mode 120000 srcpkgs/python3-pyside2-webengine delete mode 100644 srcpkgs/python3-pyside2/patches/cmake-qtquick-includes.patch delete mode 100644 srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch delete mode 100644 srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch delete mode 100644 srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch delete mode 100644 srcpkgs/python3-pyside2/patches/python3.11.patch delete mode 100644 srcpkgs/python3-pyside2/patches/python3.12.patch delete mode 100644 srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch delete mode 100644 srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch delete mode 100644 srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch delete mode 100644 srcpkgs/python3-pyside2/template delete mode 100644 srcpkgs/python3-pyside2/update diff --git a/common/shlibs b/common/shlibs index 828c6aa855e040..08ba9fbea27964 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1658,7 +1658,6 @@ libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libXaw3d.so.8 libXaw3d-1.6.2_1 libshiboken2.so.5.15 libshiboken2-5.15.0_1 -libpyside2.so.5.15 libpyside2-python3-5.15.0_1 libupsclient.so.6 libnetwork-ups-tools-2.8.0_1 libnutclient.so.2 libnetwork-ups-tools-2.8.0_1 libnutscan.so.2 libnetwork-ups-tools-2.8.0_1 diff --git a/srcpkgs/libpyside2-python3 b/srcpkgs/libpyside2-python3 deleted file mode 120000 index bb1745350a8dfe..00000000000000 --- a/srcpkgs/libpyside2-python3 +++ /dev/null @@ -1 +0,0 @@ -python3-pyside2 \ No newline at end of file diff --git a/srcpkgs/libpyside2-python3-devel b/srcpkgs/libpyside2-python3-devel deleted file mode 120000 index bb1745350a8dfe..00000000000000 --- a/srcpkgs/libpyside2-python3-devel +++ /dev/null @@ -1 +0,0 @@ -python3-pyside2 \ No newline at end of file diff --git a/srcpkgs/python3-pyside2-webengine b/srcpkgs/python3-pyside2-webengine deleted file mode 120000 index bb1745350a8dfe..00000000000000 --- a/srcpkgs/python3-pyside2-webengine +++ /dev/null @@ -1 +0,0 @@ -python3-pyside2 \ No newline at end of file diff --git a/srcpkgs/python3-pyside2/patches/cmake-qtquick-includes.patch b/srcpkgs/python3-pyside2/patches/cmake-qtquick-includes.patch deleted file mode 100644 index ea83e7dbc633fa..00000000000000 --- a/srcpkgs/python3-pyside2/patches/cmake-qtquick-includes.patch +++ /dev/null @@ -1,15 +0,0 @@ -This is a terrible hack. PySide2 fails to build with Qt5 (even on Py3.11) -because shiboken can't find private interfaces for QtQuick widgets. Brute-force -the necessary include paths to make the build work. - ---- ./sources/pyside2/cmake/Macros/PySideModules.cmake.orig 2023-09-27 23:51:40.096157231 -0400 -+++ ./sources/pyside2/cmake/Macros/PySideModules.cmake 2023-09-27 23:52:19.825408838 -0400 -@@ -93,7 +93,7 @@ - # Contains include directories to pass to shiboken's preprocessor. - # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until - # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git -- string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}") -+ string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS};${Qt5Quick_PRIVATE_INCLUDE_DIRS}") - set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}) - set(shiboken_framework_include_dirs_option "") - if(CMAKE_HOST_APPLE) diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch deleted file mode 100644 index 88e89413a980d3..00000000000000 --- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sources/pyside2/cmake/Macros/PySideModules.cmake -+++ b/sources/pyside2/cmake/Macros/PySideModules.cmake -@@ -94,7 +94,7 @@ - # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until - # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git - string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS};${Qt5Quick_PRIVATE_INCLUDE_DIRS}") -- set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}) -+ set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes}${PATH_SEP}${CMAKE_FIND_ROOT_PATH}/usr/include) - set(shiboken_framework_include_dirs_option "") - if(CMAKE_HOST_APPLE) - set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}") diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch b/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch deleted file mode 100644 index f9dd51b585bd17..00000000000000 --- a/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch +++ /dev/null @@ -1,31 +0,0 @@ -pyside2 cmake code does not handle crossbuild while generating pyi files. -(stub files for type checker). -From now, disable their generation. - ---- a/sources/pyside2/cmake/Macros/PySideModules.cmake -+++ b/sources/pyside2/cmake/Macros/PySideModules.cmake -@@ -201,18 +201,24 @@ - endif() - - # Add target to generate pyi file, which depends on the module target. -+ if(NOT CMAKE_CROSSCOMPILING) - add_custom_target("${module_NAME}_pyi" ALL - COMMAND ${CMAKE_COMMAND} -E env ${ld_prefix} - "${SHIBOKEN_PYTHON_INTERPRETER}" - "${CMAKE_CURRENT_SOURCE_DIR}/../support/generate_pyi.py" ${generate_pyi_options}) - add_dependencies("${module_NAME}_pyi" ${module_NAME}) -+ else() -+ message(STATUS "crossbuild: disable generation of ${module_NAME}_pyi") -+ endif() - - # install - install(TARGETS ${module_NAME} LIBRARY DESTINATION "${PYTHON_SITE_PACKAGES}/PySide2") - -+ if(NOT CMAKE_CROSSCOMPILING) - file(GLOB hinting_stub_files RELATIVE "${CMAKE_CURRENT_BINARY_DIR}/PySide2" "${CMAKE_CURRENT_BINARY_DIR}/PySide2/*.pyi") - install(FILES ${hinting_stub_files} - DESTINATION "${PYTHON_SITE_PACKAGES}/PySide2") -+ endif() - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module_NAME}/pyside2_${lower_module_name}_python.h - DESTINATION include/PySide2${pyside2_SUFFIX}/${module_NAME}/) diff --git a/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch b/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch deleted file mode 100644 index 756c382187273d..00000000000000 --- a/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) - ---- a/sources/pyside2/libpyside/CMakeLists.txt -+++ b/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/python3.11.patch b/srcpkgs/python3-pyside2/patches/python3.11.patch deleted file mode 100644 index 3522f4e817e04f..00000000000000 --- a/srcpkgs/python3-pyside2/patches/python3.11.patch +++ /dev/null @@ -1,211 +0,0 @@ -From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Thu, 9 Jun 2022 16:50:41 +0200 -Subject: [PATCH] libshiboken: Fix a crash in Shiboken::Object::isValid() for - Python 3.11 - -The function is passed type objects for class methods, which caused -it to crash. - -The first clause did not catch this, and so it was cast to SbkObject -below. - -Add a type check to prevent this. - -Pick-to: 6.3 6.2 5.15 -Task-number: PYSIDE-1960 -Change-Id: Icfdd6fefb7156ac5961444bd5395109849a1d66e -Reviewed-by: Christian Tismer -Reviewed-by: Qt CI Bot ---- - sources/shiboken2/libshiboken/basewrapper.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp -index d866d13..19418c8 100644 ---- a/sources/shiboken2/libshiboken/basewrapper.cpp -+++ b/sources/shiboken2/libshiboken/basewrapper.cpp -@@ -1468,6 +1468,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr) - bool isValid(PyObject *pyObj) - { - if (!pyObj || pyObj == Py_None -+ || PyType_Check(pyObj) != 0 - || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) { - return true; - } --- -2.35.3 - -From 77fdd690ca14e97b4c800c4127362ca0c83a716a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 9 Jun 2022 13:45:07 +0200 -Subject: [PATCH] Fix usage of Py_TYPE() for Python 3.11 - -The macro was changed to a function, no longer allowing for assignment. ---- - sources/pyside2/libpyside/pysideqflags.cpp | 2 +- - sources/pyside2/libpyside/pysidesignal.cpp | 2 +- - sources/pyside2/libpyside/pysideweakref.cpp | 2 +- - sources/shiboken2/libshiboken/basewrapper.cpp | 4 ++-- - sources/shiboken2/libshiboken/sbkenum.cpp | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp -index b141ce1..ef0c8f4 100644 ---- a/sources/pyside2/libpyside/pysideqflags.cpp -+++ b/sources/pyside2/libpyside/pysideqflags.cpp -@@ -187,7 +187,7 @@ namespace QFlags - } - newspec.slots = SbkNewQFlagsType_spec.slots; - PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec); -- Py_TYPE(type) = &PyType_Type; -+ Py_SET_TYPE(type, &PyType_Type); - - PySideQFlagsType *flagsType = reinterpret_cast(type); - PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter; -diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp -index 5c03031..5e42dba 100644 ---- a/sources/pyside2/libpyside/pysidesignal.cpp -+++ b/sources/pyside2/libpyside/pysidesignal.cpp -@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void) - if (!type) { - type = reinterpret_cast(SbkType_FromSpec(&PySideSignalType_spec)); - PyTypeObject *hold = Py_TYPE(type); -- Py_TYPE(type) = PySideMetaSignalTypeF(); -+ Py_SET_TYPE(type, PySideMetaSignalTypeF()); - Py_INCREF(Py_TYPE(type)); - Py_DECREF(hold); - } -diff --git a/sources/pyside2/libpyside/pysideweakref.cpp b/sources/pyside2/libpyside/pysideweakref.cpp -index cd90634..730990f 100644 ---- a/sources/pyside2/libpyside/pysideweakref.cpp -+++ b/sources/pyside2/libpyside/pysideweakref.cpp -@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData) - - if (Py_TYPE(PySideCallableObjectTypeF()) == 0) - { -- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type; -+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type); - PyType_Ready(PySideCallableObjectTypeF()); - } - -diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp -index 19418c8..0cc6fad 100644 ---- a/sources/shiboken2/libshiboken/basewrapper.cpp -+++ b/sources/shiboken2/libshiboken/basewrapper.cpp -@@ -366,7 +366,7 @@ SbkObjectType *SbkObject_TypeF(void) - static PyTypeObject *type = nullptr; - if (!type) { - type = reinterpret_cast(SbkType_FromSpec(&SbkObject_Type_spec)); -- Py_TYPE(type) = SbkObjectType_TypeF(); -+ Py_SET_TYPE(type, SbkObjectType_TypeF()); - Py_INCREF(Py_TYPE(type)); - type->tp_weaklistoffset = offsetof(SbkObject, weakreflist); - type->tp_dictoffset = offsetof(SbkObject, ob_dict); -@@ -1110,7 +1110,7 @@ introduceWrapperType(PyObject *enclosingObject, - typeSpec->slots[0].pfunc = reinterpret_cast(baseType ? baseType : SbkObject_TypeF()); - - PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes); -- Py_TYPE(heaptype) = SbkObjectType_TypeF(); -+ Py_SET_TYPE(heaptype, SbkObjectType_TypeF()); - Py_INCREF(Py_TYPE(heaptype)); - auto *type = reinterpret_cast(heaptype); - #if PY_VERSION_HEX < 0x03000000 -diff --git a/sources/shiboken2/libshiboken/sbkenum.cpp b/sources/shiboken2/libshiboken/sbkenum.cpp -index 369b264..edcdc16 100644 ---- a/sources/shiboken2/libshiboken/sbkenum.cpp -+++ b/sources/shiboken2/libshiboken/sbkenum.cpp -@@ -753,7 +753,7 @@ - PyTuple_SetItem(bases, 0, reinterpret_cast(basetype)); - auto *type = reinterpret_cast(SbkType_FromSpecWithBases(&newspec, bases)); - PyErr_Print(); -- Py_TYPE(type) = SbkEnumType_TypeF(); -+ Py_SET_TYPE(type, SbkEnumType_TypeF()); - - auto *enumType = reinterpret_cast(type); - PepType_SETP(enumType)->cppName = cppName; --- -2.35.3 - -From a09a1db8391243e6bb290ee66bb6e3afbb114c61 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Fri, 24 Jun 2022 09:22:01 +0200 -Subject: libshiboken: Fix crashes with static strings in Python 3.11 - -In Python 3.11, some strings come with a refcount above decimal -1000000000, apparently indicating that they are interned. Replace the -mechanism by PyUnicode_InternFromString(). - -Task-number: PYSIDE-1960 -Pick-to: 6.3 6.2 5.15 -Change-Id: I6436afee351f89da5814b5d6bc76970b1b508168 -Reviewed-by: Qt CI Bot -Reviewed-by: Christian Tismer -Upstream: https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=a09a1db8391243e6bb290ee66bb6e3afbb114c61 - ---- - sources/shiboken6/libshiboken/sbkstring.cpp | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/sources/shiboken6/libshiboken/sbkstring.cpp b/sources/shiboken6/libshiboken/sbkstring.cpp -index 7fd20173c..36fe50369 100644 ---- a/sources/shiboken2/libshiboken/sbkstring.cpp -+++ b/sources/shiboken2/libshiboken/sbkstring.cpp -@@ -5,8 +5,14 @@ - #include "sbkstaticstrings_p.h" - #include "autodecref.h" - --#include --#include -+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API) -+# define USE_INTERN_STRINGS -+#endif -+ -+#ifndef USE_INTERN_STRINGS -+# include -+# include -+#endif - - namespace Shiboken - { -@@ -179,6 +185,13 @@ Py_ssize_t len(PyObject *str) - // PyObject *attr = PyObject_GetAttr(obj, name()); - // - -+#ifdef USE_INTERN_STRINGS -+PyObject *createStaticString(const char *str) -+{ -+ return PyUnicode_InternFromString(str); -+} -+#else -+ - using StaticStrings = std::unordered_set; - - static void finalizeStaticStrings(); // forward -@@ -225,6 +238,8 @@ PyObject *createStaticString(const char *str) - return result; - } - -+#endif // !USE_INTERN_STRINGS -+ - /////////////////////////////////////////////////////////////////////// - // - // PYSIDE-1019: Helper function for snake_case vs. camelCase names --- -cgit v1.2.1 - -From 0000000000000000000000000000000000000000 Wed Jun 29 00:00:00 2022 -From: Petr Viktorin -Subject: Enable building for Python 3.11 - -diff -rU3 pyside-setup-opensource-src-5.15.2-orig/build_scripts/config.py pyside-setup-opensource-src-5.15.2/build_scripts/config.py ---- pyside-setup-opensource-src-5.15.2-orig/build_scripts/config.py 2022-01-05 14:26:23.000000000 +0100 -+++ pyside-setup-opensource-src-5.15.2/build_scripts/config.py 2022-06-29 14:38:24.918102384 +0200 -@@ -94,6 +94,7 @@ - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', -+ 'Programming Language :: Python :: 3.11', - ] - - self.setup_script_dir = None diff --git a/srcpkgs/python3-pyside2/patches/python3.12.patch b/srcpkgs/python3-pyside2/patches/python3.12.patch deleted file mode 100644 index b98f4a38b961c1..00000000000000 --- a/srcpkgs/python3-pyside2/patches/python3.12.patch +++ /dev/null @@ -1,152 +0,0 @@ -This is a combination of three patches: - -1. In generate_pyi.py, avoid writing to immutable typing.TypeVar.__repr__. -2. Backport PySide6 fix https://codereview.qt-project.org/c/pyside/pyside-setup/+/506424 -3. Backport PySide6 fix https://codereview.qt-project.org/c/pyside/pyside-setup/+/506930 - -diff -ur python3-pyside2-5.15.5.orig/sources/pyside2/libpyside/pysideproperty.cpp python3-pyside2-5.15.5/sources/pyside2/libpyside/pysideproperty.cpp ---- python3-pyside2-5.15.5.orig/sources/pyside2/libpyside/pysideproperty.cpp 2023-09-27 21:52:01.389249419 -0400 -+++ python3-pyside2-5.15.5/sources/pyside2/libpyside/pysideproperty.cpp 2023-09-27 21:57:06.265042322 -0400 -@@ -46,6 +46,7 @@ - - #include - #include -+#include - - using namespace Shiboken; - -@@ -444,7 +445,13 @@ - static PyObject *getFromType(PyTypeObject *type, PyObject *name) - { - PyObject *attr = nullptr; -- attr = PyDict_GetItem(type->tp_dict, name); -+ -+ { -+ Shiboken::Type::TypeDict tpDict(type); -+ Q_ASSERT(tpDict); -+ attr = PyDict_GetItem(tpDict, name); -+ } -+ - if (!attr) { - PyObject *bases = type->tp_bases; - int size = PyTuple_GET_SIZE(bases); -diff -ur python3-pyside2-5.15.5.orig/sources/pyside2/libpyside/pysidesignal.cpp python3-pyside2-5.15.5/sources/pyside2/libpyside/pysidesignal.cpp ---- python3-pyside2-5.15.5.orig/sources/pyside2/libpyside/pysidesignal.cpp 2023-09-27 21:52:01.387249407 -0400 -+++ python3-pyside2-5.15.5/sources/pyside2/libpyside/pysidesignal.cpp 2023-09-27 21:58:42.799610013 -0400 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -670,7 +671,10 @@ - PyObject *value; - PyObject *key; - -- while (PyDict_Next(objType->tp_dict, &pos, &key, &value)) { -+ Shiboken::Type::TypeDict tpDict(objType); -+ Q_ASSERT(tpDict); -+ -+ while (PyDict_Next(tpDict, &pos, &key, &value)) { - if (PyObject_TypeCheck(value, PySideSignalTypeF())) { - Shiboken::AutoDecRef signalInstance(reinterpret_cast(PyObject_New(PySideSignalInstance, PySideSignalInstanceTypeF()))); - instanceInitialize(signalInstance.cast(), key, reinterpret_cast(value), source, 0); -diff -ur python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/basewrapper.cpp python3-pyside2-5.15.5/sources/shiboken2/libshiboken/basewrapper.cpp ---- python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/basewrapper.cpp 2023-09-27 21:52:01.414249566 -0400 -+++ python3-pyside2-5.15.5/sources/shiboken2/libshiboken/basewrapper.cpp 2023-09-27 21:55:00.575303169 -0400 -@@ -1969,3 +1969,23 @@ - } // namespace Object - - } // namespace Shiboken -+ -+namespace Shiboken::Type -+{ -+ -+TypeDict::TypeDict(PyTypeObject *t) noexcept : -+ m_pyObj(t->tp_dict) -+{ -+ if (m_pyObj == nullptr) { -+ m_pyObj = PyObject_GenericGetDict(reinterpret_cast(t), nullptr); -+ m_owned = true; -+ } -+} -+ -+TypeDict::~TypeDict() -+{ -+ if (m_owned) -+ Py_DECREF(m_pyObj); -+} -+ -+} // namespace Shiboken::Type -diff -ur python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/basewrapper.h python3-pyside2-5.15.5/sources/shiboken2/libshiboken/basewrapper.h ---- python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/basewrapper.h 2023-09-27 21:52:01.416249578 -0400 -+++ python3-pyside2-5.15.5/sources/shiboken2/libshiboken/basewrapper.h 2023-09-27 21:54:17.907052245 -0400 -@@ -486,4 +486,33 @@ - - } // namespace Shiboken - -+namespace Shiboken::Type -+{ -+ -+/// TypeDict holds the tp_dict of a type. As of Python 3.12, tp_dict is nullptr, -+/// so, PyObject_GenericGetDict() needs to be used and the reference managed. -+/// FIXME: Replace by AutoDecRef when Python 3.12 is the minimum supported. -+class LIBSHIBOKEN_API TypeDict -+{ -+public: -+ TypeDict(const TypeDict &) = delete; -+ TypeDict(TypeDict &&) = delete; -+ TypeDict &operator=(const TypeDict &) = delete; -+ TypeDict &operator=(TypeDict &&) = delete; -+ -+ explicit TypeDict(PyTypeObject *t) noexcept; -+ ~TypeDict(); -+ -+ inline PyObject *object() { return m_pyObj; } -+ inline operator PyObject *() { return m_pyObj; } -+ inline operator bool() const { return m_pyObj != nullptr; } -+ inline PyObject *operator->() { return m_pyObj; } -+ -+private: -+ PyObject *m_pyObj; -+ bool m_owned = false; -+}; -+ -+} // namespace Shiboken::Type -+ - #endif // BASEWRAPPER_H -diff -ur python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/signature/signature_helper.cpp python3-pyside2-5.15.5/sources/shiboken2/libshiboken/signature/signature_helper.cpp ---- python3-pyside2-5.15.5.orig/sources/shiboken2/libshiboken/signature/signature_helper.cpp 2023-09-27 21:52:01.417249584 -0400 -+++ python3-pyside2-5.15.5/sources/shiboken2/libshiboken/signature/signature_helper.cpp 2023-09-27 22:00:12.347136628 -0400 -@@ -50,6 +50,7 @@ - #include "sbkstring.h" - #include "sbkstaticstrings.h" - #include "sbkstaticstrings_p.h" -+#include "basewrapper.h" - - #include "signature_p.h" - -@@ -105,7 +106,8 @@ - */ - assert(PyType_Check(type)); - PyType_Ready(type); -- PyObject *dict = type->tp_dict; -+ Shiboken::Type::TypeDict dict(type); -+ assert(dict); - for (; gsp->name != nullptr; gsp++) { - PyObject *have_descr = PyDict_GetItemString(dict, gsp->name); - if (have_descr != nullptr) { ---- python3-pyside2-5.15.5.orig/sources/pyside2/PySide2/support/generate_pyi.py.orig 2023-09-27 22:20:58.761497093 -0400 -+++ python3-pyside2-5.15.5/sources/pyside2/PySide2/support/generate_pyi.py 2023-09-27 22:21:27.701667008 -0400 -@@ -113,9 +113,6 @@ - prefix = '~' - return prefix + self.__name__ - """ -- def _typevar__repr__(self): -- return "typing." + self.__name__ -- typing.TypeVar.__repr__ = _typevar__repr__ - - # Adding a pattern to substitute "Union[T, NoneType]" by "Optional[T]" - # I tried hard to replace typing.Optional by a simple override, but diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch deleted file mode 100644 index 90e34a4b531fa0..00000000000000 --- a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430 - ---- a/sources/pyside2/tests/CMakeLists.txt 2020-11-11 13:51:30.000000000 +0100 -+++ b/sources/pyside2/tests/CMakeLists.txt 2020-11-24 11:42:34.629110123 +0100 -@@ -7,8 +7,7 @@ - - # BUILD_DIR and QT_DIR are used by init_paths.py for setting - # the path to the testbinding module -- get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY) -- get_filename_component(BUILD_DIR "${CMAKE_BINARY_DIR}" DIRECTORY) -+ set(BUILD_DIR "${CMAKE_BINARY_DIR}") - set(QT_DIR "${_qt5Core_install_prefix}") - - macro(TEST_QT_MODULE var name) diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch deleted file mode 100644 index a364e739fa2144..00000000000000 --- a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch +++ /dev/null @@ -1,74 +0,0 @@ -Disable failing tests. Almost of these are related to OpenGL that is -unsupported by vnc virtual backend. - -Raw testing Status: 98% tests passed, 9 tests failed out of 471 - ---- a/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt -+++ b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt -@@ -1 +0,0 @@ --PYSIDE_TEST(datavisualization_test.py) ---- a/sources/pyside2/tests/QtGui/CMakeLists.txt -+++ b/sources/pyside2/tests/QtGui/CMakeLists.txt -@@ -20,14 +20,12 @@ - PYSIDE_TEST(qcolor_test.py) - PYSIDE_TEST(qcolor_reduce_test.py) - PYSIDE_TEST(qcursor_test.py) --PYSIDE_TEST(qdatastream_gui_operators_test.py) - PYSIDE_TEST(qdesktopservices_test.py) - PYSIDE_TEST(qfontmetrics_test.py) - PYSIDE_TEST(qguiapplication_test.py) - PYSIDE_TEST(qicon_test.py) - PYSIDE_TEST(qitemselection_test.py) - PYSIDE_TEST(qmatrix_test.py) --PYSIDE_TEST(qopenglbuffer_test.py) - PYSIDE_TEST(qpainter_test.py) - PYSIDE_TEST(qpdfwriter_test.py) - PYSIDE_TEST(qpixelformat_test.py) ---- a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt -+++ b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt -@@ -1,2 +1 @@ --PYSIDE_TEST(qglbuffer_test.py) - PYSIDE_TEST(qglwidget_test.py) ---- a/sources/pyside2/tests/QtScriptTools/CMakeLists.txt -+++ b/sources/pyside2/tests/QtScriptTools/CMakeLists.txt -@@ -1 +0,0 @@ --PYSIDE_TEST(debugger_test.py) ---- a/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt -+++ b/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt -@@ -26,4 +26,3 @@ - ## - ############################################################################# - --PYSIDE_TEST(web_engine_custom_scheme.py) ---- a/sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt -+++ b/sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt -@@ -26,4 +26,3 @@ - ## - ############################################################################# - --PYSIDE_TEST(pyside-474-qtwebengineview.py) ---- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt -+++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt -@@ -6,7 +6,6 @@ - PYSIDE_TEST(application_test.py) - PYSIDE_TEST(bug_172.py) - PYSIDE_TEST(bug_243.py) --PYSIDE_TEST(bug_307.py) - PYSIDE_TEST(bug_324.py) - PYSIDE_TEST(bug_338.py) - PYSIDE_TEST(bug_363.py) -@@ -131,7 +131,6 @@ - PYSIDE_TEST(qtoolbox_test.py) - PYSIDE_TEST(qvariant_test.py) - PYSIDE_TEST(qwidget_setlayout_test.py) --PYSIDE_TEST(qwidget_test.py) - PYSIDE_TEST(qcolormap_test.py) - PYSIDE_TEST(reference_count_test.py) - PYSIDE_TEST(signature_test.py) ---- a/sources/pyside2/tests/registry/CMakeLists.txt -+++ b/sources/pyside2/tests/registry/CMakeLists.txt -@@ -37,4 +37,3 @@ - ## - ############################################################################# - --PYSIDE_TEST(existence_test.py) diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch deleted file mode 100644 index c9115239740784..00000000000000 --- a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -tests need python modules that are not installed yet: point the built ones. -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430 - ---- a/sources/pyside2/tests/init_paths.py 2020-11-11 13:51:30.000000000 +0100 -+++ b/sources/pyside2/tests/init_paths.py 2020-11-21 23:36:33.131282473 +0100 -@@ -75,12 +75,12 @@ - - python_dirs = [os.path.join(src_dir, 'util')] # Helper module - -- pyside_build_dir = os.path.join(get_build_dir(), 'pyside2') -- python_dirs.append(pyside_build_dir) # for PySide2 -+ pyside_build_dir = os.path.join(get_build_dir(), 'PySide2') -+ python_dirs.append(get_build_dir()) # for PySide2 - lib_dirs = [os.path.join(pyside_build_dir, 'libpyside')] - - if testbindings_module: -- python_dirs.append(os.path.join(pyside_build_dir, -+ python_dirs.append(os.path.join(get_build_dir(), - 'tests', 'pysidetest')) - lib_dirs.append(_get_qt_lib_dir()) - diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template deleted file mode 100644 index 249efa90988425..00000000000000 --- a/srcpkgs/python3-pyside2/template +++ /dev/null @@ -1,101 +0,0 @@ -# Template file for 'python3-pyside2' -pkgname=python3-pyside2 -version=5.15.10 -revision=1 -_pkgname="pyside-setup-opensource-src-${version}" -build_wrksrc="sources/pyside2" -build_style=cmake -configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python" -hostmakedepends="python3-setuptools shiboken2" -makedepends="python3-devel libshiboken2-devel qt5-devel - qt5-multimedia-devel qt5-tools-devel qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-x11extras-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-websockets-devel - qt5-3d-devel qt5-gamepad-devel qt5-remoteobjects-devel qt5-quickcontrols2-devel - qt5-serialport-devel - $(vopt_if webengine 'qt5-webengine-devel')" -depends="python3-shiboken2" -checkdepends="python3-distro pulseaudio qt5-quickcontrols" -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=2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a - -build_options="webengine" -desc_option_webengine="Build Qt5 WebEngine bindings" - -subpackages="libpyside2-python3-devel libpyside2-python3" - -# needed by shiboken2 runtime -export CLANG_INSTALL_DIR=/usr - -if [ ${CROSS_BUILD} ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools qt5-remoteobjects qt5-scxml" -fi - -if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then - if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then - build_options_default="webengine" - fi -fi - -if [ "$build_option_webengine" ]; then - subpackages+=" python3-pyside2-webengine" -fi - -pre_build() { - if [ ${CROSS_BUILD} ]; then - - # make clang of shiboken aware of crossbuild - SHIBOKEN_CLANG_OPTIONS="--target=${XBPS_CROSS_TRIPLET}" - SHIBOKEN_CLANG_OPTIONS+=" --sysroot=/usr/${XBPS_CROSS_TRIPLET}" - - # qt5 is built with gcc, so shiboken's clang needs gcc corresponding headers - local gcc_ver="$(${XBPS_CROSS_TRIPLET}-gcc -dumpversion)" - local inc_root="/usr/${XBPS_CROSS_TRIPLET}/usr/include/c++/${gcc_ver}" - - SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}" - SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/${XBPS_CROSS_TRIPLET}" - # uneeded so far - SHIBOKEN_CLANG_OPTIONS+=" -isystem ${inc_root}/backward" - - export SHIBOKEN_CLANG_OPTIONS - fi -} - -pre_check() { - # no virtual backend is fine for OpenGL, vnc is fine for Qml tests - export QT_QPA_PLATFORM=vnc -} - -python3-pyside2-webengine_package() { - depends="python3-pyside2-${version}_${revision}" - short_desc+=" - WebEngine component" - pkg_install() { - vmove "${py3_sitelib}/PySide2/QtWebEngine*" - } -} - -libpyside2-python3-devel_package() { - depends="${sourcepkg}-${version}_${revision} - libpyside2-python3-${version}_${revision}" - short_desc+=" - shared library (development files)" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share - } -} - -libpyside2-python3_package() { - short_desc+=" - shared library" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} diff --git a/srcpkgs/python3-pyside2/update b/srcpkgs/python3-pyside2/update deleted file mode 100644 index 1c0e6e5fef6181..00000000000000 --- a/srcpkgs/python3-pyside2/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=pyside-setup-opensource-src -vdprefix=PySide2- -vdsuffix=-src diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3b3da1d0ee6785..e5bb78f18a14e4 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -420,6 +420,8 @@ replaces=" libproxy-python<=0.4.18_1 libpurple-hangouts<=20190606_1 libpyside-python3<=5.15.0_2 + libpyside2-python3-devel<=5.15.10_1 + libpyside2-python3<=5.15.10_1 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 libqzeitgeist<=0.8.0_6 @@ -711,6 +713,8 @@ replaces=" python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside-phonon<=5.15.0_2 + python3-pyside2-webengine<=5.15.10_1 + python3-pyside2<=5.15.10_1 python3-pyside<=5.15.0_2 python3-pyspotify<=2.1.3_5 python3-sabyenc3<=5.4.4_2 From 268f62d3521e61967d1ef6baac73fd0bfee4762d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 22:02:55 -0500 Subject: [PATCH 5/6] pyside2-tools: remove package no longer needed by any package --- .../patches/dont-install-symlinks.patch | 46 ------------------- .../patches/tests-use-qt5-rcc-and-uic.patch | 34 -------------- srcpkgs/pyside2-tools/template | 22 --------- srcpkgs/pyside2-tools/update | 3 -- srcpkgs/removed-packages/template | 1 + 5 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch delete mode 100644 srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch delete mode 100644 srcpkgs/pyside2-tools/template delete mode 100644 srcpkgs/pyside2-tools/update diff --git a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch deleted file mode 100644 index 9ba21ea664b9c8..00000000000000 --- a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch +++ /dev/null @@ -1,46 +0,0 @@ -don't install these symlinks, it's not pyside2-tools business: -* /usr/bin/designer -> /usr/bin/qtchooser -* /usr/bin/rcc -> /usr/bin/qtchooser -* /usr/bin/uic -> /usr/bin/qtchooser - ---- a/sources/pyside2-tools/CMakeLists.txt -+++ b/sources/pyside2-tools/CMakeLists.txt -@@ -55,38 +55,6 @@ - set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") - endif() - --install(FILES "${UIC_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- --install(FILES "${RCC_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- --if (EXISTS ${DESIGNER_PATH}) -- if (APPLE) -- install(DIRECTORY "${DESIGNER_PATH}" -- DESTINATION bin -- FILE_PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- else() -- install(FILES "${DESIGNER_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- endif() --endif() -- - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch deleted file mode 100644 index 0ec2442b65f8a3..00000000000000 --- a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/sources/pyside2-tools/tests/CMakeLists.txt -+++ b/sources/pyside2-tools/tests/CMakeLists.txt -@@ -1,4 +1,11 @@ -+ -+# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc, -+# with '-g python' option -+ -+FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic) -+FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc) -+ - add_subdirectory(rcc) --add_test(QWizard ${SHIBOKEN_PYTHON_INTERPRETER} ${CMAKE_SOURCE_DIR}/pyside2-uic "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui") -+add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui") - set_tests_properties(QWizard PROPERTIES - ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}") ---- a/sources/pyside2-tools/tests/rcc/CMakeLists.txt -+++ b/sources/pyside2-tools/tests/rcc/CMakeLists.txt -@@ -1,6 +1,6 @@ - macro(ADD_RCC_TEST name pyfile qrcfile) - add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh -- ${PYSIDERCC_EXECUTABLE} -+ ${PYSIDE2RCCBINARY} - ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile} - ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile} - ${CMAKE_CURRENT_SOURCE_DIR}) ---- a/sources/pyside2-tools/tests/rcc/run_test.sh -+++ b/sources/pyside2-tools/tests/rcc/run_test.sh -@@ -8,5 +8,5 @@ - # $3: qrc file - - export PYTHONPATH=$PYTHONPATH:`pwd` --$1 -o `basename $3 .qrc`_rc.py $3 -+$1 --generator=python -o `basename $3 .qrc`_rc.py $3 - `pkg-config shiboken2 --variable=python_interpreter` $2 diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template deleted file mode 100644 index 169dd144dc46c1..00000000000000 --- a/srcpkgs/pyside2-tools/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'pyside2-tools' -pkgname=pyside2-tools -version=5.15.5 -revision=1 -_pkgname="pyside-setup-opensource-src-${version}" -build_wrksrc="sources/pyside2-tools" -build_style=cmake -hostmakedepends="cmake python3-devel shiboken2" -makedepends="python3-devel libshiboken2-devel qt5-devel - libpyside2-python3-devel" -checkdepends="pkg-config" -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=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33 -python_version=3 - -if [ ${CROSS_BUILD} ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools" -fi diff --git a/srcpkgs/pyside2-tools/update b/srcpkgs/pyside2-tools/update deleted file mode 100644 index 1c0e6e5fef6181..00000000000000 --- a/srcpkgs/pyside2-tools/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=pyside-setup-opensource-src -vdprefix=PySide2- -vdsuffix=-src diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index e5bb78f18a14e4..ee474a8d109b7a 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -577,6 +577,7 @@ replaces=" pygtk<=2.24.0_14 pygtksourceview<=2.10.1_5 pyside-tools<=0.2.15_2 + pyside2-tools<=5.15.5_1 pystopwatch<=2019_2 python-Babel<=2.8.0_4 python-Cython<=0.29.36_1 From f76a5df38f79e9f9d0815cda69aa30eabf602716 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 20 Nov 2024 22:05:12 -0500 Subject: [PATCH 6/6] shiboken2: remove package no longer needed by any package --- common/shlibs | 1 - srcpkgs/libshiboken2 | 1 - srcpkgs/libshiboken2-devel | 1 - srcpkgs/python3-shiboken2 | 1 - srcpkgs/removed-packages/template | 4 ++ ...ng-options-via-environment-variables.patch | 21 -------- .../patches/fix-for-numpy-1.23.0.patch | 18 ------- .../patches/no-python-arch-suffix.patch | 38 -------------- srcpkgs/shiboken2/patches/python3.11.patch | 1 - srcpkgs/shiboken2/patches/python3.12.patch | 1 - .../patches/tests-need-python-modules.patch | 13 ----- srcpkgs/shiboken2/template | 51 ------------------- srcpkgs/shiboken2/update | 3 -- 13 files changed, 4 insertions(+), 150 deletions(-) delete mode 120000 srcpkgs/libshiboken2 delete mode 120000 srcpkgs/libshiboken2-devel delete mode 120000 srcpkgs/python3-shiboken2 delete mode 100644 srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch delete mode 100644 srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch delete mode 100644 srcpkgs/shiboken2/patches/no-python-arch-suffix.patch delete mode 120000 srcpkgs/shiboken2/patches/python3.11.patch delete mode 120000 srcpkgs/shiboken2/patches/python3.12.patch delete mode 100644 srcpkgs/shiboken2/patches/tests-need-python-modules.patch delete mode 100644 srcpkgs/shiboken2/template delete mode 100644 srcpkgs/shiboken2/update diff --git a/common/shlibs b/common/shlibs index 08ba9fbea27964..dca19fc737eb37 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1657,7 +1657,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libXaw3d.so.8 libXaw3d-1.6.2_1 -libshiboken2.so.5.15 libshiboken2-5.15.0_1 libupsclient.so.6 libnetwork-ups-tools-2.8.0_1 libnutclient.so.2 libnetwork-ups-tools-2.8.0_1 libnutscan.so.2 libnetwork-ups-tools-2.8.0_1 diff --git a/srcpkgs/libshiboken2 b/srcpkgs/libshiboken2 deleted file mode 120000 index b1fbca61c217c0..00000000000000 --- a/srcpkgs/libshiboken2 +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/libshiboken2-devel b/srcpkgs/libshiboken2-devel deleted file mode 120000 index b1fbca61c217c0..00000000000000 --- a/srcpkgs/libshiboken2-devel +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/python3-shiboken2 b/srcpkgs/python3-shiboken2 deleted file mode 120000 index b1fbca61c217c0..00000000000000 --- a/srcpkgs/python3-shiboken2 +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index ee474a8d109b7a..69d50979b93b39 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -428,6 +428,8 @@ replaces=" librpcsecgss-devel<=0.19_6 librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 + libshiboken2-devel<=5.15.10_2 + libshiboken2<=5.15.10_2 libspa-ffmpeg<=0.3.32_1 libspotify-devel<=12.1.51_2 libspotify<=12.1.51_2 @@ -720,6 +722,7 @@ replaces=" python3-pyspotify<=2.1.3_5 python3-sabyenc3<=5.4.4_2 python3-scikit-video<=1.1.11_6 + python3-shiboken2<=5.15.10_2 python3-shiboken<=5.15.0_3 python3-snakeoil-devel<=0.8.8_4 python3-sqlalchemy-migrate<=0.12.0_6 @@ -765,6 +768,7 @@ replaces=" seahorse-sharing<=3.8.0_4 searchfile<=0.0.0.20180623_2 seriespl<=2.3.5_2 + shiboken2<=5.15.10_2 simple-obfs<=0.0.5_2 sitecopy<=0.16.6_11 sk1<=2.0rc5_1 diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch deleted file mode 100644 index af4d03e5621896..00000000000000 --- a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add ability to pass additional options to clang via environnement variable. -With help from https://github.com/void-linux/void-packages/pull/26962 - ---- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -@@ -305,6 +305,15 @@ - QByteArrayList emulatedCompilerOptions() - { - QByteArrayList result; -+ -+ QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS"); -+ // split to avoid double quoting drived by space inside it -+ if (!shiboken_clang_options.isEmpty()) { -+ for (const QByteArray &item: shiboken_clang_options.split(' ')) { -+ result.append(item); -+ } -+ } -+ - #if defined(Q_CC_MSVC) - HeaderPaths headerPaths; - result.append(QByteArrayLiteral("-fms-compatibility-version=19")); diff --git a/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch b/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch deleted file mode 100644 index 708cebe3f9fc37..00000000000000 --- a/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -rework of commit 1422cf4a7f277fb13fd209f24a90d6c02641497d (shiboken6) - ---- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -+++ b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -@@ -116,8 +116,13 @@ - str << " NPY_ARRAY_NOTSWAPPED"; - if ((flags & NPY_ARRAY_WRITEABLE) != 0) - str << " NPY_ARRAY_WRITEABLE"; -+#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION -+ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) -+ str << " NPY_ARRAY_WRITEBACKIFCOPY"; -+#else - if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) - str << " NPY_ARRAY_UPDATEIFCOPY"; -+#endif - } else { - str << '0'; - } diff --git a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch deleted file mode 100644 index 31e9c55db6f2b4..00000000000000 --- a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Consistent file naming across architectures for so libs and cmake files: -remove python 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) - ---- a/sources/shiboken2/CMakeLists.txt -+++ b/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}") ---- a/sources/shiboken2/data/CMakeLists.txt -+++ b/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/patches/python3.11.patch b/srcpkgs/shiboken2/patches/python3.11.patch deleted file mode 120000 index 6861da6ece5082..00000000000000 --- a/srcpkgs/shiboken2/patches/python3.11.patch +++ /dev/null @@ -1 +0,0 @@ -../../python3-pyside2/patches/python3.11.patch \ No newline at end of file diff --git a/srcpkgs/shiboken2/patches/python3.12.patch b/srcpkgs/shiboken2/patches/python3.12.patch deleted file mode 120000 index 2ffbfeb449afc9..00000000000000 --- a/srcpkgs/shiboken2/patches/python3.12.patch +++ /dev/null @@ -1 +0,0 @@ -../../python3-pyside2/patches/python3.12.patch \ No newline at end of file diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch deleted file mode 100644 index 9a434c1d9af901..00000000000000 --- a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch +++ /dev/null @@ -1,13 +0,0 @@ -tests need python modules that are not installed yet: so point the built ones. -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429 - ---- a/sources/shiboken2/tests/CMakeLists.txt 2020-09-09 14:45:42.000000000 +0200 -+++ b/sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100 -@@ -53,6 +53,6 @@ - list(FIND test_blacklist ${test_name} expect_fail) - add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) -- set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}") -+ set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}") - set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT}) - if (${expect_fail} GREATER -1) - set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE) diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template deleted file mode 100644 index d0a38c63d9eefa..00000000000000 --- a/srcpkgs/shiboken2/template +++ /dev/null @@ -1,51 +0,0 @@ -# Template file for 'shiboken2' -pkgname=shiboken2 -version=5.15.10 -revision=2 -_pkgname="pyside-setup-opensource-src-${version}" -build_wrksrc="sources/shiboken2" -build_style=cmake -hostmakedepends="python3-devel python3-setuptools" -makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang17-devel libxml2-devel - libxslt-devel python3-numpy" -depends="clang" -short_desc="Python binding generator of Qt5 C++ API" -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=2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a - -python_version=3 -export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr - -if [ ${CROSS_BUILD} ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools shiboken2" -fi - -libshiboken2-devel_package() { - depends="${sourcepkg}-${version}_${revision} - libshiboken2-${version}_${revision} python3-shiboken2-${version}_${revision}" - short_desc+=" - common development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} - -libshiboken2_package() { - short_desc="Python3 shiboken2 bindings - shared library" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} - -python3-shiboken2_package() { - short_desc="Python3 shiboken2 bindings" - depends="python3" - pkg_install() { - vmove ${py3_sitelib} - } -} diff --git a/srcpkgs/shiboken2/update b/srcpkgs/shiboken2/update deleted file mode 100644 index 1c0e6e5fef6181..00000000000000 --- a/srcpkgs/shiboken2/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=pyside-setup-opensource-src -vdprefix=PySide2- -vdsuffix=-src