* [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/
@ 2015-12-22 21:05 Manuel Rüger
0 siblings, 0 replies; 3+ messages in thread
From: Manuel Rüger @ 2015-12-22 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 32105e05e390e617163efec811ad50f1a9536fef
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Dec 22 20:55:12 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 21:05:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=32105e05
kde-plasma/breeze-gtk: Relax cmake version requirement
Package-Manager: portage-2.2.24
kde-plasma/breeze-gtk/breeze-gtk-5.5.2.ebuild | 2 ++
.../files/breeze-gtk-5.5.2-cmake-version.patch | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.5.2.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.5.2.ebuild
index c8588a5..c1ff270 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.2.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.2.ebuild
@@ -11,3 +11,5 @@ HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
LICENSE="LGPL-2.1+"
KEYWORDS="~amd64 ~x86"
IUSE=""
+
+PATCHES=( "${FILESDIR}/${PN}-5.5.2-cmake-version.patch" )
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch
new file mode 100644
index 0000000..13c3b1b
--- /dev/null
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch
@@ -0,0 +1,19 @@
+commit ec9bdbd443d2ee15e6a9da335b74039c01153d7a
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue Dec 22 21:47:08 2015 +0100
+
+ Relax cmake version requirement to rest of plasma
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 240f497..9af6b67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ project(breeze-gtk)
+ set(PROJECT_VERSION "5.5.2")
+ set(PROJECT_VERSION_MAJOR 5)
+
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 2.8.12)
+
+ find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+ include(FeatureSummary)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/
@ 2017-05-14 15:19 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-05-14 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 6bbc2bd4a37e5df82870e9b887651e400b29c51a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 15:04:33 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 15:17:05 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6bbc2bd4
kde-plasma/breeze-gtk: Remove gtk+-3 dependency
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../breeze-gtk/breeze-gtk-5.10.49.9999.ebuild | 12 +----
kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild | 12 +----
kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild | 12 +----
.../files/breeze-gtk-5.9.95-gtk3-dep.patch | 58 ++++++++++++++++++++++
4 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.10.49.9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.10.49.9999.ebuild
index 72b7f16dad..53abb46f9d 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.10.49.9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.10.49.9999.ebuild
@@ -5,18 +5,10 @@ EAPI=6
inherit kde5
-DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
LICENSE="LGPL-2.1+"
KEYWORDS=""
IUSE=""
-src_install() {
- kde5_src_install
-
- insinto /usr/share/themes/Breeze/gtk-3.20
- doins Breeze-gtk/gtk-3.20/gtk.css
-
- insinto /usr/share/themes/Breeze-Dark/gtk-3.20
- doins Breeze-dark-gtk/gtk-3.20/gtk.css
-}
+PATCHES=( "${FILESDIR}/${PN}-5.9.95-gtk3-dep.patch" )
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild
index 8ae0e21290..7f98e02360 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild
@@ -5,18 +5,10 @@ EAPI=6
inherit kde5
-DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
LICENSE="LGPL-2.1+"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-src_install() {
- kde5_src_install
-
- insinto /usr/share/themes/Breeze/gtk-3.20
- doins Breeze-gtk/gtk-3.20/gtk.css
-
- insinto /usr/share/themes/Breeze-Dark/gtk-3.20
- doins Breeze-dark-gtk/gtk-3.20/gtk.css
-}
+PATCHES=( "${FILESDIR}/${P}-gtk3-dep.patch" )
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index 72b7f16dad..53abb46f9d 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -5,18 +5,10 @@ EAPI=6
inherit kde5
-DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
LICENSE="LGPL-2.1+"
KEYWORDS=""
IUSE=""
-src_install() {
- kde5_src_install
-
- insinto /usr/share/themes/Breeze/gtk-3.20
- doins Breeze-gtk/gtk-3.20/gtk.css
-
- insinto /usr/share/themes/Breeze-Dark/gtk-3.20
- doins Breeze-dark-gtk/gtk-3.20/gtk.css
-}
+PATCHES=( "${FILESDIR}/${PN}-5.9.95-gtk3-dep.patch" )
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.9.95-gtk3-dep.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.9.95-gtk3-dep.patch
new file mode 100644
index 0000000000..7eea4fcfcb
--- /dev/null
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.9.95-gtk3-dep.patch
@@ -0,0 +1,58 @@
+commit 2cc88a4539f55960bfa495e9bc388e10f2bdf763
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun May 14 16:37:18 2017 +0200
+
+ Remove gtk+-3 build dep, install versioned gtk.css dirs unconditionally
+
+ GTK will search /usr/share/themes/<theme>/gtk-<version> and then earlier
+ versions all the way back to 3.0.
+
+ See also:
+ https://developer.gnome.org/gtk3/stable/GtkCssProvider.html#GtkCssProvider.description
+
+diff --git a/Breeze-dark-gtk/CMakeLists.txt b/Breeze-dark-gtk/CMakeLists.txt
+index 15fbb2f..6a82a5e 100644
+--- a/Breeze-dark-gtk/CMakeLists.txt
++++ b/Breeze-dark-gtk/CMakeLists.txt
+@@ -3,8 +3,6 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre
+ install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark
+ ${directory_EXCLUDES})
+
+-if (PKG_GTK_VERSION VERSION_LESS "3.20")
+-install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark/gtk-3.0/)
+-else()
+-install(FILES gtk-3.20/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark/gtk-3.0/)
+-endif()
++install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark)
++install(DIRECTORY gtk-3.18 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark)
++install(DIRECTORY gtk-3.20 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark)
+diff --git a/Breeze-gtk/CMakeLists.txt b/Breeze-gtk/CMakeLists.txt
+index 5096c28..65817d4 100644
+--- a/Breeze-gtk/CMakeLists.txt
++++ b/Breeze-gtk/CMakeLists.txt
+@@ -3,8 +3,6 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre
+ install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze
+ ${directory_EXCLUDES})
+
+-if (PKG_GTK_VERSION VERSION_LESS "3.20")
+-install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/)
+-else()
+-install(FILES gtk-3.20/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/)
+-endif()
++install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze)
++install(DIRECTORY gtk-3.18 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze)
++install(DIRECTORY gtk-3.20 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0284ec..1190345 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,9 +10,6 @@ include(FeatureSummary)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake")
+ find_package(GTKEngine)
+
+-find_package(PkgConfig)
+-pkg_check_modules(PKG_GTK REQUIRED gtk+-3.0)
+-
+ include(KDEInstallDirs)
+
+ # Exclude these patterns when installing directories as they have no use
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/
@ 2020-09-03 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-09-03 12:52 UTC (permalink / raw
To: gentoo-commits
commit: c337a66c6d57d56e9c1b267a777963bbc7446ec5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 12:47:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 12:47:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c337a66c
kde-plasma/breeze-gtk: Drop obsolete pre-cmake-3.16 hack
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild | 11 +----------
.../files/breeze-gtk-5.16.5-cmake-pre-3.16.patch | 16 ----------------
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
index fc35e8de4e..f6ca2f7841 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild
@@ -17,6 +17,7 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
dev-lang/sassc
+ >=dev-util/cmake-3.16
$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
>=kde-plasma/breeze-${PVCUT}:5
"
@@ -30,19 +31,9 @@ pkg_setup() {
ecm_pkg_setup
}
-src_prepare() {
- ecm_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
ecm_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
deleted file mode 100644
index cbf8693731..0000000000
--- a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-03 12:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-14 15:19 [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-09-03 12:52 Andreas Sturmlechner
2015-12-22 21:05 Manuel Rüger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox