From d7dc9cd0d28ce73f2e49a8a13c594babe63dd35c Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 31 Jul 2013 18:15:53 +0000 Subject: [PATCH] fixed a patch which was rejected, i wonder why it was still there... --- .../kde-4.10/kdebindings/smokegen-nix.patch | 55 ++++--------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch index 03df484b63e4..53257e836e04 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch @@ -1,46 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79945c4..a244d0f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,10 +32,6 @@ set(generator_SRC - type.cpp - ) +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@") --# force RPATH so that the binary is usable from within the build tree --set (CMAKE_SKIP_BUILD_RPATH FALSE) --set (CMAKE_SKIP_RPATH FALSE) -- - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) + find_library(SMOKE_BASE_LIBRARY smokebase +- PATHS "@SMOKE_LIBRARY_PREFIX@" +- NO_DEFAULT_PATH) ++ PATHS "@SMOKE_LIBRARY_PREFIX@") - add_executable(smokegen ${generator_SRC}) -diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in -index 947315c..de8d66c 100644 ---- a/cmake/SmokeConfig.cmake.in -+++ b/cmake/SmokeConfig.cmake.in -@@ -44,21 +44,19 @@ macro (find_smoke_component name) - set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "") - - find_path(SMOKE_${uppercase}_INCLUDE_DIR -- ${lowercase}_smoke.h -- PATH ${SMOKE_INCLUDE_DIR} -- NO_DEFAULT_PATH -+ ${lowercase}_smoke.h -+ HINTS ${SMOKE_INCLUDE_DIR} -+ PATH_SUFFIXES smoke - ) - if(WIN32) - # DLLs are in the bin directory. - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@CMAKE_INSTALL_PREFIX@/bin" -- NO_DEFAULT_PATH) -+ PATHS "@CMAKE_INSTALL_PREFIX@/bin") - else(WIN32) - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - endif(WIN32) - - if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY) + if (NOT SMOKE_BASE_LIBRARY) + if (Smoke_FIND_REQUIRED)