Date: Mon, 26 Feb 2018 11:22:36 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463014 - in head: deskutils/kdeplasma-addons-kde4 deskutils/kdeplasma-addons-kde4/files math/cantor-kde4 math/cantor-kde4/files math/libqalculate math/libqalculate/files math/qalculate... Message-ID: <201802261122.w1QBMa3n072163@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Mon Feb 26 11:22:36 2018 New Revision: 463014 URL: https://svnweb.freebsd.org/changeset/ports/463014 Log: 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 Added: head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake (contents, props changed) head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake (contents, props changed) head/science/step-kde4/files/ head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake (contents, props changed) head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake (contents, props changed) Deleted: head/math/libqalculate/files/ Modified: head/deskutils/kdeplasma-addons-kde4/Makefile head/math/cantor-kde4/Makefile head/math/libqalculate/Makefile head/math/libqalculate/distinfo head/math/libqalculate/pkg-plist head/math/qalculate/Makefile head/math/qalculate/distinfo head/math/qalculate/pkg-plist head/science/step-kde4/Makefile head/x11/kde-workspace-kde4/Makefile Modified: head/deskutils/kdeplasma-addons-kde4/Makefile ============================================================================== --- head/deskutils/kdeplasma-addons-kde4/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/deskutils/kdeplasma-addons-kde4/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,7 +2,7 @@ PORTNAME= kdeplasma-addons PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org Added: head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake Mon Feb 26 11:22:36 2018 (r463014) @@ -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 + +--- applets/qalculate/cmake_modules/FindQalculate.cmake.orig 2014-10-25 07:17:51 UTC ++++ applets/qalculate/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 Modified: head/math/cantor-kde4/Makefile ============================================================================== --- head/math/cantor-kde4/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/cantor-kde4/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,7 +2,7 @@ PORTNAME= cantor PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= math kde kde-kde4 MAINTAINER= kde@FreeBSD.org Added: head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake Mon Feb 26 11:22:36 2018 (r463014) @@ -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/FindQalculate.cmake.orig 2014-11-01 12:56:09 UTC ++++ cmake/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 Modified: head/math/libqalculate/Makefile ============================================================================== --- head/math/libqalculate/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/libqalculate/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= libqalculate -DISTVERSION= 1.0.0a -DISTVERSIONPREFIX= v +PORTVERSION= 2.2.1 CATEGORIES= math +MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ MAINTAINER= jhale@FreeBSD.org COMMENT= Multi-purpose desktop calculator (backend library) @@ -12,25 +12,26 @@ COMMENT= Multi-purpose desktop calculator (backend lib LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcln.so:math/cln +LIB_DEPENDS= libicuuc.so:devel/icu \ + libcurl.so:ftp/curl \ + libgmp.so:math/gmp \ + libmpfr.so:math/mpfr -USES= autoreconf gmake gettext libtool localbase \ +USES= gmake gettext iconv libtool localbase \ ncurses pathfix pkgconfig readline:port -USE_GNOME= glib20 intltool libxml2 +USE_GNOME= intltool libxml2 USE_LDCONFIG= yes + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USE_GITHUB= yes -GH_ACCOUNT= Qalculate - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes post-patch-NLS-off: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in .include <bsd.port.mk> Modified: head/math/libqalculate/distinfo ============================================================================== --- head/math/libqalculate/distinfo Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/libqalculate/distinfo Mon Feb 26 11:22:36 2018 (r463014) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501594307 -SHA256 (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 3d9e9e983cf1bfded8063e4704587d42e2253cbfc5d60a9ecefc1b9b43ab2f8a -SIZE (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 599217 +TIMESTAMP = 1518998683 +SHA256 (libqalculate-2.2.1.tar.gz) = 1752b6a046eaf84ee62a7dc8d2c874b538517956ce8affac80df09a3b55bef5d +SIZE (libqalculate-2.2.1.tar.gz) = 1717947 Modified: head/math/libqalculate/pkg-plist ============================================================================== --- head/math/libqalculate/pkg-plist Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/libqalculate/pkg-plist Mon Feb 26 11:22:36 2018 (r463014) @@ -14,8 +14,8 @@ include/libqalculate/qalculate.h include/libqalculate/util.h lib/libqalculate.a lib/libqalculate.so -lib/libqalculate.so.10 -lib/libqalculate.so.10.0.0 +lib/libqalculate.so.14 +lib/libqalculate.so.14.0.0 libdata/pkgconfig/libqalculate.pc %%NLS%%share/locale/fr/LC_MESSAGES/libqalculate.mo %%NLS%%share/locale/nl/LC_MESSAGES/libqalculate.mo @@ -24,8 +24,10 @@ libdata/pkgconfig/libqalculate.pc share/qalculate/currencies.xml share/qalculate/datasets.xml share/qalculate/elements.xml +share/qalculate/eurofxref-daily.xml share/qalculate/functions.xml share/qalculate/planets.xml share/qalculate/prefixes.xml +share/qalculate/rates.json share/qalculate/units.xml share/qalculate/variables.xml Modified: head/math/qalculate/Makefile ============================================================================== --- head/math/qalculate/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/qalculate/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,33 +2,38 @@ # $FreeBSD$ PORTNAME= qalculate -PORTVERSION= 1.0.0 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 2.2.1 CATEGORIES= math +MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/ +DISTNAME= ${GH_PROJECT}-${PORTVERSION} MAINTAINER= jhale@FreeBSD.org COMMENT= Multi-purpose desktop calculator (GTK+3 frontend) -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcln.so:math/cln \ - libqalculate.so:math/libqalculate -RUN_DEPENDS= gnuplot:math/gnuplot \ - wget:ftp/wget - BROKEN_powerpc64= fails to compile: main.cc: undefined reference to Calculator::temporaryCategory[abi:cxx11]() -USES= autoreconf compiler:c++11-lang gettext gmake \ +LIB_DEPENDS= libqalculate.so:math/libqalculate +RUN_DEPENDS= gnuplot:math/gnuplot + +USES= compiler:c++11-lang gettext gmake \ libtool:build localbase pkgconfig USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 + +# USE_GITHUB= Use MASTER_SITES so that the pre-rolled release is downloaded +GH_ACCOUNT= Qalculate +GH_PROJECT= ${PORTNAME}-gtk + GNU_CONFIGURE= yes DATADIR= share/${GH_PROJECT} DOCSDIR= share/doc/${GH_PROJECT} -USE_GITHUB= yes -GH_ACCOUNT= Qalculate -GH_PROJECT= ${PORTNAME}-gtk +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +post-patch-NLS-off: + @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in .include <bsd.port.mk> Modified: head/math/qalculate/distinfo ============================================================================== --- head/math/qalculate/distinfo Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/qalculate/distinfo Mon Feb 26 11:22:36 2018 (r463014) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501601677 -SHA256 (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = f314153b376411e752924e513b0cfb9d89caac116aa151a896fd36c7dc344f23 -SIZE (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = 1731963 +TIMESTAMP = 1519000762 +SHA256 (qalculate-gtk-2.2.1.tar.gz) = 8bccd336c8b591c33e52d554fdd2c57ca7db6e34420da1e0ad10a15f984f129b +SIZE (qalculate-gtk-2.2.1.tar.gz) = 2340404 Modified: head/math/qalculate/pkg-plist ============================================================================== --- head/math/qalculate/pkg-plist Mon Feb 26 11:10:46 2018 (r463013) +++ head/math/qalculate/pkg-plist Mon Feb 26 11:22:36 2018 (r463014) @@ -6,6 +6,7 @@ share/applications/qalculate-gtk.desktop %%DOCSDIR%%/html/figures/completion.png %%DOCSDIR%%/html/figures/convert-number-bases.png %%DOCSDIR%%/html/figures/convert-unit.png +%%DOCSDIR%%/html/figures/edit-function-simplified.png %%DOCSDIR%%/html/figures/edit-function.png %%DOCSDIR%%/html/figures/edit-matrix.png %%DOCSDIR%%/html/figures/edit-unit.png @@ -28,34 +29,11 @@ share/applications/qalculate-gtk.desktop %%DOCSDIR%%/html/qalculate-expressions.html %%DOCSDIR%%/html/qalculate-functions.html %%DOCSDIR%%/html/qalculate-introduction.html +%%DOCSDIR%%/html/qalculate-mode.html %%DOCSDIR%%/html/qalculate-plotting.html -%%DOCSDIR%%/html/qalculate-result.html %%DOCSDIR%%/html/qalculate-units.html %%DOCSDIR%%/html/qalculate-user-interface.html %%DOCSDIR%%/html/qalculate-variables.html -share/locale/nl/LC_MESSAGES/qalculate-gtk.mo -share/locale/sv/LC_MESSAGES/qalculate-gtk.mo +%%NLS%%share/locale/nl/LC_MESSAGES/qalculate-gtk.mo +%%NLS%%share/locale/sv/LC_MESSAGES/qalculate-gtk.mo share/pixmaps/qalculate.png -%%DATADIR%%/ui/argumentrules.ui -%%DATADIR%%/ui/csvexport.ui -%%DATADIR%%/ui/csvimport.ui -%%DATADIR%%/ui/datasetedit.ui -%%DATADIR%%/ui/datasets.ui -%%DATADIR%%/ui/decimals.ui -%%DATADIR%%/ui/functionedit.ui -%%DATADIR%%/ui/functions.ui -%%DATADIR%%/ui/main.ui -%%DATADIR%%/ui/matrix.ui -%%DATADIR%%/ui/matrixedit.ui -%%DATADIR%%/ui/namesedit.ui -%%DATADIR%%/ui/nbases.ui -%%DATADIR%%/ui/periodictable.ui -%%DATADIR%%/ui/plot.ui -%%DATADIR%%/ui/precision.ui -%%DATADIR%%/ui/preferences.ui -%%DATADIR%%/ui/setbase.ui -%%DATADIR%%/ui/unitedit.ui -%%DATADIR%%/ui/units.ui -%%DATADIR%%/ui/unknownedit.ui -%%DATADIR%%/ui/variableedit.ui -%%DATADIR%%/ui/variables.ui Modified: head/science/step-kde4/Makefile ============================================================================== --- head/science/step-kde4/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/science/step-kde4/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,7 +2,7 @@ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science kde kde-kde4 MAINTAINER= kde@FreeBSD.org Added: head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake Mon Feb 26 11:22:36 2018 (r463014) @@ -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) Modified: head/x11/kde-workspace-kde4/Makefile ============================================================================== --- head/x11/kde-workspace-kde4/Makefile Mon Feb 26 11:10:46 2018 (r463013) +++ head/x11/kde-workspace-kde4/Makefile Mon Feb 26 11:22:36 2018 (r463014) @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 Added: head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake Mon Feb 26 11:22:36 2018 (r463014) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802261122.w1QBMa3n072163>