$ git diff --patch-with-stat --summary a487f234136287449286af33fb8e604b4da8bc25..1c10f20c949e7cd46fc45e4ac0ceacc3959985d0
.abf.yml | 2 +-
kde-gtk-config-2.0-gtkrc-2.0-kde-config-file.patch | 39 ++++++++--------------
kde-gtk-config.spec | 2 +-
no-dconf-and-friends-we-dont-need.patch | 39 +++++++++++-----------
4 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index e501ce3..c39e244 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- kde-gtk-config-5.16.4.tar.xz: 987b485cfaef266e167741065efadcf411b3e45a
+ kde-gtk-config-5.16.90.tar.xz: fc84d817c9f423215af9ce0a815dd44cd3f0a49b
diff --git a/kde-gtk-config-2.0-gtkrc-2.0-kde-config-file.patch b/kde-gtk-config-2.0-gtkrc-2.0-kde-config-file.patch
index 205b030..c131ebd 100644
--- a/kde-gtk-config-2.0-gtkrc-2.0-kde-config-file.patch
+++ b/kde-gtk-config-2.0-gtkrc-2.0-kde-config-file.patch
@@ -1,29 +1,16 @@
-diff -Naur kde-gtk-config-5.5.3/src/appearancegtk2.cpp kde-gtk-config-5.5.3.tpg/src/appearancegtk2.cpp
---- kde-gtk-config-5.5.3/src/appearancegtk2.cpp 2016-01-06 12:00:16.000000000 +0000
-+++ kde-gtk-config-5.5.3.tpg/src/appearancegtk2.cpp 2016-01-16 04:53:20.753785611 +0000
-@@ -92,7 +92,7 @@
- gtkrc.remove();
+diff -up kde-gtk-config-5.16.90/src/appearancegtk2.cpp.0000~ kde-gtk-config-5.16.90/src/appearancegtk2.cpp
+--- kde-gtk-config-5.16.90/src/appearancegtk2.cpp.0000~ 2019-09-19 12:40:43.000000000 +0200
++++ kde-gtk-config-5.16.90/src/appearancegtk2.cpp 2019-09-19 20:29:51.045935082 +0200
+@@ -102,7 +102,7 @@ bool AppearanceGTK2::saveSettingsPrivate
- if(!gtkrc.open(QIODevice::WriteOnly | QIODevice::Text)) {
-- qWarning() << "There was unable to write the file .gtkrc-2.0";
-+ qWarning() << "There was unable to write the file .gtkrc-2.0-kde";
+ return true;
+ } else {
+- qWarning() << "There was unable to write the .gtkrc-2.0 file";
++ qWarning() << "There was unable to write the .gtkrc-2.0-kde file";
return false;
}
-
-@@ -132,10 +132,10 @@
- gtkrc.close();
-
- //TODO: do we really need the linked file?
-- if(QFile::remove(gtkrcFile+"-kde4"))
-+ if(QFile::remove(gtkrcFile+"4"))
- qDebug() << "ready to create the symbolic link";
-
-- if( !QFile::link(gtkrcFile, gtkrcFile+"-kde4") )
-+ if( !QFile::link(gtkrcFile, gtkrcFile+"4") )
- qWarning() << "Couldn't create the symboling link to .gtkrc-2.0-kde4 :(";
- // else
- // qDebug() << "Symbolic link created for .gtkrc-2.0-kde4 :D";
-@@ -148,7 +148,7 @@
+ }
+@@ -157,7 +157,7 @@ void AppearanceGTK2::reset()
QString AppearanceGTK2::defaultConfigFile() const
{
@@ -32,9 +19,9 @@ diff -Naur kde-gtk-config-5.5.3/src/appearancegtk2.cpp kde-gtk-config-5.5.3.tpg/
}
QStringList AppearanceGTK2::installedThemes() const
-diff -Naur kde-gtk-config-5.5.3/src/appearencegtk.h kde-gtk-config-5.5.3.tpg/src/appearencegtk.h
---- kde-gtk-config-5.5.3/src/appearencegtk.h 2016-01-06 12:00:16.000000000 +0000
-+++ kde-gtk-config-5.5.3.tpg/src/appearencegtk.h 2016-01-16 04:49:12.840232040 +0000
+diff -up kde-gtk-config-5.16.90/src/appearencegtk.h.0000~ kde-gtk-config-5.16.90/src/appearencegtk.h
+--- kde-gtk-config-5.16.90/src/appearencegtk.h.0000~ 2019-09-19 12:40:43.000000000 +0200
++++ kde-gtk-config-5.16.90/src/appearencegtk.h 2019-09-19 20:28:10.465161930 +0200
@@ -30,7 +30,7 @@
class AbstractAppearance;
/**
diff --git a/kde-gtk-config.spec b/kde-gtk-config.spec
index 6955ab4..789d6d6 100644
--- a/kde-gtk-config.spec
+++ b/kde-gtk-config.spec
@@ -2,7 +2,7 @@
Summary: GTK2 and GTK3 configurator for KDE
Name: kde-gtk-config
-Version: 5.16.4
+Version: 5.16.90
Release: 1
License: GPLv2+
Group: System/Libraries
diff --git a/no-dconf-and-friends-we-dont-need.patch b/no-dconf-and-friends-we-dont-need.patch
index d049067..4e594cc 100644
--- a/no-dconf-and-friends-we-dont-need.patch
+++ b/no-dconf-and-friends-we-dont-need.patch
@@ -1,6 +1,6 @@
-diff -up kde-gtk-config-5.15.3/CMakeLists.txt.0001~ kde-gtk-config-5.15.3/CMakeLists.txt
---- kde-gtk-config-5.15.3/CMakeLists.txt.0001~ 2019-03-12 17:41:25.786308729 +0100
-+++ kde-gtk-config-5.15.3/CMakeLists.txt 2019-03-12 17:45:21.250579340 +0100
+diff -up kde-gtk-config-5.16.5/CMakeLists.txt.0001~ kde-gtk-config-5.16.5/CMakeLists.txt
+--- kde-gtk-config-5.16.5/CMakeLists.txt.0001~ 2019-09-03 15:44:30.000000000 +0200
++++ kde-gtk-config-5.16.5/CMakeLists.txt 2019-09-17 02:02:10.906950503 +0200
@@ -8,14 +8,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_S
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Svg Test)
find_package(KF5 REQUIRED COMPONENTS I18n KIO ConfigWidgets NewStuff Archive KCMUtils IconThemes)
@@ -25,10 +25,9 @@ diff -up kde-gtk-config-5.15.3/CMakeLists.txt.0001~ kde-gtk-config-5.15.3/CMakeL
kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
-diff -up kde-gtk-config-5.15.3/cmake/modules/FindGSettingSchemas.cmake.0001~ kde-gtk-config-5.15.3/cmake/modules/FindGSettingSchemas.cmake
-diff -up kde-gtk-config-5.15.3/cmake/modules/FindGTK3.cmake.0001~ kde-gtk-config-5.15.3/cmake/modules/FindGTK3.cmake
---- kde-gtk-config-5.15.3/cmake/modules/FindGTK3.cmake.0001~ 2019-03-12 10:52:51.000000000 +0100
-+++ kde-gtk-config-5.15.3/cmake/modules/FindGTK3.cmake 2019-03-12 17:41:25.786308729 +0100
+diff -up kde-gtk-config-5.16.5/cmake/modules/FindGTK3.cmake.0001~ kde-gtk-config-5.16.5/cmake/modules/FindGTK3.cmake
+--- kde-gtk-config-5.16.5/cmake/modules/FindGTK3.cmake.0001~ 2019-09-03 15:44:16.000000000 +0200
++++ kde-gtk-config-5.16.5/cmake/modules/FindGTK3.cmake 2019-09-17 02:02:44.997721682 +0200
@@ -35,7 +35,7 @@ FIND_PATH(
GLIB2_INCLUDE_DIR_PART1 glib.h
HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
@@ -78,18 +77,18 @@ diff -up kde-gtk-config-5.15.3/cmake/modules/FindGTK3.cmake.0001~ kde-gtk-config
# pango
#
PKG_CHECK_MODULES(PC_PANGO REQUIRED pango)
-@@ -164,7 +140,7 @@ FIND_LIBRARY(
+@@ -182,7 +158,7 @@ FIND_LIBRARY(
#
#
- 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 -up kde-gtk-config-5.15.3/gtkproxies/CMakeLists.txt.0001~ kde-gtk-config-5.15.3/gtkproxies/CMakeLists.txt
---- kde-gtk-config-5.15.3/gtkproxies/CMakeLists.txt.0001~ 2019-03-12 10:52:51.000000000 +0100
-+++ kde-gtk-config-5.15.3/gtkproxies/CMakeLists.txt 2019-03-12 17:41:25.786308729 +0100
+diff -up kde-gtk-config-5.16.5/gtkproxies/CMakeLists.txt.0001~ kde-gtk-config-5.16.5/gtkproxies/CMakeLists.txt
+--- kde-gtk-config-5.16.5/gtkproxies/CMakeLists.txt.0001~ 2019-09-03 15:44:16.000000000 +0200
++++ kde-gtk-config-5.16.5/gtkproxies/CMakeLists.txt 2019-09-17 02:02:10.906950503 +0200
@@ -1,6 +1,6 @@
find_package(GTK2 REQUIRED)
@@ -98,9 +97,9 @@ diff -up kde-gtk-config-5.15.3/gtkproxies/CMakeLists.txt.0001~ kde-gtk-config-5.
add_executable(reload_gtk_apps reload.c)
target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
-diff -up kde-gtk-config-5.15.3/src/appearancegtk3.cpp.0001~ kde-gtk-config-5.15.3/src/appearancegtk3.cpp
---- kde-gtk-config-5.15.3/src/appearancegtk3.cpp.0001~ 2019-03-12 10:52:51.000000000 +0100
-+++ kde-gtk-config-5.15.3/src/appearancegtk3.cpp 2019-03-12 17:41:25.786308729 +0100
+diff -up kde-gtk-config-5.16.5/src/appearancegtk3.cpp.0001~ kde-gtk-config-5.16.5/src/appearancegtk3.cpp
+--- kde-gtk-config-5.16.5/src/appearancegtk3.cpp.0001~ 2019-09-03 15:44:16.000000000 +0200
++++ kde-gtk-config-5.16.5/src/appearancegtk3.cpp 2019-09-17 02:02:10.906950503 +0200
@@ -1,5 +1,5 @@
/* KDE GTK Configuration Module
- *
@@ -180,9 +179,9 @@ diff -up kde-gtk-config-5.15.3/src/appearancegtk3.cpp.0001~ kde-gtk-config-5.15.
auto cfg = KSharedConfig::openConfig(configFileName(), KConfig::NoGlobals);
return saveSettings(cfg);
}
-diff -up kde-gtk-config-5.15.3/tests/CMakeLists.txt.0001~ kde-gtk-config-5.15.3/tests/CMakeLists.txt
---- kde-gtk-config-5.15.3/tests/CMakeLists.txt.0001~ 2019-03-12 10:52:51.000000000 +0100
-+++ kde-gtk-config-5.15.3/tests/CMakeLists.txt 2019-03-12 17:41:25.786308729 +0100
+diff -up kde-gtk-config-5.16.5/tests/CMakeLists.txt.0001~ kde-gtk-config-5.16.5/tests/CMakeLists.txt
+--- kde-gtk-config-5.16.5/tests/CMakeLists.txt.0001~ 2019-09-03 15:44:16.000000000 +0200
++++ kde-gtk-config-5.16.5/tests/CMakeLists.txt 2019-09-17 02:02:10.906950503 +0200
@@ -2,7 +2,7 @@ macro(add_kgc_test name)
add_executable(${name} ${name}.cpp ${ARGV})
add_test(${name} ${name})