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 11FF3158091 for ; Tue, 14 Jun 2022 12:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 624F3E08CA; Tue, 14 Jun 2022 12:45:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3CC2DE08C3 for ; Tue, 14 Jun 2022 12:45:03 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BC51341CFA for ; Tue, 14 Jun 2022 12:45:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28382520 for ; Tue, 14 Jun 2022 12:44:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1655210594.6884e1a48df42983f9a2302987c3b61985c744a2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch kde-frameworks/plasma/plasma-5.95.0-r3.ebuild X-VCS-Directories: kde-frameworks/plasma/ kde-frameworks/plasma/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6884e1a48df42983f9a2302987c3b61985c744a2 X-VCS-Branch: master Date: Tue, 14 Jun 2022 12:44:59 +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: 93ed28fd-9fdc-44a8-89b6-cc5bbae12e98 X-Archives-Hash: bddc5231165bca1acc37ff6338be3300 commit: 6884e1a48df42983f9a2302987c3b61985c744a2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 12:12:23 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 12:43:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6884e1a4 kde-frameworks/plasma: Fix thumbnail breakage on X11 Upstream commit dff1b034c1162062aa2292099d3d01fc53dafdf6 See also: https://mail.kde.org/pipermail/distributions/2022-June/001231.html Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-5.95.0-revert-QT_FEATURE_foo.patch | 42 ++++++++++++ kde-frameworks/plasma/plasma-5.95.0-r3.ebuild | 75 ++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch new file mode 100644 index 000000000000..300612763336 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.95.0-revert-QT_FEATURE_foo.patch @@ -0,0 +1,42 @@ +From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +Date: Tue, 14 Jun 2022 14:05:32 +0200 +Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and + TARGET for glesv2" + +This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9. +--- + CMakeLists.txt | 3 ++- + src/declarativeimports/core/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6698a2091..63229cdfb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES + TYPE OPTIONAL + ) + +-if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl) ++get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES) ++if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl")) + add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.") + set(HAVE_GLX 1) + else() +diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt +index d08b4c619..2136bb985 100644 +--- a/src/declarativeimports/core/CMakeLists.txt ++++ b/src/declarativeimports/core/CMakeLists.txt +@@ -70,7 +70,7 @@ else() + + endif() + +-if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2) ++if(QtGui_Enabled_Features MATCHES "opengles2") + target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2) + endif() + +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild new file mode 100644 index 000000000000..056fcf5e2152 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.95.0-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="${PN}-framework" +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="gles2-only man wayland X" + +RESTRICT="test" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + =kde-frameworks/kactivities-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5[qml] + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kdeclarative-${PVCUT}*:5 + =kde-frameworks/kglobalaccel-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kirigami-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kpackage-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + !gles2-only? ( media-libs/libglvnd[X?] ) + wayland? ( + =kde-frameworks/kwayland-${PVCUT}*:5 + media-libs/libglvnd + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + x11-libs/libxcb + ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" + +PATCHES=( "${FILESDIR}/${P}-revert-QT_FEATURE_foo.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + $(cmake_use_find_package man KF5DocTools) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland KF5Wayland) + $(cmake_use_find_package X X11) + $(cmake_use_find_package X XCB) + ) + + ecm_src_configure +}