diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2018-02-26 19:22:36 +0800 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-02-26 19:22:36 +0800 |
| commit | ff9dc9b22b5e05527cf3341a1e0f9fffa8ef550b (patch) | |
| tree | 5482c3a59fe2095b80026f1854bfa7dae1ec1d0f /x11 | |
| parent | 31d1cf70b46097603968a75a3cbd689f4caa287c (diff) | |
| download | freebsd-ports-gnome-ff9dc9b22b5e05527cf3341a1e0f9fffa8ef550b.tar.gz freebsd-ports-gnome-ff9dc9b22b5e05527cf3341a1e0f9fffa8ef550b.tar.zst freebsd-ports-gnome-ff9dc9b22b5e05527cf3341a1e0f9fffa8ef550b.zip | |
math/libqalculate: Update to 2.2.1
math/qalculate: Update to 2.2.1
Download the pre-rolled releases hosted on GitHub instead of using USE_GITHUB
to avoid running autoreconf, etc.
Backport upsteam patches for several instances of FindQalculate.cmake in KDE 4.x
ports that could not detect the newer libqalculate.
Bump PORTREVISION on dependent ports due to shared library version increase.
Changes: https://qalculate.github.io/news.html
Differential Revision: https://reviews.freebsd.org/D14459
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde-workspace-kde4/Makefile | 2 | ||||
| -rw-r--r-- | x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake | 67 |
2 files changed, 68 insertions, 1 deletions
diff --git a/x11/kde-workspace-kde4/Makefile b/x11/kde-workspace-kde4/Makefile index 470ee050cb9f..723de9a2c05d 100644 --- a/x11/kde-workspace-kde4/Makefile +++ b/x11/kde-workspace-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 diff --git a/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake b/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake new file mode 100644 index 000000000000..c7f17c1edfe3 --- /dev/null +++ b/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake @@ -0,0 +1,67 @@ +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 2015-08-12 07:03:15 UTC ++++ cmake/modules/FindQalculate.cmake +@@ -22,20 +43,48 @@ 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) +- 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 |