[gentoo-commits] repo/gentoo:master commit in: kde-plasma/breeze/files/, kde-plasma/breeze/

2021-12-10 Thread Andreas Sturmlechner 
commit: 9f4d6c64868ce717d76732cb7cf323f14302f92f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 10 14:45:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 10 14:58:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4d6c64

kde-plasma/breeze: Fix logic error leading to kstyle crash

Upstream commit 2aa08ed366917b7b207842844b78e5dadd5a06ed
See also: https://invent.kde.org/plasma/breeze/-/merge_requests/163

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-plasma/breeze/breeze-5.23.4-r1.ebuild  | 53 ++
 .../files/breeze-5.23.4-fix-kstyle-crash.patch | 35 ++
 2 files changed, 88 insertions(+)

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 ..25e2284b20ba
--- /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/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 ..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 +
+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
+

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/breeze/files/

2016-01-18 Thread Michael Palimaka 
commit: 515e23a1b1049a4ade0cbf9cc171634dbd3f8081
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jan 18 17:03:59 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan 18 17:25:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515e23a1

kde-plasma/breeze: remove unused patch

Package-Manager: portage-2.2.26

 .../files/breeze-5.4.2-fix-breeze-dark.patch   | 23 --
 1 file changed, 23 deletions(-)

diff --git a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch 
b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
deleted file mode 100644
index b6e7eab..000
--- a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Harald Sitter 
-Date: Mon, 05 Oct 2015 13:14:00 +
-Subject: Install emotes and mimtetypes directories of the dark icon theme
-X-Git-Url: 
http://quickgit.kde.org/?p=breeze.git=commitdiff=12d8b9a9907b28ba1cbaffc380f4eeae4de9774d

-Install emotes and mimtetypes directories of the dark icon theme
-
-CCMAIL: kain...@gmail.com

-
-
 a/icons-dark/CMakeLists.txt
-+++ b/icons-dark/CMakeLists.txt
-@@ -11,7 +11,7 @@
- 
- ### install files ###
- 
--set( breeze_icon_dark_dirs  actions apps categories devices emblems places 
status)
-+set( breeze_icon_dark_dirs  actions apps categories devices emblems emotes 
mimetypes places status)
- 
- 
- set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark)
-

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/breeze/files/, kde-plasma/breeze/

2015-10-19 Thread Michael Palimaka 
commit: efdb9c17f2b350888383d4ad5011e6e320945092
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Oct 18 22:25:05 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 19 13:08:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdb9c17

kde-plasma/breeze: Fix breeze-dark icon theme

Package-Manager: portage-2.2.20.1

 kde-plasma/breeze/breeze-5.4.2-r1.ebuild   | 66 ++
 .../files/breeze-5.4.2-fix-breeze-dark.patch   | 23 
 2 files changed, 89 insertions(+)

diff --git a/kde-plasma/breeze/breeze-5.4.2-r1.ebuild 
b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
new file mode 100644
index 000..21bdadf
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze;
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+DEPEND="
+   $(add_frameworks_dep frameworkintegration)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_plasma_dep kdecoration)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   x11-libs/libxcb
+   qt4? (
+   kde-base/kdelibs:4
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}
+   $(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-breeze-dark.patch" )
+
+pkg_setup() {
+   kde5_pkg_setup
+   MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+   myconfigure() {
+   local mycmakeargs=()
+
+   if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+   mycmakeargs+=( -DUSE_KDE4=true )
+   fi
+
+   kde5_src_configure
+   }
+
+   multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+   multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+   multibuild_foreach_variant kde5_src_install
+}

diff --git a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch 
b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
new file mode 100644
index 000..b6e7eab
--- /dev/null
+++ b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
@@ -0,0 +1,23 @@
+From: Harald Sitter 
+Date: Mon, 05 Oct 2015 13:14:00 +
+Subject: Install emotes and mimtetypes directories of the dark icon theme
+X-Git-Url: 
http://quickgit.kde.org/?p=breeze.git=commitdiff=12d8b9a9907b28ba1cbaffc380f4eeae4de9774d
+---
+Install emotes and mimtetypes directories of the dark icon theme
+
+CCMAIL: kain...@gmail.com
+---
+
+
+--- a/icons-dark/CMakeLists.txt
 b/icons-dark/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ 
+ ### install files ###
+ 
+-set( breeze_icon_dark_dirs  actions apps categories devices emblems places 
status)
++set( breeze_icon_dark_dirs  actions apps categories devices emblems emotes 
mimetypes places status)
+ 
+ 
+ set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark)
+