summaryrefslogtreecommitdiff
path: root/kde-plasma/kde-gtk-config/files
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kde-gtk-config/files')
-rw-r--r--kde-plasma/kde-gtk-config/files/redhat-or-not-go-dconf-and-flatpak-yourself-or-try-again-with-a-option-to-disable.patch157
1 files changed, 75 insertions, 82 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 865c7332..a809449d 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,59 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fb4e1a..d1e32f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,14 +8,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_P
- find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Widgets Test)
- find_package(KF5 REQUIRED COMPONENTS I18n KIO ConfigWidgets NewStuff Archive KCMUtils IconThemes)
- find_package(X11 REQUIRED)
--find_package(GTK3 REQUIRED)
--find_package(GSettingSchemas REQUIRED)
-
- include_directories(
-- ${CMAKE_SOURCE_DIR}
-- ${CMAKE_SOURCE_DIR}/src
-- ${CMAKE_SOURCE_DIR}/src/ui
-- ${GTK3_INCLUDE_DIRS}
-+ ${CMAKE_SOURCE_DIR}
-+ ${CMAKE_SOURCE_DIR}/src
-+ ${CMAKE_SOURCE_DIR}/src/ui
- )
-
- include(ECMSetupVersion)
-@@ -40,21 +37,21 @@ set(kcm_SRCS
- src/appearencegtk.cpp
- src/abstractappearance.cpp
- src/thread.cpp
-- src/installer.cpp
-+ src/installer.cpp
- src/gtkconfigkcmodule.cpp
-- src/dialog_installer.cpp
-- src/dialog_uninstaller.cpp
-+ src/dialog_installer.cpp
-+ src/dialog_uninstaller.cpp
- src/fontshelpers.cpp
- )
-
--ki18n_wrap_ui(kcm_SRCS
-- src/ui/gui.ui
-- src/ui/dialog_installer.ui
-+ki18n_wrap_ui(kcm_SRCS
-+ src/ui/gui.ui
-+ src/ui/dialog_installer.ui
- src/ui/dialog_uninstaller.ui
- )
- add_library(kcm_kdegtkconfig MODULE ${kcm_SRCS})
- target_compile_definitions(kcm_kdegtkconfig PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
--target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} ${GIO2_LIBRARY} ${GLIB2_LIBRARY} ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} KF5::ConfigCore KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-+target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} KF5::ConfigCore KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
-
- kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
-
-diff --git a/cmake/modules/FindGSettingSchemas.cmake b/cmake/modules/FindGSettingSchemas.cmake
-deleted file mode 100644
-index 6d70a2e..0000000
---- a/cmake/modules/FindGSettingSchemas.cmake
-+++ /dev/null
+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
++++ b/cmake/modules/FindGSettingSchemas.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-find_package(PkgConfig)
-
@@ -78,11 +25,10 @@ index 6d70a2e..0000000
-)
-
-mark_as_advanced(GSettingSchemas_FOUND)
-diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
-index f178523..8da67fd 100644
---- a/cmake/modules/FindGTK3.cmake
-+++ b/cmake/modules/FindGTK3.cmake
-@@ -35,7 +35,7 @@ FIND_PATH(
+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
+@@ -35,7 +35,7 @@
GLIB2_INCLUDE_DIR_PART1 glib.h
HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
PATH_SUFFIXES glib-2.0)
@@ -91,7 +37,7 @@ index f178523..8da67fd 100644
FIND_PATH(
GLIB2_INCLUDE_DIR_PART2 glibconfig.h
HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
-@@ -58,7 +58,7 @@ FIND_PATH(
+@@ -58,7 +58,7 @@
GOBJECT2_INCLUDE_DIR_PART1 glib.h
HINTS ${PC_GOBJECT2_INCLUDEDIR} ${PC_GOBJECT2_INCLUDE_DIRS}
PATH_SUFFIXES gobject-2.0)
@@ -100,11 +46,10 @@ index f178523..8da67fd 100644
FIND_PATH(
GOBJECT2_INCLUDE_DIR_PART2 gobject.h
HINTS ${PC_GOBJECT2_INCLUDEDIR} ${PC_GOBJECT2_INCLUDE_DIRS}
-@@ -70,30 +70,6 @@ FIND_LIBRARY(
- GOBJECT2_LIBRARY NAMES gobject-2.0
+@@ -71,30 +71,6 @@
HINTS ${PC_GOBJECT2_LIBDIR} ${PC_GOBJECT2_LIBRARY_DIRS})
--#
+ #
-# gio
-#
-PKG_CHECK_MODULES(PC_GIO2 REQUIRED gio-2.0)
@@ -128,10 +73,11 @@ index f178523..8da67fd 100644
- HINTS ${PC_GIO2_LIBDIR} ${PC_GIO2_LIBRARY_DIRS})
-
-
- #
+-#
# pango
#
-@@ -164,7 +140,7 @@ FIND_LIBRARY(
+ PKG_CHECK_MODULES(PC_PANGO REQUIRED pango)
+@@ -164,7 +140,7 @@
#
#
SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
@@ -140,10 +86,59 @@ index f178523..8da67fd 100644
INCLUDE(FindPackageHandleStandardArgs)
-diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
-index cd6ab1e..9a0f3bb 100644
---- a/gtkproxies/CMakeLists.txt
-+++ b/gtkproxies/CMakeLists.txt
+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
+@@ -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)
+ find_package(X11 REQUIRED)
+-find_package(GTK3 REQUIRED)
+-find_package(GSettingSchemas REQUIRED)
+
+ include_directories(
+- ${CMAKE_SOURCE_DIR}
+- ${CMAKE_SOURCE_DIR}/src
+- ${CMAKE_SOURCE_DIR}/src/ui
+- ${GTK3_INCLUDE_DIRS}
++ ${CMAKE_SOURCE_DIR}
++ ${CMAKE_SOURCE_DIR}/src
++ ${CMAKE_SOURCE_DIR}/src/ui
+ )
+
+ include(ECMSetupVersion)
+@@ -40,21 +37,21 @@
+ src/appearencegtk.cpp
+ src/abstractappearance.cpp
+ src/thread.cpp
+- src/installer.cpp
++ src/installer.cpp
+ src/gtkconfigkcmodule.cpp
+- src/dialog_installer.cpp
+- src/dialog_uninstaller.cpp
++ src/dialog_installer.cpp
++ src/dialog_uninstaller.cpp
+ src/fontshelpers.cpp
+ )
+
+-ki18n_wrap_ui(kcm_SRCS
+- src/ui/gui.ui
+- src/ui/dialog_installer.ui
++ki18n_wrap_ui(kcm_SRCS
++ src/ui/gui.ui
++ src/ui/dialog_installer.ui
+ src/ui/dialog_uninstaller.ui
+ )
+ add_library(kcm_kdegtkconfig MODULE ${kcm_SRCS})
+ target_compile_definitions(kcm_kdegtkconfig PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
+-target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} ${GIO2_LIBRARY} ${GLIB2_LIBRARY} ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} Qt5::Svg KF5::ConfigCore KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
++target_link_libraries(kcm_kdegtkconfig ${X11_Xcursor_LIB} Qt5::Svg KF5::ConfigCore KF5::I18n KF5::KIOWidgets KF5::NewStuff KF5::Archive KF5::NewStuff KF5::ConfigWidgets KF5::IconThemes)
+
+ 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
@@ -1,6 +1,6 @@
find_package(GTK2 REQUIRED)
@@ -152,10 +147,9 @@ index cd6ab1e..9a0f3bb 100644
add_executable(reload_gtk_apps reload.c)
target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
-diff --git a/src/appearancegtk3.cpp b/src/appearancegtk3.cpp
-index 113f5bc..6d3019f 100644
---- a/src/appearancegtk3.cpp
-+++ b/src/appearancegtk3.cpp
+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
@@ -1,5 +1,5 @@
/* KDE GTK Configuration Module
- *
@@ -192,7 +186,7 @@ index 113f5bc..6d3019f 100644
QStringList AppearanceGTK3::installedThemes() const
{
QFileInfoList availableThemes;
-@@ -125,7 +120,7 @@ QString AppearanceGTK3::defaultConfigFile() const
+@@ -125,7 +120,7 @@
QString root = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
if(root.isEmpty())
root = QFileInfo(QDir::home(), ".config").absoluteFilePath();
@@ -201,7 +195,7 @@ index 113f5bc..6d3019f 100644
return root + '/' + configFileName();
}
-@@ -159,33 +154,6 @@ bool AppearanceGTK3::loadSettings()
+@@ -159,33 +154,6 @@
bool AppearanceGTK3::saveSettings() const
{
@@ -235,11 +229,10 @@ index 113f5bc..6d3019f 100644
auto cfg = KSharedConfig::openConfig(configFileName(), KConfig::NoGlobals);
return saveSettings(cfg);
}
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index e523444..4467f3b 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -2,7 +2,7 @@ macro(add_kgc_test name)
+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
+@@ -2,7 +2,7 @@
add_executable(${name} ${name}.cpp ${ARGV})
add_test(${name} ${name})
ecm_mark_as_test(${name})
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 07:14:29 +0000