public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/files/, dev-python/pyside6/
@ 2022-08-12 15:13 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-08-12 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     eaeb5983c0f46aa7298957eb8e34f44345045e2f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 15:10:02 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 15:13:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaeb5983

dev-python/pyside6: new package, add 6.3.1

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/pyside6/Manifest                        |   1 +
 .../pyside6/files/pyside6-6.3.1-no-strip.patch     |  26 +++
 dev-python/pyside6/metadata.xml                    |  34 ++++
 dev-python/pyside6/pyside6-6.3.1.ebuild            | 205 +++++++++++++++++++++
 4 files changed, 266 insertions(+)

diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
new file mode 100644
index 000000000000..92c9648ed03b
--- /dev/null
+++ b/dev-python/pyside6/Manifest
@@ -0,0 +1 @@
+DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321

diff --git a/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch b/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch
new file mode 100644
index 000000000000..9f3a8c396f05
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch
@@ -0,0 +1,26 @@
+diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt
+index 0b2f7a0..31e41e8 100644
+--- a/libpyside/CMakeLists.txt
++++ b/libpyside/CMakeLists.txt
+@@ -123,8 +123,6 @@ endif()
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII")
+ 
+-qfp_strip_library("pyside6")
+-
+ # create pkg-config file
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside6.pc.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/pyside6${pyside6_SUFFIX}.pc" @ONLY)
+diff --git a/libpysideqml/CMakeLists.txt b/libpysideqml/CMakeLists.txt
+index 42238c8..33bfce1 100644
+--- a/libpysideqml/CMakeLists.txt
++++ b/libpysideqml/CMakeLists.txt
+@@ -57,8 +57,6 @@ endif()
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII")
+ 
+-qfp_strip_library("pyside6qml")
+-
+ # Install-tree / relocatable package config file.
+ configure_package_config_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig-spec.cmake.in"

diff --git a/dev-python/pyside6/metadata.xml b/dev-python/pyside6/metadata.xml
new file mode 100644
index 000000000000..aef544ecb967
--- /dev/null
+++ b/dev-python/pyside6/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<use>
+		<flag name="concurrent">Build QtConcurrent module</flag>
+		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
+		<flag name="gles2-only">Build QtGui "QOpenGL*" classes</flag>
+		<flag name="gui">Build QtGui module</flag>
+		<flag name="help">Build QtHelp module</flag>
+		<flag name="multimedia">Build QtMultimedia and QtMultimediaWidgets modules</flag>
+		<flag name="network">Build QtNetwork module</flag>
+		<flag name="positioning">Build QtPositioning module</flag>
+		<flag name="printsupport">Build QtPrintSupport module</flag>
+		<flag name="qml">Build QtQml module</flag>
+		<flag name="quick">Build QtQuick and QtQuickWidgets modules</flag>
+		<flag name="quick3d">Build QtQuick3D and QtQuickWidgets modules</flag>
+		<flag name="serialport">Build QtSerialPort modules</flag>
+		<flag name="sql">Build QtSql module</flag>
+		<flag name="svg">Build QtSvg module</flag>
+		<flag name="testlib">Build QtTest module</flag>
+		<flag name="webchannel">Build QtWebChannel module</flag>
+		<flag name="webengine">Build QtWebEngine and QtWebEngineWidgets modules</flag>
+		<flag name="websockets">Build QtWebSockets module</flag>
+		<flag name="widgets">Build QtWidgets module</flag>
+		<flag name="xml">Build QtXml module</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">PySide6</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-python/pyside6/pyside6-6.3.1.ebuild b/dev-python/pyside6/pyside6-6.3.1.ebuild
new file mode 100644
index 000000000000..09cbf24f7b1e
--- /dev/null
+++ b/dev-python/pyside6/pyside6-6.3.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-r1 virtualx
+
+# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
+# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
+# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
+# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
+# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
+# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
+# that the "PySide6/QtGui/CMakeLists.txt" and
+# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
+# testing whether the "Qt5::Gui" list property defined by
+# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
+# time contains the substring "opengles2". Since cmake does not permit
+# properties to be overridden from the command line, these files must instead
+# be conditionally patched to avoid these tests. An issue should be filed with
+# upstream requesting a CLI-settable variable to control this.
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/pyside6"
+
+# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
+# Shall we allow essential modules to be disabled? They are:
+# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
+# x11extras (for X)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	dbus +concurrent designer gles2-only +gui help multimedia
+	+network opengl positioning printsupport qml quick quick3d
+	serialport +sql svg test +testlib webchannel webengine
+	websockets +widgets +xml
+"
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	designer? ( widgets )
+	gles2-only? ( gui )
+	help? ( widgets )
+	multimedia? ( gui network )
+	opengl? ( gui )
+	printsupport? ( widgets )
+	qml? ( network )
+	quick? ( gui network opengl qml )
+	quick3d? ( gui network opengl qml quick )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( widgets )
+	webengine? ( network gui printsupport webchannel )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2):6"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] )
+	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
+	printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-strip.patch"
+)
+
+src_configure() {
+	# See collect_module_if_found macros in PySideHelpers.cmake
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+	)
+
+	pyside6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
+		)
+		cmake_src_configure
+	}
+	python_foreach_impl pyside6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE
+	python_foreach_impl virtx cmake_src_test
+}
+
+src_install() {
+	pyside6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
+		# file for the current Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+
+		# Uniquify the PySide6 pkgconfig file for the current Python target,
+		# preserving an unversioned "pyside6.pc" file arbitrarily associated
+		# with the last Python target. (See the previously linked issue.)
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl pyside6_install
+
+	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., pyside6-tools) to target one
+	# "libpyside6-*.so" library linked to one Python interpreter. See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/files/, dev-python/pyside6/
@ 2022-08-23 11:50 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-08-23 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     3434de255e4fa1b40b62abe9774e8696bb47a661
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Aug 22 05:23:41 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 11:50:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3434de25

dev-python/pyside6: install designer plugin to proper destination

Closes: https://bugs.gentoo.org/865363
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26957
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...ide6-6.3.1-fix-designer-plugin-install-location.patch | 16 ++++++++++++++++
 .../{pyside6-6.3.1.ebuild => pyside6-6.3.1-r1.ebuild}    |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch b/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch
new file mode 100644
index 000000000000..b7d1c2b31553
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/865363
+
+From 109d7bbec01870f8e944a9cde09d3e2f70e13e0d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 22 Aug 2022 07:10:35 +0200
+Subject: [PATCH] fix designer plugin install location
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/plugins/designer/CMakeLists.txt
++++ b/plugins/designer/CMakeLists.txt
+@@ -53,4 +53,4 @@ target_link_libraries(PySidePlugin PRIVATE
+                       Qt::Widgets
+                       ${SHIBOKEN_PYTHON_LIBRARIES})
+ 
+-install(TARGETS PySidePlugin LIBRARY DESTINATION "plugins/designer")
++install(TARGETS PySidePlugin LIBRARY DESTINATION "lib${LIB_SUFFIX}/qt6/plugins/designer")

diff --git a/dev-python/pyside6/pyside6-6.3.1.ebuild b/dev-python/pyside6/pyside6-6.3.1-r1.ebuild
similarity index 98%
rename from dev-python/pyside6/pyside6-6.3.1.ebuild
rename to dev-python/pyside6/pyside6-6.3.1-r1.ebuild
index 09cbf24f7b1e..a94b8db45b4b 100644
--- a/dev-python/pyside6/pyside6-6.3.1.ebuild
+++ b/dev-python/pyside6/pyside6-6.3.1-r1.ebuild
@@ -98,6 +98,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-strip.patch"
+	"${FILESDIR}/${P}-fix-designer-plugin-install-location.patch"
 )
 
 src_configure() {
@@ -153,6 +154,10 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
 		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+		# try to avoid pre-stripping
+		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
+		-DQFP_NO_STRIP=yes
+
 	)
 
 	pyside6_configure() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/files/, dev-python/pyside6/
@ 2023-10-18  8:54 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-10-18  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     5236ba6b346d7a9966c478eecf8725d533d813b6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 08:54:12 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 08:54:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5236ba6b

dev-python/pyside6: add 6.6.0

Bug: https://bugs.gentoo.org/915587
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/pyside6/Manifest                        |   1 +
 .../pyside6-6.6.0-fix-qtasyncio-install-dir.patch  |  10 +
 .../files/pyside6-6.6.0-no-qtexampleicons.patch    |  10 +
 dev-python/pyside6/pyside6-6.6.0.ebuild            | 232 +++++++++++++++++++++
 4 files changed, 253 insertions(+)

diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index 4c50c086ea14..eef970f04a73 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,2 +1,3 @@
 DIST pyside-setup-everywhere-src-6.5.2.tar.xz 13576204 BLAKE2B 3e1d62e6d877140137896552184c8fe56fd62056a1ea506ab474256ee0e2f16d3e10ddb84965602650bb466f3563555c3c344698b6877a45f9130d1e919aba21 SHA512 ca677645579fc6b82285dd6c294909ca5e91a8c8efbc53bd103aff64e3ef89eff67820bfc9100cf50f043015d41c49d4ff86b3008f02505941a09bd54621f403
 DIST pyside-setup-everywhere-src-6.5.3.tar.xz 13577208 BLAKE2B 7a26302d17163e3fd7478571d99116d7eec01ee3ce369c58870fed565258419f8c6cdf88b4cd2b9b48a21ab1e40d5b85ed912e3cd2210cf22707da88c42ad277 SHA512 3fbcc0bb340d5b02616df061d1c1bf08494db5d35297db47ebb2f965efd347bf8412236bb43952b65b787d08d29adf5998cd92c3ff359f728a9006e07a278519
+DIST pyside-setup-everywhere-src-6.6.0.tar.xz 14054860 BLAKE2B 3d01707796c8711de6c5bfc39bb677ee1f5c24014f8f61d9cccb5ec58982e9765e69b0a623e93276f1336975cf18a228d8397f6c8fce051875962e25ba64ac2f SHA512 58463e9b08ee6264d05293d25aa6e41b091016489abf513fc8303e5cccde26af1a24bf9520a94fad4fdc679bf367eb8c6b3d84a21c6c175dd1382cd1ca32b8ae

diff --git a/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch b/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch
new file mode 100644
index 000000000000..066d2d7af774
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch
@@ -0,0 +1,10 @@
+diff --git a/PySide6/CMakeLists.txt b/PySide6/CMakeLists.txt
+index e24fdb682..37b7a6c9c 100644
+--- a/PySide6/CMakeLists.txt
++++ b/PySide6/CMakeLists.txt
+@@ -111,4 +111,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h
+         DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
+ 
+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio"
+-        DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
++        DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}")

diff --git a/dev-python/pyside6/files/pyside6-6.6.0-no-qtexampleicons.patch b/dev-python/pyside6/files/pyside6-6.6.0-no-qtexampleicons.patch
new file mode 100644
index 000000000000..f775310504f4
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.6.0-no-qtexampleicons.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e4c701..6792258 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,5 +41,3 @@ if(BUILD_TESTS)
+ endif()
+ 
+ add_subdirectory(doc)
+-
+-add_subdirectory(qtexampleicons)

diff --git a/dev-python/pyside6/pyside6-6.6.0.ebuild b/dev-python/pyside6/pyside6-6.6.0.ebuild
new file mode 100644
index 000000000000..4d68e8765056
--- /dev/null
+++ b/dev-python/pyside6/pyside6-6.6.0.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-r1 virtualx
+
+# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
+# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
+# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
+# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
+# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
+# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
+# that the "PySide6/QtGui/CMakeLists.txt" and
+# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
+# testing whether the "Qt5::Gui" list property defined by
+# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
+# time contains the substring "opengles2". Since cmake does not permit
+# properties to be overridden from the command line, these files must instead
+# be conditionally patched to avoid these tests. An issue should be filed with
+# upstream requesting a CLI-settable variable to control this.
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-2)/sources/pyside6"
+
+# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
+# Shall we allow essential modules to be disabled? They are:
+# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
+# x11extras (for X)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	+dbus charts +concurrent designer gles2-only +gui help multimedia
+	+network network-auth +opengl positioning +printsupport qml quick
+	quick3d serialport +sql svg test +testlib webchannel webengine
+	websockets +widgets +xml
+"
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	charts? ( gui widgets )
+	designer? ( widgets )
+	gles2-only? ( gui )
+	gui? ( dbus opengl )
+	help? ( network sql widgets )
+	multimedia? ( gui network )
+	network-auth? ( network )
+	opengl? ( gui )
+	printsupport? ( widgets )
+	qml? ( network )
+	quick? ( gui network opengl qml )
+	quick3d? ( gui network opengl qml quick )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( widgets )
+	webchannel? ( qml )
+	webengine? ( network gui printsupport quick webchannel )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-3)*:6"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+	charts? ( =dev-qt/qtcharts-${QT_PV} )
+	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
+	gui? (
+		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
+		x11-libs/libxkbcommon
+	)
+	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( =dev-qt/qtserialport-${QT_PV} )
+	svg? ( =dev-qt/qtsvg-${QT_PV} )
+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( || (
+		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
+		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
+		)
+	)
+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
+	"${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch"
+	# References files not present in our dev-qt/qtbase
+	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch"
+	# Borrowed from Arch
+	# https://gitlab.archlinux.org/archlinux/packaging/packages/pyside6/-/blob/38e02ae70a1ae4c71e25ca483fcc7225da2acdee/fix-install-dir.patch
+	"${FILESDIR}/${PN}-6.6.0-fix-qtasyncio-install-dir.patch"
+)
+
+src_configure() {
+	# See collect_module_if_found macros in PySideHelpers.cmake
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+		# try to avoid pre-stripping
+		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
+		-DQFP_NO_STRIP=yes
+
+	)
+
+	pyside6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
+		)
+		cmake_src_configure
+	}
+	python_foreach_impl pyside6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE
+	python_foreach_impl virtx cmake_src_test
+}
+
+src_install() {
+	pyside6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
+		# file for the current Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+
+		# Uniquify the PySide6 pkgconfig file for the current Python target,
+		# preserving an unversioned "pyside6.pc" file arbitrarily associated
+		# with the last Python target. (See the previously linked issue.)
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl pyside6_install
+
+	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., pyside6-tools) to target one
+	# "libpyside6-*.so" library linked to one Python interpreter. See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-10-18  8:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-12 15:13 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/files/, dev-python/pyside6/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-08-23 11:50 Andrew Ammerlaan
2023-10-18  8:54 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox