Index: head/deskutils/kdeplasma-addons-kde4/Makefile =================================================================== --- head/deskutils/kdeplasma-addons-kde4/Makefile (revision 463013) +++ head/deskutils/kdeplasma-addons-kde4/Makefile (revision 463014) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= kdeplasma-addons PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Extra plasmoids for KDE SC 4 LIB_DEPENDS= libqalculate.so:math/libqalculate \ libqwt.so:x11-toolkits/qwt5 \ libqca.so:devel/qca \ libqoauth.so:net/qoauth \ libqjson.so:devel/qjson CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* USES= cmake:outsource eigen:2 kde:4 pkgconfig shared-mime-info tar:xz USE_KDE= kdelibs libkexiv2 pimlibs workspace \ akonadi attica automoc4 qimageblitz soprano USE_QT4= corelib dbus declarative gui network script sql webkit \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 xrender xtst USE_LDCONFIG= yes OPTIONS_DEFINE= MARBLE SCIM IBUS OPTIONS_DEFAULT= MARBLE OPTIONS_SUB= yes MARBLE_DESC= Support for desktop globe wallpaper MARBLE_USE= KDE=marble MARBLE_CMAKE_OFF= -DWITH_Marble=off IBUS_DESC= Enable IBUS backend for input dialog IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus IBUS_CMAKE_OFF= -DBUILD_ibus=off SCIM_DESC= Enable SCIM backend for input dialog SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim SCIM_CMAKE_OFF= -DBUILD_scim=off post-patch: # Respect prefix, don't update MIME when installing. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \ ${WRKSRC}/applets/lancelot/parts/CMakeLists.txt .include Index: head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake =================================================================== --- head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake (nonexistent) +++ head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake (revision 463014) @@ -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 Property changes on: head/deskutils/kdeplasma-addons-kde4/files/patch-applets_qalculate_cmake__modules_FindQalculate.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/cantor-kde4/Makefile =================================================================== --- head/math/cantor-kde4/Makefile (revision 463013) +++ head/math/cantor-kde4/Makefile (revision 463014) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= cantor PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= math kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 frontend to mathematical software LIB_DEPENDS= libspectre.so:print/libspectre \ libqalculate.so:math/libqalculate \ libanalitza.so:math/analitza-kde4 USES= cmake:outsource kde:4 pkgconfig python:2.7 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= corelib qtestlib_build xml xmlpatterns \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= LUAJIT MAXIMA OCTAVE R SAGE SCILAB OPTIONS_SUB= yes # R LUAJIT LUAJIT_DESC= Build LuaJIT backend and install LuaJIT LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_CMAKE_OFF= -DWITH_LuaJIT:BOOL=FALSE MAXIMA_DESC= Install Maxima MAXIMA_RUN_DEPENDS= maxima:math/maxima OCTAVE_DESC= Install Octave OCTAVE_RUN_DEPENDS= octave:math/octave R_DESC= Build R backend and install R R_LIB_DEPENDS= libR.so:math/R # Required to set CFLAGS for -lgfortran. R_USES= fortran R_CMAKE_OFF= -DWITH_R:BOOL=FALSE SAGE_DESC= Install Sage SAGE_RUN_DEPENDS= sage:math/sage SCILAB_DESC= Install Scilab SCILAB_RUN_DEPENDS= scilab:math/scilab post-patch: ${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \ ${WRKSRC}/cmake/FindR.cmake .include Index: head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake =================================================================== --- head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake (nonexistent) +++ head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake (revision 463014) @@ -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 Property changes on: head/math/cantor-kde4/files/patch-cmake_FindQalculate.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/libqalculate/files/patch-libqalculate.pc.in =================================================================== --- head/math/libqalculate/files/patch-libqalculate.pc.in (revision 463013) +++ head/math/libqalculate/files/patch-libqalculate.pc.in (nonexistent) @@ -1,13 +0,0 @@ ---- libqalculate.pc.in.orig 2016-08-25 18:49:39 UTC -+++ libqalculate.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: libqalculate - Description: libqalculate --Requires: glib-2.0 libxml-2.0 -+Requires: cln glib-2.0 libxml-2.0 - Version: @VERSION@ - Libs: -L${libdir} -lqalculate --Cflags: -I${includedir} -\ No newline at end of file -+Cflags: -I${includedir} Property changes on: head/math/libqalculate/files/patch-libqalculate.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/libqalculate/files/patch-git_issue38 =================================================================== --- head/math/libqalculate/files/patch-git_issue38 (revision 463013) +++ head/math/libqalculate/files/patch-git_issue38 (nonexistent) @@ -1,68 +0,0 @@ -Prevent qalc from segfaulting if started and immediately exited. -See: https://github.com/Qalculate/libqalculate/issues/38 - -diff --git a/libqalculate/Calculator.cc b/libqalculate/Calculator.cc -index f5c183f..4963351 100644 ---- libqalculate/Calculator.cc.orig -+++ libqalculate/Calculator.cc -@@ -224,8 +226,11 @@ void autoConvert(const MathStructure &morig, MathStructure &mconv, const Evaluat - void CalculateThread::run() { - enableAsynchronousCancel(); - while(true) { -- bool b_parse = read(); -- void *x = read(); -+ bool failed = false; -+ bool b_parse = read(&failed); -+ if(failed) break; -+ void *x = read(&failed); -+ if(failed) break; - MathStructure *mstruct = (MathStructure*) x; - CALCULATOR->startControl(); - if(b_parse) { -diff --git a/libqalculate/util.h b/libqalculate/util.h -index 0edcb50..533f5c7 100644 ---- libqalculate/util.h.orig -+++ libqalculate/util.h -@@ -128,14 +128,16 @@ public: - protected: - virtual void run() = 0; - void enableAsynchronousCancel(); -- template T read() { -+ template T read(bool *failed = NULL) { - #ifdef _WIN32 - MSG msg; - int ret = GetMessage(&msg, NULL, WM_USER, WM_USER); -+ if(failed && (ret == 0 || ret == -1)) *failed = true; - return (T) msg.wParam; - #else - T x; -- fread(&x, sizeof(T), 1, m_pipe_r); -+ int ret = fread(&x, sizeof(T), 1, m_pipe_r); -+ if(failed && ret != 1) *failed = true; - return x; - #endif - } -diff --git a/src/qalc.cc b/src/qalc.cc -index 4a4e4b2..43c3556 100644 ---- src/qalc.cc.orig -+++ src/qalc.cc -@@ -2821,12 +2821,15 @@ void on_abort_display() { - - void ViewThread::run() { - while(true) { -- -- void *x = read(); -+ -+ bool failed = false; -+ void *x = read(&failed); -+ if(failed) break; - MathStructure m(*((MathStructure*) x)); - //bool b_stack = read(); -- read(); -- x = read(); -+ read(&failed); -+ x = read(&failed); -+ if(failed) break; - CALCULATOR->startControl(); - if(x) { - PrintOptions po; Property changes on: head/math/libqalculate/files/patch-git_issue38 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/libqalculate/Makefile =================================================================== --- head/math/libqalculate/Makefile (revision 463013) +++ head/math/libqalculate/Makefile (revision 463014) @@ -1,36 +1,37 @@ # Created by: Sergey Akifyev # $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) 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 Index: head/math/libqalculate/distinfo =================================================================== --- head/math/libqalculate/distinfo (revision 463013) +++ head/math/libqalculate/distinfo (revision 463014) @@ -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 Index: head/math/libqalculate/pkg-plist =================================================================== --- head/math/libqalculate/pkg-plist (revision 463013) +++ head/math/libqalculate/pkg-plist (revision 463014) @@ -1,31 +1,33 @@ bin/qalc include/libqalculate/BuiltinFunctions.h include/libqalculate/Calculator.h include/libqalculate/DataSet.h include/libqalculate/ExpressionItem.h include/libqalculate/Function.h include/libqalculate/MathStructure.h include/libqalculate/Number.h include/libqalculate/Prefix.h include/libqalculate/Unit.h include/libqalculate/Variable.h include/libqalculate/includes.h 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 %%NLS%%share/locale/sv/LC_MESSAGES/libqalculate.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libqalculate.mo 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 Index: head/math/qalculate/Makefile =================================================================== --- head/math/qalculate/Makefile (revision 463013) +++ head/math/qalculate/Makefile (revision 463014) @@ -1,34 +1,39 @@ # Created by: Sergey Akifyev # $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 Index: head/math/qalculate/distinfo =================================================================== --- head/math/qalculate/distinfo (revision 463013) +++ head/math/qalculate/distinfo (revision 463014) @@ -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 Index: head/math/qalculate/pkg-plist =================================================================== --- head/math/qalculate/pkg-plist (revision 463013) +++ head/math/qalculate/pkg-plist (revision 463014) @@ -1,61 +1,39 @@ bin/qalculate-gtk share/appdata/qalculate-gtk.appdata.xml share/applications/qalculate-gtk.desktop %%DOCSDIR%%/html/figures/calculation-history.png %%DOCSDIR%%/html/figures/calculator-buttons.png %%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 %%DOCSDIR%%/html/figures/edit-variable.png %%DOCSDIR%%/html/figures/function-manager.png %%DOCSDIR%%/html/figures/gnuplot.png %%DOCSDIR%%/html/figures/import-csv.png %%DOCSDIR%%/html/figures/insert-function.png %%DOCSDIR%%/html/figures/mainwindow.png %%DOCSDIR%%/html/figures/plot-data.png %%DOCSDIR%%/html/figures/plot-settings.png %%DOCSDIR%%/html/figures/rpn-mode.png %%DOCSDIR%%/html/figures/store-variable.png %%DOCSDIR%%/html/figures/unit-manager.png %%DOCSDIR%%/html/figures/variable-manager.png %%DOCSDIR%%/html/index.html %%DOCSDIR%%/html/qalculate-definitions-functions.html %%DOCSDIR%%/html/qalculate-definitions-units.html %%DOCSDIR%%/html/qalculate-definitions-variables.html %%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 Index: head/science/step-kde4/Makefile =================================================================== --- head/science/step-kde4/Makefile (revision 463013) +++ head/science/step-kde4/Makefile (revision 463014) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 interactive physics simulator LIB_DEPENDS= libqalculate.so:math/libqalculate \ libgsl.so:math/gsl USES= cmake:outsource eigen:2 kde:4 pkgconfig tar:xz USE_KDE= kdelibs automoc4 USE_QT4= opengl moc_build qmake_build rcc_build uic_build pre-configure: # Avoid building translations, should the user pass # CURRENT_LANG to CMake. ${REINPLACE_CMD} -e '/set(STEP_BUILD_TRANSLATIONS 1)/ d' \ ${WRKSRC}/${PORTNAME}/data/CMakeLists.txt .include Index: head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake =================================================================== --- head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake (nonexistent) +++ head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake (revision 463014) @@ -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) Property changes on: head/science/step-kde4/files/patch-cmake_modules_FindQalculate.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/kde-workspace-kde4/Makefile =================================================================== --- head/x11/kde-workspace-kde4/Makefile (revision 463013) +++ head/x11/kde-workspace-kde4/Makefile (revision 463014) @@ -1,148 +1,148 @@ # $FreeBSD$ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit2 \ libpci.so:devel/libpci \ libhal.so:sysutils/hal \ libqjson.so:devel/qjson \ libcln.so:math/cln \ libqalculate.so:math/libqalculate \ libprison.so:graphics/prison \ libboost_thread.so:devel/boost-libs \ libdbusmenu-qt.so:devel/libdbusmenu-qt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms BUILD_DEPENDS= xrdb:x11/xrdb RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xprop:x11/xprop \ xsetroot:x11/xsetroot \ xmessage:x11/xmessage \ xrdb:x11/xrdb \ mkfontdir:x11-fonts/mkfontdir \ xset:x11/xset \ setxkbmap:x11/setxkbmap \ ${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd-kde4 \ ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \ ${KDE_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \ ${LOCALBASE}/etc/pam.d/kde:security/pam_kde \ ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde-base-artwork-kde4 USES= cmake:outsource,noninja compiler:c++11-lib gettext gmake jpeg kde:4 \ pkgconfig shebangfix tar:xz USE_GL= gl glu USE_GNOME= glib20 libxml2 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons5 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xft xi xinerama xkbfile xpm xrandr xrender xres xscrnsaver xtst xxf86vm SHEBANG_FILES= kwin/clients/oxygen/data/update_oxygen.pl USE_LDCONFIG= yes KDE_APPLICATIONS_VERSION= 15.08.0 # clang 6.0 defaults to -std=gnu++14, but the port fails with too many errors # when built in C++11 (or later) mode. USE_CXXSTD= gnu++98 CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DBUILD_python:BOOL=OFF \ -DBUILD_ruby:BOOL=OFF \ -DWITH_Xmms:BOOL=OFF \ -DWITH_UDev:BOOL=OFF SUB_FILES= pkg-message USE_RC_SUBR= kdm4 USERS= kdm GROUPS= kdm OPTIONS_DEFINE= GLES GPS KACTIVITY UPOWER WALLPAPERS OPTIONS_GROUP= PHONON PLASMA OPTIONS_GROUP_PHONON= GSTREAMER VLC OPTIONS_GROUP_PLASMA= PYTHON RUBY OPTIONS_DEFAULT= GLES GPS KACTIVITY UPOWER VLC WALLPAPERS OPTIONS_SUB= yes # GPS GLES GLES_DESC= OpenGL ES 2.0 support in kwin and kinfocenter GLES_USE= GL=egl,glesv2 GLES_CMAKE_OFF= -DWITH_OpenGLES=off GPS_DESC= GPS geolocation via gpsd GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_CMAKE_ON= -DWITH_libgps:BOOL=ON GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF GSTREAMER_DESC= Multimedia via Phonon-GStreamer GSTREAMER_USE= QT4=phonon-gst_run KACTIVITY_DESC= Activity Manager daemon KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd PYTHON_DESC= Python plasmoids support PYTHON_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python-kde4 RUBY_DESC= Ruby plasmoids support RUBY_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby-kde4 UPOWER_DESC= Power management via UPower UPOWER_RUN_DEPENDS= ${LOCALBASE}/libexec/upowerd:sysutils/upower VLC_DESC= Multimedia via Phonon-VLC VLC_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc WALLPAPERS_DESC= Install official KDE wallpapers WALLPAPERS_RUN_DEPENDS= ${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde-wallpapers-kde4 \ ${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/wallpapers-freebsd-kde4 .if !exists(/usr/lib/libutempter.so) LIB_DEPENDS+= libutempter.so:sysutils/libutempter .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/startkde.cmake \ ${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \ ${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \ ${PATCH_WRKSRC}/kcontrol/keyboard/x11_helper.cpp \ ${PATCH_WRKSRC}/kdm/backend/client.c \ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \ ${PATCH_WRKSRC}/CMakeLists.txt pre-configure: ${REINPLACE_CMD} -e '/ksysguardd/ d' \ ${PATCH_WRKSRC}/ksysguard/CMakeLists.txt \ ${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt ${REINPLACE_CMD} -e '/PolicyKit/ d' \ ${PATCH_WRKSRC}/doc/CMakeLists.txt post-install: ${LN} -sf ${PREFIX}/bin/startkde ${STAGEDIR}${PREFIX}/bin/startkde4 # Install kde4.desktop to launch kde4 via sddm. ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_DATA} ${FILESDIR}/kde4.desktop ${STAGEDIR}${PREFIX}/share/xsessions post-install-GSTREAMER-on: @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} post-install-GSTREAMER-off: @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} .include Index: head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake =================================================================== --- head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake (nonexistent) +++ head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake (revision 463014) @@ -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 Property changes on: head/x11/kde-workspace-kde4/files/patch-cmake_modules_FindQalculate.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property