From bba7ed73af4fe3b333cb970dc40a9098e2d1c54b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Oct 2022 13:34:01 +0100 Subject: gentoo auto-resync : 10:10:2022 - 13:34:00 --- kde-frameworks/plasma/Manifest | 5 +- .../plasma/files/plasma-5.98.0-without_x11.patch | 140 --------------------- kde-frameworks/plasma/plasma-5.98.0-r1.ebuild | 74 ----------- kde-frameworks/plasma/plasma-5.99.0.ebuild | 72 +++++++++++ 4 files changed, 74 insertions(+), 217 deletions(-) delete mode 100644 kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch delete mode 100644 kde-frameworks/plasma/plasma-5.98.0-r1.ebuild create mode 100644 kde-frameworks/plasma/plasma-5.99.0.ebuild (limited to 'kde-frameworks/plasma') diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index 2b9c8e8b5588..a9407d85b197 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,7 +1,6 @@ AUX plasma-5.96.0-fix-crash-in-WindowShadowTile.patch 1634 BLAKE2B 80da6c10e57948875d18ee3699e092e47cef3a75e55b643438bf3d1b5d5c368ac1425aae1b49c55ec20a0f4986c228a31f22e390ffea39a9b34d4d459dd70c48 SHA512 7af67805cf73c01132a162c03dc50398b5cb4b3d5b1b1001b31c2b1ec8fa749c8e883b8185734e47d8434350426b6990315fc74bec8880c8bdc36ad8b1d5aee2 -AUX plasma-5.98.0-without_x11.patch 5737 BLAKE2B 5efea0b167ae98dddbfec87a2d8807763a432df648111e3b70ca700b9d954632494f23e0badc006add7751fbcd9709224bbe6e70b6a7ba068eb624188f2b0920 SHA512 2b947f89be87f67e2715035595d90b89618ed4c0d0b9e809cbf04f247a874d017f41468316e90f57bd4d6635ac81782f803dec71bbc46d723b6ee24737ccf0f3 DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b -DIST plasma-framework-5.98.0.tar.xz 3148664 BLAKE2B e61b896ed80a6f8b70846b19e2b9d525490ebbe4abb95d35f5663e93afbbc3ec23453e2228b20346c5961f6d6313c38f738150eca98f71d399670af3e07e0a88 SHA512 a016b5376ed620d4650c7581b282601c99aea2e6b7948d87f7a99bb747a3913ae2cc96a168deb7d25797fb9f936f4c76d05682036693a8515e756b7f20dab46d +DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb EBUILD plasma-5.96.0-r1.ebuild 2048 BLAKE2B 35b073663cb0ccf83d4bf94bbf5acaf2f801930dadcd0ab8171d7ecb98a1a950dbe374d228aa2fc9cf1748eda21df8b8438551e19b843be180c9c928e2a0ce36 SHA512 6bf299ca2dcb9419a546a2a58dd611f11be697dc0e6a2cbaf9201ac3243d488f74eddf1751b968d66fc8779bb48f6b72d1f0130072b0bd4f7a5f21f419f56abe -EBUILD plasma-5.98.0-r1.ebuild 1979 BLAKE2B e60e1b54d1285647b979ae8a1fdd7fc3269a83793b1c3fa46a743bb5f87d42aaf1fe97a8948268d7635203cc35453cd3bf0c575eb2b4d01ec83d0db7ce185438 SHA512 c4ee9a0ae20c3743b1ade363948b0eeb33a8b4ca72980a7fe0c850894dcbab6192ca486d5197bb79cc3500eea9712f8976ffa6be0126a3c109b3ffbd9532e43b +EBUILD plasma-5.99.0.ebuild 1929 BLAKE2B 3c196da48b5361359df601ce88846a2f566b2a72c030747d1ba7878d8fe4832343161bbd038aace80b5f9e43ab2a22b77d5470c7419433ce14557427b68a66be SHA512 9bd131a8cd874c9a9d444c6a2db43d67e52987f64146df90ed90e37f8a585c26ec651655f0fab57bdc17eb5463e41705722fdc8cb4452c531434c4e499e951c6 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch b/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch deleted file mode 100644 index 62b393ba9b91..000000000000 --- a/kde-frameworks/plasma/files/plasma-5.98.0-without_x11.patch +++ /dev/null @@ -1,140 +0,0 @@ -From d674a99d19efcad866a773fe6c848a7626a61c0a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 2 Aug 2022 10:52:59 +0200 -Subject: [PATCH] Add CMake option to build WITHOUT_X11 - -We want to be able to build without X11 support even if some of the used -libraries may not work w/o X11 themselves yet or need to be built with -X11 support for other reverse dependencies. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. - -Introducing this option means there is no behavior change by default, -cmake will just skip finding X11 or adding unwanted features if the -option is enabled. - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 51 ++++++++++--------- - .../core/config-x11.h.cmake | 1 + - src/plasmaquick/CMakeLists.txt | 8 +-- - src/plasmaquick/dialog.cpp | 1 + - 4 files changed, 31 insertions(+), 30 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b6405725..15698543f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -88,28 +88,33 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate doc - TYPE OPTIONAL - ) - --#optional features --find_package(X11 MODULE) --set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -- URL "https://www.x.org/" -- TYPE OPTIONAL -- ) --find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) --set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -- URL "https://xcb.freedesktop.org/" -- TYPE OPTIONAL -- ) --if(X11_FOUND AND XCB_XCB_FOUND) -- set(HAVE_X11 1) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -- elseif (QT_MAJOR_VERSION STREQUAL "6") -- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -- endif() -- #X11_Xrender discovery is done by FindX11 -- #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") --else() -- set(HAVE_X11 0) -+option(WITHOUT_X11 "Build without X11 support (skips finding X11)." OFF) -+if(NOT WITHOUT_X11) -+ #optional features -+ find_package(X11 MODULE) -+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+ URL "https://www.x.org/" -+ TYPE OPTIONAL -+ ) -+ find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) -+ set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" -+ URL "https://xcb.freedesktop.org/" -+ TYPE OPTIONAL -+ ) -+ if(X11_FOUND AND XCB_XCB_FOUND) -+ set(HAVE_X11 1) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -+ elseif (QT_MAJOR_VERSION STREQUAL "6") -+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -+ endif() -+ #X11_Xrender discovery is done by FindX11 -+ #add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED") -+ set(HAVE_XCB_SHAPE ${XCB_SHAPE_FOUND}) -+ else() -+ set(HAVE_X11 0) -+ set(HAVE_XCB_SHAPE 0) -+ endif() - endif() - - find_package(OpenGL) -@@ -125,7 +130,7 @@ set_package_properties(EGL PROPERTIES - ) - - 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")) -+if(OpenGL_GLX_FOUND AND HAVE_X11 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/config-x11.h.cmake b/src/declarativeimports/core/config-x11.h.cmake -index 2f543d547..ad1b45099 100644 ---- a/src/declarativeimports/core/config-x11.h.cmake -+++ b/src/declarativeimports/core/config-x11.h.cmake -@@ -1,2 +1,3 @@ - #cmakedefine01 HAVE_X11 - #cmakedefine01 HAVE_XCB_COMPOSITE -+#cmakedefine01 HAVE_XCB_SHAPE -diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt -index 37bbc5097..dd2442e70 100644 ---- a/src/plasmaquick/CMakeLists.txt -+++ b/src/plasmaquick/CMakeLists.txt -@@ -1,9 +1,3 @@ --if(HAVE_X11 AND XCB_XCB_FOUND AND XCB_SHAPE_FOUND) -- add_definitions(-DHAVE_XCB_SHAPE=1) --else() -- add_definitions(-DHAVE_XCB_SHAPE=0) --endif() -- - add_library(KF5PlasmaQuick SHARED) - add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick) - -@@ -81,7 +75,7 @@ if(HAVE_X11) - target_link_libraries(KF5PlasmaQuick PRIVATE Qt6::GuiPrivate) - endif() - -- if(XCB_SHAPE_FOUND) -+ if(HAVE_XCB_SHAPE) - target_link_libraries(KF5PlasmaQuick PRIVATE XCB::SHAPE) - endif() - endif() -diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp -index 452e36523..2eabd5fb7 100644 ---- a/src/plasmaquick/dialog.cpp -+++ b/src/plasmaquick/dialog.cpp -@@ -11,6 +11,7 @@ - #include "../declarativeimports/core/framesvgitem.h" - #include "appletquickitem.h" - #include "config-plasma.h" -+#include "../declarativeimports/core/config-x11.h" - #include "configview.h" - #include "dialogshadows_p.h" - #include "view.h" --- -GitLab - diff --git a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild deleted file mode 100644 index 36811b06c0b8..000000000000 --- a/kde-frameworks/plasma/plasma-5.98.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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.5 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org - -DESCRIPTION="Plasma framework" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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[X?] - =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}-without_x11.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) - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/plasma/plasma-5.99.0.ebuild b/kde-frameworks/plasma/plasma-5.99.0.ebuild new file mode 100644 index 000000000000..a27e1ef1b167 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.99.0.ebuild @@ -0,0 +1,72 @@ +# 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.5 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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[X?] + =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 )" + +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) + -DWITHOUT_X11=$(usex !X) + ) + + ecm_src_configure +} -- cgit v1.2.3