kde-plasma/kde-gtk-config : refactor no dconf patch && version bump

2 files changed, 68 insertions, 15 deletions

diff --git a/kde-plasma/kde-gtk-config/files/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch b/kde-plasma/kde-gtk-config/files/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch
index a809449d..cc1a796e 100644
--- a/kde-plasma/kde-gtk-config/files/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch
+++ b/kde-plasma/kde-gtk-config/files/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch
@@ -1,5 +1,5 @@
 diff -Nur a/cmake/modules/FindGSettingSchemas.cmake b/cmake/modules/FindGSettingSchemas.cmake
---- a/cmake/modules/FindGSettingSchemas.cmake	2019-03-12 09:52:51.000000000 +0000
+--- a/cmake/modules/FindGSettingSchemas.cmake	2019-09-03 14:44:16.000000000 +0100
 +++ b/cmake/modules/FindGSettingSchemas.cmake	1970-01-01 01:00:00.000000000 +0100
 @@ -1,23 +0,0 @@
 -find_package(PkgConfig)
@@ -26,8 +26,8 @@ diff -Nur a/cmake/modules/FindGSettingSchemas.cmake b/cmake/modules/FindGSetting
 -
 -mark_as_advanced(GSettingSchemas_FOUND)
 diff -Nur a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
---- a/cmake/modules/FindGTK3.cmake	2019-03-12 09:52:51.000000000 +0000
-+++ b/cmake/modules/FindGTK3.cmake	2019-03-19 11:53:52.091013209 +0000
+--- a/cmake/modules/FindGTK3.cmake	2019-09-03 14:44:16.000000000 +0100
++++ b/cmake/modules/FindGTK3.cmake	2019-09-06 10:42:43.961376179 +0100
 @@ -35,7 +35,7 @@
  	GLIB2_INCLUDE_DIR_PART1 glib.h
  	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
@@ -77,18 +77,18 @@ diff -Nur a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
  # pango
  #
  PKG_CHECK_MODULES(PC_PANGO REQUIRED pango)
-@@ -164,7 +140,7 @@
+@@ -182,7 +158,7 @@
  #
  #
- SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
--SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GIO2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
-+SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+ SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${HARFBUZZ_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+-SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GIO2_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
++SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
  
  INCLUDE(FindPackageHandleStandardArgs)
  
 diff -Nur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2019-03-12 09:52:55.000000000 +0000
-+++ b/CMakeLists.txt	2019-03-19 11:53:52.091013209 +0000
+--- a/CMakeLists.txt	2019-09-03 14:44:30.000000000 +0100
++++ b/CMakeLists.txt	2019-09-06 10:40:23.236847664 +0100
 @@ -8,14 +8,11 @@
  find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Svg Test)
  find_package(KF5 REQUIRED COMPONENTS I18n KIO ConfigWidgets NewStuff Archive KCMUtils IconThemes)
@@ -137,8 +137,8 @@ diff -Nur a/CMakeLists.txt b/CMakeLists.txt
  kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
  
 diff -Nur a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
---- a/gtkproxies/CMakeLists.txt	2019-03-12 09:52:51.000000000 +0000
-+++ b/gtkproxies/CMakeLists.txt	2019-03-19 11:53:52.091013209 +0000
+--- a/gtkproxies/CMakeLists.txt	2019-09-03 14:44:16.000000000 +0100
++++ b/gtkproxies/CMakeLists.txt	2019-09-06 10:40:23.236847664 +0100
 @@ -1,6 +1,6 @@
  find_package(GTK2 REQUIRED)
  
@@ -148,8 +148,8 @@ diff -Nur a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
  add_executable(reload_gtk_apps reload.c)
  target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
 diff -Nur a/src/appearancegtk3.cpp b/src/appearancegtk3.cpp
---- a/src/appearancegtk3.cpp	2019-03-12 09:52:51.000000000 +0000
-+++ b/src/appearancegtk3.cpp	2019-03-19 11:53:52.091013209 +0000
+--- a/src/appearancegtk3.cpp	2019-09-03 14:44:16.000000000 +0100
++++ b/src/appearancegtk3.cpp	2019-09-06 10:40:23.236847664 +0100
 @@ -1,5 +1,5 @@
  /* KDE GTK Configuration Module
 - *
@@ -230,8 +230,8 @@ diff -Nur a/src/appearancegtk3.cpp b/src/appearancegtk3.cpp
      return saveSettings(cfg);
  }
 diff -Nur a/tests/CMakeLists.txt b/tests/CMakeLists.txt
---- a/tests/CMakeLists.txt	2019-03-12 09:52:51.000000000 +0000
-+++ b/tests/CMakeLists.txt	2019-03-19 11:53:52.091013209 +0000
+--- a/tests/CMakeLists.txt	2019-09-03 14:44:16.000000000 +0100
++++ b/tests/CMakeLists.txt	2019-09-06 10:40:23.236847664 +0100
 @@ -2,7 +2,7 @@
      add_executable(${name} ${name}.cpp ${ARGV})
      add_test(${name} ${name})
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5-r314.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5-r314.ebuild
new file mode 100644
index 00000000..c367387d
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5-r314.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=( "${FILESDIR}"/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}