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

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

[Johannes Huber]

commit:     54e0820ca011cc9fd18d51880cdf99c3eb290172
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Mar 23 15:25:19 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 15:40:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=54e0820c

kde-plasma/breeze-gtk: Fix breeze-dark

Gentoo-bug: 578052

Package-Manager: portage-2.2.27

 ...gtk-5.6.0.ebuild => breeze-gtk-5.6.0-r1.ebuild} |  2 ++
 .../breeze-gtk/files/breeze-gtk-5.6.0-dark.patch   | 26 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.6.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.6.0-r1.ebuild
similarity index 88%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.6.0.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.6.0-r1.ebuild
index 03be4ed..8e6a6f6 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.6.0.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.6.0-r1.ebuild
@@ -11,3 +11,5 @@ HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
 LICENSE="LGPL-2.1+"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-dark.patch" )

diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.6.0-dark.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.6.0-dark.patch
new file mode 100644
index 0000000..e8c16d1
--- /dev/null
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.6.0-dark.patch
@@ -0,0 +1,26 @@
+From: Sebastian Kügler <sebas@kde.org>
+Date: Wed, 23 Mar 2016 11:16:48 +0000
+Subject: Fix installation of breeze-dark
+X-Git-Url: http://quickgit.kde.org/?p=breeze-gtk.git&a=commitdiff&h=1a547a83dc1bb1c4a0e6d61df747b0426c53531a
+---
+Fix installation of breeze-dark
+
+This regession is introduced in this commit:
+https://quickgit.kde.org/?p=breeze-gtk.git&a=commit&h=673f3e18af95ff2c4af0a999fd1ed00176e05516
+
+Patch-by: Gustavo Alvarez
+REVIEW:127465
+---
+
+
+--- a/Breeze-dark-gtk/CMakeLists.txt
++++ b/Breeze-dark-gtk/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/
++install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark
+     ${directory_EXCLUDES})
+-install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/
++install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark
+     ${directory_EXCLUDES})
+ 
+

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

[Andreas Sturmlechner]

commit:     c4fac72ada1f8baeee835017f47d14ca5589cfa5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 09:50:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 10:30:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c4fac72a

kde-plasma/breeze-gtk: Fix python executable selection

Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Bug: https://bugs.gentoo.org/691092
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild    | 17 +++++++++++++++++
 kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild            | 17 +++++++++++++++++
 .../files/breeze-gtk-5.16.5-cmake-pre-3.16.patch        | 16 ++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild
index 3795a4e04c..9c320fbc60 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild
@@ -26,3 +26,20 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 	kde5_pkg_setup
 }
+
+src_prepare() {
+	kde5_src_prepare
+	if has_version "<dev-util/cmake-3.16_rc1"; then
+		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if has_version "<dev-util/cmake-3.16_rc1"; then
+		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	fi
+	kde5_src_configure
+}

diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index 3795a4e04c..9c320fbc60 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -26,3 +26,20 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 	kde5_pkg_setup
 }
+
+src_prepare() {
+	kde5_src_prepare
+	if has_version "<dev-util/cmake-3.16_rc1"; then
+		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if has_version "<dev-util/cmake-3.16_rc1"; then
+		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	fi
+	kde5_src_configure
+}

diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
new file mode 100644
index 0000000000..cbf8693731
--- /dev/null
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
@@ -0,0 +1,16 @@
+Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
+
+--- a/cmake/FindPythonCairo.cmake
++++ b/cmake/FindPythonCairo.cmake
+@@ -1,10 +1,4 @@
+-if(CMAKE_VERSION VERSION_LESS 3.12.0)
+-    find_package(PythonInterp 3 REQUIRED)
+-    # PythonInterp sets PYTHON_EXECUTABLE
+-else()
+-    find_package(Python3 COMPONENTS Interpreter REQUIRED)
+-    set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
+-endif()
++find_package(PythonInterp 3 REQUIRED)
+ 
+ # Check for python cairo
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import cairo"