File 0001-Fix-look-up-of-gtk-preview-modules.patch of Package kde-gtk-config5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-look-up-of-gtk-preview-modules.patch of Package kde-gtk-config5 (Revision 440b63275c920a82a284d2d3a01284ab)

Currently displaying revision 440b63275c920a82a284d2d3a01284ab , Show latest

From bf9c1c7ae6e7baf30e5cc794f5bd13b00ffbfe19 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Wed, 9 Aug 2017 18:17:12 +0200
Subject: [PATCH] Fix look-up of gtk preview modules

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77f0d4d..5c17532 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 # Set KI18n translation domain
 add_definitions(-DTRANSLATION_DOMAIN=\"kde-gtk-config\")
 
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..9f26104
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1 @@
+#define CMAKE_INSTALL_FULL_LIBEXECDIR "@CMAKE_INSTALL_FULL_LIBEXECDIR@"
diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
index f22793a..04d9c7f 100644
--- a/gtk3proxies/CMakeLists.txt
+++ b/gtk3proxies/CMakeLists.txt
@@ -9,6 +9,6 @@ add_executable(gtk3_preview preview3.c)
 if(X11_FOUND)
   target_include_directories(gtk3_preview PRIVATE ${X11_X11_INCLUDE_PATH})
 endif()
-target_compile_definitions(gtk3_preview PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
+target_compile_definitions(gtk3_preview PRIVATE "-DDATA_DIR=\"${KDE_INSTALL_FULL_DATADIR}/kcm-gtk-module/\"")
 target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
 install(TARGETS gtk3_preview  RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
index fe8e1a0..9a0f3bb 100644
--- a/gtkproxies/CMakeLists.txt
+++ b/gtkproxies/CMakeLists.txt
@@ -8,7 +8,7 @@ install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
 
 
 add_executable(gtk_preview preview.c)
-target_compile_definitions(gtk_preview PRIVATE "-DDATA_DIR=\"${DATA_INSTALL_DIR}/kcm-gtk-module/\"")
+target_compile_definitions(gtk_preview PRIVATE "-DDATA_DIR=\"${KDE_INSTALL_FULL_DATADIR}/kcm-gtk-module/\"")
 target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
 install(TARGETS gtk_preview RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}")
 
diff --git a/gtkproxies/preview.c b/gtkproxies/preview.c
index 5b40a44..e37c1de 100644
--- a/gtkproxies/preview.c
+++ b/gtkproxies/preview.c
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
     GtkBuilder *builder = gtk_builder_new();
     if( ! gtk_builder_add_from_file( builder, ui_file, &error ) ) {
         g_warning( "%s", error->message );
-        g_free( error );
+        g_object_unref( error );
         return 1;
     }
     
diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
index 791bb1f..44a2239 100644
--- a/src/appearancegtk2.cpp
+++ b/src/appearancegtk2.cpp
@@ -28,6 +28,7 @@
 #include <QDebug>
 #include <QProcess>
 #include <QStandardPaths>
+#include <config.h>
 
 bool AppearanceGTK2::loadSettings(const QString& path)
 {
@@ -148,7 +149,7 @@ bool AppearanceGTK2::saveSettings(const QString& gtkrcFile) const
 //         qDebug() << "Symbolic link created for .gtkrc-2.0-kde4 :D";
     
     if(gtkrcFile==defaultConfigFile())
-        QProcess::startDetached(QStandardPaths::findExecutable("reload_gtk_apps"));
+        QProcess::startDetached(QStandardPaths::findExecutable("reload_gtk_apps", {CMAKE_INSTALL_FULL_LIBEXECDIR}));
     
     return true;
 }
diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
index bb2d994..76df4f2 100644
--- a/src/gtkconfigkcmodule.cpp
+++ b/src/gtkconfigkcmodule.cpp
@@ -32,6 +32,7 @@
 #include <QMenu>
 #include <QDebug>
 #include <QDir>
+#include <config.h>
 #include "ui_gui.h"
 #include "abstractappearance.h"
 #include "iconthemesmodel.h"
@@ -84,8 +85,8 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
     ui->gtk2Preview->setIcon(previewIcon);
     ui->gtk3Preview->setIcon(previewIcon);
     
-    QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview");
-    QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview");
+    QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview",  {CMAKE_INSTALL_FULL_LIBEXECDIR});
+    QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview", {CMAKE_INSTALL_FULL_LIBEXECDIR});
     
     m_p2 = new KProcess(this);
     m_p2->setEnv("GTK2_RC_FILES", m_tempGtk2Preview, true);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 997eb39..26c2048 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,6 +3,7 @@ macro(add_kgc_test name)
     add_test(${name} ${name})
     ecm_mark_as_test(${name})
     target_link_libraries(${name} Qt5::Core Qt5::Gui Qt5::Test )
+    target_include_directories(${name} PRIVATE ${CMAKE_BINARY_DIR})
 endmacro(add_kgc_test)
 
 add_kgc_test(fontstest ../src/fontshelpers.cpp)
-- 
2.13.2

Places

File 0001-Fix-look-up-of-gtk-preview-modules.patch of Package kde-gtk-config5 (Revision 440b63275c920a82a284d2d3a01284ab)

Places