From 7b5a92c49d752a8bed755aae0c11fd95e0c09c51 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 31 Jul 2013 18:15:53 +0000 Subject: fixed patch rejection and added RPATH magic --- .../kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch | 14 ++++++++++++++ .../kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch | 13 +++++++++++++ pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch | 13 ------------- pkgs/desktops/kde-4.10/kdebindings/smokegen.nix | 2 +- 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch create mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch new file mode 100644 index 000000000000..33ec3df6452d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch @@ -0,0 +1,14 @@ +--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000 ++++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000 +@@ -36,6 +36,10 @@ + set (CMAKE_SKIP_BUILD_RPATH FALSE) + set (CMAKE_SKIP_RPATH FALSE) + ++# add the automatically determined parts of the RPATH ++# which point to directories outside the build tree to the install RPATH ++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) + + add_executable(smokegen ${generator_SRC}) + diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch new file mode 100644 index 000000000000..53257e836e04 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch @@ -0,0 +1,13 @@ +diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in +--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 ++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 +@@ -80,8 +80,7 @@ + set(SMOKE_API_BIN "@SMOKE_API_BIN@") + + find_library(SMOKE_BASE_LIBRARY smokebase +- PATHS "@SMOKE_LIBRARY_PREFIX@" +- NO_DEFAULT_PATH) ++ PATHS "@SMOKE_LIBRARY_PREFIX@") + + if (NOT SMOKE_BASE_LIBRARY) + if (Smoke_FIND_REQUIRED) diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch deleted file mode 100644 index 53257e836e04..000000000000 --- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in ---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 -@@ -80,8 +80,7 @@ - set(SMOKE_API_BIN "@SMOKE_API_BIN@") - - find_library(SMOKE_BASE_LIBRARY smokebase -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - - if (NOT SMOKE_BASE_LIBRARY) - if (Smoke_FIND_REQUIRED) diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix index 8b5da2a641dd..0a3f2a85efaf 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix @@ -4,7 +4,7 @@ kde { buildInputs = [ qt4 ]; nativeBuildInputs = [ cmake ]; - patches = [ ./smokegen-nix.patch ]; + patches = [ ./smokegen-SmokeConfig.cmake.in-nix.patch ./smokegen-CMakeLists.txt-nix.patch ]; meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; -- cgit 1.4.1