Index: head/deskutils/kdeplasma-addons/Makefile =================================================================== --- head/deskutils/kdeplasma-addons/Makefile (revision 447194) +++ head/deskutils/kdeplasma-addons/Makefile (revision 447195) @@ -1,49 +1,49 @@ # $FreeBSD$ PORTNAME= kdeplasma-addons PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 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 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 CONFLICTS_INSTALL= plasma-applet-icontasks-0.[89].* USES= cmake:outsource 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/math/cantor/Makefile =================================================================== --- head/math/cantor/Makefile (revision 447194) +++ head/math/cantor/Makefile (revision 447195) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= cantor PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 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 USES= cmake:outsource kde:4 pkgconfig python:2 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/libqalculate/Makefile =================================================================== --- head/math/libqalculate/Makefile (revision 447194) +++ head/math/libqalculate/Makefile (revision 447195) @@ -1,39 +1,36 @@ # Created by: Sergey Akifyev # $FreeBSD$ PORTNAME= libqalculate -PORTVERSION= 0.9.10 +DISTVERSION= 1.0.0a DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= math MAINTAINER= jhale@FreeBSD.org COMMENT= Multi-purpose desktop calculator (backend library) -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcln.so:math/cln -USES= autoreconf gmake gettext libtool \ - localbase pathfix pkgconfig readline:port +USES= autoreconf gmake gettext libtool localbase \ + ncurses pathfix pkgconfig readline:port USE_GNOME= glib20 intltool libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes GH_ACCOUNT= Qalculate OPTIONS_DEFINE= NLS OPTIONS_SUB= yes - -.include post-patch-NLS-off: @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.am post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.am .include Index: head/math/libqalculate/distinfo =================================================================== --- head/math/libqalculate/distinfo (revision 447194) +++ head/math/libqalculate/distinfo (revision 447195) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476486857 -SHA256 (Qalculate-libqalculate-v0.9.10_GH0.tar.gz) = f19f13c06c11f2e576d4c95b48c87417649f4ad598127e9759316b6e4b601f72 -SIZE (Qalculate-libqalculate-v0.9.10_GH0.tar.gz) = 573204 +TIMESTAMP = 1501594307 +SHA256 (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 3d9e9e983cf1bfded8063e4704587d42e2253cbfc5d60a9ecefc1b9b43ab2f8a +SIZE (Qalculate-libqalculate-v1.0.0a_GH0.tar.gz) = 599217 Index: head/math/libqalculate/files/patch-git_issue38 =================================================================== --- head/math/libqalculate/files/patch-git_issue38 (nonexistent) +++ head/math/libqalculate/files/patch-git_issue38 (revision 447195) @@ -0,0 +1,68 @@ +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 ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/math/libqalculate/pkg-plist (revision 447194) +++ head/math/libqalculate/pkg-plist (revision 447195) @@ -1,31 +1,31 @@ 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.6 -lib/libqalculate.so.6.0.0 +lib/libqalculate.so.10 +lib/libqalculate.so.10.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/functions.xml share/qalculate/planets.xml share/qalculate/prefixes.xml share/qalculate/units.xml share/qalculate/variables.xml Index: head/math/qalculate/Makefile =================================================================== --- head/math/qalculate/Makefile (revision 447194) +++ head/math/qalculate/Makefile (revision 447195) @@ -1,34 +1,33 @@ # Created by: Sergey Akifyev # $FreeBSD$ PORTNAME= qalculate -PORTVERSION= 0.9.9 -PORTREVISION= 1 +PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v CATEGORIES= math MAINTAINER= jhale@FreeBSD.org COMMENT= Multi-purpose desktop calculator (GTK+3 frontend) 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 \ libtool:build localbase pkgconfig USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 GNU_CONFIGURE= yes DATADIR= share/${GH_PROJECT} DOCSDIR= share/doc/${GH_PROJECT} USE_GITHUB= yes GH_ACCOUNT= Qalculate GH_PROJECT= ${PORTNAME}-gtk .include Index: head/math/qalculate/distinfo =================================================================== --- head/math/qalculate/distinfo (revision 447194) +++ head/math/qalculate/distinfo (revision 447195) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476485110 -SHA256 (Qalculate-qalculate-gtk-v0.9.9_GH0.tar.gz) = 6f62dc3c7a908be196c56bb7ef6841cc94a88f8b9d9df87f8af5791a995f316d -SIZE (Qalculate-qalculate-gtk-v0.9.9_GH0.tar.gz) = 1686275 +TIMESTAMP = 1501601677 +SHA256 (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = f314153b376411e752924e513b0cfb9d89caac116aa151a896fd36c7dc344f23 +SIZE (Qalculate-qalculate-gtk-v1.0.0_GH0.tar.gz) = 1731963 Index: head/science/step/Makefile =================================================================== --- head/science/step/Makefile (revision 447194) +++ head/science/step/Makefile (revision 447195) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 interactive physics simulator BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 LIB_DEPENDS= libqalculate.so:math/libqalculate \ libgsl.so:math/gsl USES= cmake:outsource 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/x11/kde4-workspace/Makefile =================================================================== --- head/x11/kde4-workspace/Makefile (revision 447194) +++ head/x11/kde4-workspace/Makefile (revision 447195) @@ -1,140 +1,140 @@ # $FreeBSD$ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit \ 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 \ ${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/kde4-base-artwork 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 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 RUBY_DESC= Ruby plasmoids support RUBY_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby 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/kde4-wallpapers \ ${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd .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 post-install-GSTREAMER-on: @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} post-install-GSTREAMER-off: @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} .include