From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0135A158094 for ; Tue, 23 Aug 2022 11:50:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CEEDE07EF; Tue, 23 Aug 2022 11:50:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17EFFE07EF for ; Tue, 23 Aug 2022 11:50:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0BE8340AF0 for ; Tue, 23 Aug 2022 11:50:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA18A57A for ; Tue, 23 Aug 2022 11:50:41 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1661255424.3434de255e4fa1b40b62abe9774e8696bb47a661.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/files/, dev-python/pyside6/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch dev-python/pyside6/pyside6-6.3.1-r1.ebuild dev-python/pyside6/pyside6-6.3.1.ebuild X-VCS-Directories: dev-python/pyside6/files/ dev-python/pyside6/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 3434de255e4fa1b40b62abe9774e8696bb47a661 X-VCS-Branch: master Date: Tue, 23 Aug 2022 11:50:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fcea758-8931-445c-905e-001321012591 X-Archives-Hash: 183153227298084b680281491c7b7022 commit: 3434de255e4fa1b40b62abe9774e8696bb47a661 Author: Bernd Waibel posteo net> AuthorDate: Mon Aug 22 05:23:41 2022 +0000 Commit: Andrew Ammerlaan gentoo 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 posteo.net> Closes: https://github.com/gentoo/gentoo/pull/26957 Signed-off-by: Andrew Ammerlaan 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 +Date: Mon, 22 Aug 2022 07:10:35 +0200 +Subject: [PATCH] fix designer plugin install location + +Signed-off-by: Bernd Waibel +--- 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() {