forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kde-misc/kde-gtk-config: backport patch from upstream fixing build wi…
…th kde-base/kdelibs-4.14.11 Gentoo-bug: 558388 Package-Manager: portage-2.2.20.1
- Loading branch information
1 parent
5201365
commit c27d311
Showing
2 changed files
with
54 additions
and
0 deletions.
There are no files selected for viewing
52 changes: 52 additions & 0 deletions
52
kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From 386f6af25a4f5276765a121f98dd00d0bf6a743d Mon Sep 17 00:00:00 2001 | ||
From: David Faure <[email protected]> | ||
Date: Sun, 26 Jul 2015 17:04:43 +0200 | ||
Subject: [PATCH] set proper cmake min req, matching kdelibs4, before project; | ||
fix build accordingly | ||
|
||
--- | ||
CMakeLists.txt | 2 +- | ||
gtk3proxies/CMakeLists.txt | 2 +- | ||
gtkproxies/CMakeLists.txt | 2 +- | ||
3 files changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 0ef2243..9d77fcd 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -1,5 +1,5 @@ | ||
+cmake_minimum_required(VERSION 2.8.9) | ||
project(kdegtkconfig) | ||
-cmake_minimum_required(VERSION 2.6) | ||
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) | ||
|
||
find_package(KDE4 REQUIRED) | ||
diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt | ||
index 856a3f6..d43597e 100644 | ||
--- a/gtk3proxies/CMakeLists.txt | ||
+++ b/gtk3proxies/CMakeLists.txt | ||
@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED) | ||
|
||
include_directories(${GTK3_INCLUDE_DIRS}) | ||
|
||
-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") | ||
+add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") | ||
|
||
add_executable(gtk3_preview preview3.c) | ||
target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY}) | ||
diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt | ||
index 9821cbf..18ee2d5 100644 | ||
--- a/gtkproxies/CMakeLists.txt | ||
+++ b/gtkproxies/CMakeLists.txt | ||
@@ -6,7 +6,7 @@ add_executable(reload_gtk_apps reload.c) | ||
target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES}) | ||
install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") | ||
|
||
-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") | ||
+add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") | ||
|
||
add_executable(gtk_preview preview.c) | ||
target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY}) | ||
-- | ||
2.4.6 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters