diff options
Diffstat (limited to 'science')
| -rw-r--r-- | science/step-kde4/Makefile | 2 | ||||
| -rw-r--r-- | science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake | 69 |
2 files changed, 70 insertions, 1 deletions
diff --git a/science/step-kde4/Makefile b/science/step-kde4/Makefile index c9593ef9a724..6e70a590128f 100644 --- a/science/step-kde4/Makefile +++ b/science/step-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science kde kde-kde4 MAINTAINER= kde@FreeBSD.org diff --git a/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake b/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake new file mode 100644 index 000000000000..9c3ec797d98d --- /dev/null +++ b/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake @@ -0,0 +1,69 @@ +Backport several commits from +https://cgit.kde.org/plasma-workspace.git/tree/cmake/FindQalculate.cmake +to make compatible with libqalculate >= 2.0.0. Specifically: +8b3f6ac7a959300803334f6959184a6df34360f0 +b915e5b4bab10af938441ac5cae8e62cf6bbb843 +2aa504340e68ac11ac68a7b9573354ad431f2995 + +--- cmake/modules/FindQalculate.cmake.orig 2014-10-14 06:53:43 UTC ++++ cmake/modules/FindQalculate.cmake +@@ -22,22 +43,49 @@ if(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) + + else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) + if(NOT WIN32) +- include(UsePkgConfig) ++ find_package(PkgConfig) + + if(QALCULATE_MIN_VERSION) +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --atleast-version=${QALCULATE_MIN_VERSION} RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) ++ pkg_check_modules(_pc_QALCULATE libqalculate>=${QALCULATE_MIN_VERSION}) + else(QALCULATE_MIN_VERSION) +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull) ++ pkg_check_modules(_pc_QALCULATE libqalculate) + endif(QALCULATE_MIN_VERSION) + +- if(_return_VALUE STREQUAL "0") +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --libs OUTPUT_VARIABLE QALCULATE_LIBRARIES) +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS cln --libs OUTPUT_VARIABLE CLN_LIBRARIES) +- exec_program(${PKGCONFIG_EXECUTABLE} ARGS libqalculate --cflags OUTPUT_VARIABLE QALCULATE_CFLAGS) +- set(QALCULATE_FOUND TRUE) +- message(STATUS "qalculate found and cln is:" ${CLN_LIBRARIES}) +- endif(_return_VALUE STREQUAL "0") ++ if(_pc_QALCULATE_FOUND) ++ if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) ++ pkg_check_modules(_pc_CLN cln) ++ endif() ++ set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS}) ++ endif() + ++ find_library(QALCULATE_LIBRARIES ++ NAMES ++ qalculate ++ PATHS ++ ${_pc_QALCULATE_LIBRARY_DIRS} ++ ${LIB_INSTALL_DIR} ++ ) ++ ++ find_path(QALCULATE_INCLUDE_DIR ++ NAMES ++ libqalculate ++ PATHS ++ ${_pc_QALCULATE_INCLUDE_DIRS} ++ ${INCLUDE_INSTALL_DIR} ++ ) ++ ++ if(_pc_QALCULATE_FOUND) ++ if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) ++ find_library(CLN_LIBRARIES ++ NAMES ++ cln ++ PATHS ++ ${_pc_CLN_LIBRARY_DIRS} ++ ${LIB_INSTALL_DIR} ++ ) ++ endif() ++ endif() ++ + else(NOT WIN32) + # XXX: currently no libqalculate on windows + set(QALCULATE_FOUND FALSE) |