From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-949737-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7F65D139696
for <garchives@archives.gentoo.org>; Sun, 14 May 2017 15:19:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AFC9DE0E45;
Sun, 14 May 2017 15:19:07 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7EC0DE0E45
for <gentoo-commits@lists.gentoo.org>; Sun, 14 May 2017 15:19:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 726A53416AD
for <gentoo-commits@lists.gentoo.org>; Sun, 14 May 2017 15:19:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D08D57458
for <gentoo-commits@lists.gentoo.org>; Sun, 14 May 2017 15:19:04 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1494775025.6bbc2bd4a37e5df82870e9b887651e400b29c51a.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze-gtk/, kde-plasma/breeze-gtk/files/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/breeze-gtk/breeze-gtk-5.10.49.9999.ebuild kde-plasma/breeze-gtk/breeze-gtk-5.9.95.ebuild kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild kde-plasma/breeze-gtk/files/breeze-gtk-5.9.95-gtk3-dep.patch
X-VCS-Directories: kde-plasma/breeze-gtk/ kde-plasma/breeze-gtk/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 6bbc2bd4a37e5df82870e9b887651e400b29c51a
X-VCS-Branch: master
Date: Sun, 14 May 2017 15:19:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a4634360-3196-4369-ac27-2cd1e8a69699
X-Archives-Hash: db4d485ee0c6bf03d893578eb4a22dfa
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