From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- kde-frameworks/plasma/Manifest | 3 +- ...lasma-5.92.0-breeze-light-dark-visual-fix.patch | 40 ++++++++++++ kde-frameworks/plasma/plasma-5.92.0-r1.ebuild | 75 ++++++++++++++++++++++ kde-frameworks/plasma/plasma-5.92.0.ebuild | 73 --------------------- 4 files changed, 117 insertions(+), 74 deletions(-) create mode 100644 kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch create mode 100644 kde-frameworks/plasma/plasma-5.92.0-r1.ebuild delete mode 100644 kde-frameworks/plasma/plasma-5.92.0.ebuild (limited to 'kde-frameworks/plasma') diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest index ff7f4ed18aef..67b922f632f3 100644 --- a/kde-frameworks/plasma/Manifest +++ b/kde-frameworks/plasma/Manifest @@ -1,8 +1,9 @@ AUX plasma-5.90.0-KDEBUG-426969.patch 3254 BLAKE2B 2b2bcafa630b3daaecd54e6cf2d10b5d7f3a668c54393ca0f1f307c3dac05450801d80537b7af6188e39f25ec00430601ea5fa55f7cc7c2c4564e7f234f5fc7d SHA512 f87839edda4fd680d81ddaf59befcf6836bc5510fd287e3ca3737de0f0b16e3d8272ac3d9eaf4b12704bdd65991348e450c93824ae6ab2603c47f25be9950884 AUX plasma-5.90.0-KDEBUG-447752.patch 2649 BLAKE2B 879a0fbb02e6a90120797d2352e8b3c9874b3203fc1125a004b940f52757eea907a4499d047589c59b4cc7f87dd1ca15119aaa2d990462fda8cc989da5996826 SHA512 17e43da6fd6d6f956e17c889fd4bccdb39d88a1a08cd4cf6bf3af1021eae7dc034821b2b87e2bc5bf2eeedf0338e0d2afb3adba62c0d07a0c68bece08ac781e8 AUX plasma-5.90.0-KDEBUG-448590.patch 1433 BLAKE2B 667d2f07b474ac5b5ceda34e1e819e7b62fc74463dcc763638d18b60b9dfd93eeca87519069792ff91a80cfe0d795562468b1423943b672556bb6b49a2e84362 SHA512 822f3795fc89f95deb71d6ab3608d38608cff9be48bb30748b2c52adecdf12899707ad2be918fe014087297539c42018914d4c77f7855d4d912844838cca871c +AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c EBUILD plasma-5.90.0-r1.ebuild 2073 BLAKE2B 6a79b018dca1c936508c1b129df9bb44945e4787c2b0f448e451f287bbf5af111787034eabb107cd26fd63d596bd6f388d8d7b17f93bed09b4b8177bb75c39ff SHA512 ca9ef2b7ec8b87ab1df3eeaa8c90ff2aedc78eb4ab860e1539bd5d4bb3805cec253772e0bb17a79047138e41e014b6a5ff2e5a50f867be1a3cc2390ad5112560 -EBUILD plasma-5.92.0.ebuild 1943 BLAKE2B acf5b27409eb3763f894a3e64e472b0343eba7b98ff0719b51b5db2efe8e82daad3daff398679b89810c6e4d356d8fd2657fc9d1344a678009c2be35478e3fb9 SHA512 429185ca06ec503371c74dd1ec1c02f50fd57482cacead69e95b3efcae8751bb20befb8b0ff79d8133b63b3e0bfbe41467fd953a73f4d5883e3a15db7745af98 +EBUILD plasma-5.92.0-r1.ebuild 2010 BLAKE2B e5efbe8b62a3bef9004a802f556a46ddfc7228ece7d75654c1530ab37e4058f0a638331315519729aede04712eae5ea1425501792f048ee981683779f5dadf47 SHA512 a2c4f4779dac37e55284fdead27dc05118be5cd0333aedc87f4056a91b972c03286f67606065d2a31b29c2207a13c7fc523a911b8906df9f22bd115bbc95e12d MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch new file mode 100644 index 000000000000..04992bcb129d --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch @@ -0,0 +1,40 @@ +From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Mon, 28 Mar 2022 21:20:16 +0000 +Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark + Plasma themes + +Installing that file there was an acky workaround that got broken by 2cccf230. +--- + src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +---- + src/desktoptheme/breeze-light/CMakeLists.txt | 4 ---- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt +index 8f2078e4d..7f8f99062 100644 +--- a/src/desktoptheme/breeze-dark/CMakeLists.txt ++++ b/src/desktoptheme/breeze-dark/CMakeLists.txt +@@ -8,7 +8,4 @@ install( + FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop" + DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark + ) +-install( +- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz +- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets +-) ++ +diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt +index 678033cec..6688a603b 100644 +--- a/src/desktoptheme/breeze-light/CMakeLists.txt ++++ b/src/desktoptheme/breeze-light/CMakeLists.txt +@@ -8,7 +8,3 @@ install( + FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop" + DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light + ) +-install( +- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz +- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets +-) +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild new file mode 100644 index 000000000000..3e5fa1db605e --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.92.0-r1.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.2 +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 + =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}-breeze-light-dark-visual-fix.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 +} diff --git a/kde-frameworks/plasma/plasma-5.92.0.ebuild b/kde-frameworks/plasma/plasma-5.92.0.ebuild deleted file mode 100644 index 0a0ae5ff71e9..000000000000 --- a/kde-frameworks/plasma/plasma-5.92.0.ebuild +++ /dev/null @@ -1,73 +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.2 -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 - =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 )" - -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 -} -- cgit v1.2.3