diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-08-23 03:04:40 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-08-23 03:04:40 +1000 |
| commit | c27d311c1b3fe28a5357a81c88beccefe21aff72 (patch) | |
| tree | f86b520978f9d439d8f33d890b02ddabca3ae330 /kde-misc | |
| parent | x11-libs/libkscreen: add upstream snapshot. (diff) | |
| download | gentoo-c27d311c1b3fe28a5357a81c88beccefe21aff72.tar.gz gentoo-c27d311c1b3fe28a5357a81c88beccefe21aff72.tar.bz2 gentoo-c27d311c1b3fe28a5357a81c88beccefe21aff72.zip | |
kde-misc/kde-gtk-config: backport patch from upstream fixing build with kde-base/kdelibs-4.14.11
Gentoo-bug: 558388
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch | 52 | ||||
| -rw-r--r-- | kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild | 2 |
2 files changed, 54 insertions, 0 deletions
diff --git a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch new file mode 100644 index 000000000000..ca20682104f3 --- /dev/null +++ b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch @@ -0,0 +1,52 @@ +From 386f6af25a4f5276765a121f98dd00d0bf6a743d Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +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 + diff --git a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild b/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild index 7f445b31b67b..d570c67276a7 100644 --- a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild +++ b/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild @@ -32,6 +32,8 @@ RDEPEND=" $(add_kdeapps_dep kcmshell) " +PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" ) + pkg_postinst() { kde4-base_pkg_postinst einfo |