From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- kde-plasma/breeze/Manifest | 5 +- kde-plasma/breeze/breeze-5.22.5.ebuild | 51 --------------------- kde-plasma/breeze/breeze-5.23.4-r1.ebuild | 53 ++++++++++++++++++++++ kde-plasma/breeze/breeze-5.23.4.ebuild | 51 --------------------- .../files/breeze-5.23.4-fix-kstyle-crash.patch | 35 ++++++++++++++ 5 files changed, 90 insertions(+), 105 deletions(-) delete mode 100644 kde-plasma/breeze/breeze-5.22.5.ebuild create mode 100644 kde-plasma/breeze/breeze-5.23.4-r1.ebuild delete mode 100644 kde-plasma/breeze/breeze-5.23.4.ebuild create mode 100644 kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch (limited to 'kde-plasma/breeze') diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index ef31774f5fc6..a254030fd62d 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,5 +1,4 @@ -DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d +AUX breeze-5.23.4-fix-kstyle-crash.patch 1248 BLAKE2B 800d1e1015e6b3a1bb759d410e8982601ad0d582b912b76f5ed5280ee7a7550d61d921c3a46b11e177cef9004225c63a73e86ad2de342afc0342ac61d7cf7915 SHA512 d7355350ed98c648c150e300adc2bf8f0885bb3f64e3b91647f61f258703e0dbc41d2e046f31bac0384aa28c012eb381325e02df4a0992b4979f897ece714c2b DIST breeze-5.23.4.tar.xz 73813800 BLAKE2B 0821a0b484dac61c8c7a492248f9c9bc52abb347b0998a69567f931fd436df4c3f84fdfd7153453b15a7fb7015000012bd45c56d625edf8e952296748ebb5413 SHA512 5273100b059c58689028fbafbfc25f9d185f9b21abe011f8b7e8c9301c8b6d7f1846989c292709016b8c5c5edf627985f99968a809b779d46c23a7c7f773e913 -EBUILD breeze-5.22.5.ebuild 1272 BLAKE2B 16bc96592da6d84fbfe8b5ef73386aa7cefb10499c67282641f74a475628bea30fb3f8c1a1258e3795fcd2266b73f8a9271a82b3823c1a43a3d838e9f4bcf2ba SHA512 65d6702cc8efb303f69022de57ba4afd01937d91e4d03635443c642a88d140f540c393847fcb9d1086455e6dba89f0b334f75395c07b48b7c2538fb5b760cbed -EBUILD breeze-5.23.4.ebuild 1275 BLAKE2B 23b8ec56440a3ce14de9d07baf95232297301e78e99b912c8298af1391e91cc81e383ba82d7432bbf1e7f389a610abad5fdf5c6b9bab3ee38868e5c23c26d8c2 SHA512 c2c1f9248c8c7a40754b9487f38334caed15ae05a48c58043b13cbab8dd2795552fe9a4851338c22fae40bc21c20a6105a7561039fafce9abacd0f02841828dd +EBUILD breeze-5.23.4-r1.ebuild 1327 BLAKE2B 02c4640398300ee12ae1a704e5017ade484ea0ebb6eec911075a8d5256d4265697fb9accd7657147b1b3a8bb7de08559797cb423176fd6d8aaa7f11f44adf8bd SHA512 6391dcf4f3921a017798f8b9d861535e1113c0136a07e4e10569229fc515645afe95675dc493c35f5ec949fe36e7a57fa740a252076f5f6747340db253bc5bd2 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/breeze/breeze-5.22.5.ebuild b/kde-plasma/breeze/breeze-5.22.5.ebuild deleted file mode 100644 index afeb0d84c6cb..000000000000 --- a/kde-plasma/breeze/breeze-5.22.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://invent.kde.org/plasma/breeze" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/kpackage-${KFMIN}:5 -" -PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/breeze-5.23.4-r1.ebuild b/kde-plasma/breeze/breeze-5.23.4-r1.ebuild new file mode 100644 index 000000000000..adf3225d6dbe --- /dev/null +++ b/kde-plasma/breeze/breeze-5.23.4-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.86.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Breeze visual style for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/breeze" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +IUSE="X" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/frameworkintegration-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kdecoration-${PVCUT}:5 + X? ( x11-libs/libxcb ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/kpackage-${KFMIN}:5 +" +PDEPEND=" + >=kde-frameworks/breeze-icons-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" + +PATCHES=( "${FILESDIR}"/${P}-fix-kstyle-crash.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X XCB) + ) + ecm_src_configure +} diff --git a/kde-plasma/breeze/breeze-5.23.4.ebuild b/kde-plasma/breeze/breeze-5.23.4.ebuild deleted file mode 100644 index 76a474649d74..000000000000 --- a/kde-plasma/breeze/breeze-5.23.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://invent.kde.org/plasma/breeze" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/kpackage-${KFMIN}:5 -" -PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch new file mode 100644 index 000000000000..1d714c7aa6df --- /dev/null +++ b/kde-plasma/breeze/files/breeze-5.23.4-fix-kstyle-crash.patch @@ -0,0 +1,35 @@ +From 2aa08ed366917b7b207842844b78e5dadd5a06ed Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Sun, 5 Dec 2021 16:50:10 +0000 +Subject: [PATCH] [kstyle] Fix logic error in + drawIndicatorButtonDropDownPrimitive + +The current code checks for !complexOption, but then continues to +de-reference it in the second clause of the statement leading to an +inveitable crash. + +I assume it's meant to be an `or` for the latter part of the statement +to make sense. + + +(cherry picked from commit b09dbd9282f848e779e74840a5a3ef13c71fa82e) +--- + kstyle/breezestyle.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp +index ee06f41c..1337d26e 100644 +--- a/kstyle/breezestyle.cpp ++++ b/kstyle/breezestyle.cpp +@@ -4024,7 +4024,7 @@ namespace Breeze + + // cast option and check + const auto complexOption( qstyleoption_cast( option ) ); +- if( !complexOption && !(complexOption->subControls & SC_ToolButtonMenu) ) return true; ++ if( !complexOption || !(complexOption->subControls & SC_ToolButtonMenu) ) return true; + + // button state + bool enabled = option->state & QStyle::State_Enabled; +-- +GitLab + -- cgit v1.2.3