Index: Mk/Uses/kde.mk =================================================================== --- Mk/Uses/kde.mk +++ Mk/Uses/kde.mk @@ -57,7 +57,7 @@ KDE4_VERSION?= 4.14.3 KDE4_KDELIBS_VERSION= 4.14.30 KDE4_ACTIVITIES_VERSION= 4.13.3 -KDE4_WORKSPACE_VERSION= 4.11.21 +KDE4_WORKSPACE_VERSION= 4.11.22 KDE4_KDEPIM_VERSION?= 4.14.10 # Applications version for the kde4-applications. KDE4_APPLICATIONS_BRANCH?= Attic Index: sysutils/ksysguardd/Makefile =================================================================== --- sysutils/ksysguardd/Makefile +++ sysutils/ksysguardd/Makefile @@ -2,10 +2,8 @@ PORTNAME= ksysguardd PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= sysutils kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= sysutils kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE System Guard Daemon @@ -15,6 +13,8 @@ CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ -DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc" +KDE_APPLICATIONS_VERSION= 15.08.0 + EXTRACT_AFTER_ARGS= '${DISTNAME}/ksysguard/${PORTNAME}' \ '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ '${DISTNAME}/ksysguard/gui/SignalIDs.h' Index: sysutils/ksysguardd/files/patch-modules.h =================================================================== --- /dev/null +++ sysutils/ksysguardd/files/patch-modules.h @@ -0,0 +1,13 @@ +* Silence a syntax warning + +--- modules.h.orig 2015-08-12 07:03:15 UTC ++++ modules.h +@@ -144,7 +144,7 @@ struct SensorModul SensorModulList[] = { + { "Uptime", initUptime, exitUptime, NULLIVFUNC, NULLVVFUNC, 0, NULLTIME }, + #endif /* OSTYPE_Linux */ + +-#if defined OSTYPE_FreeBSD || defined OSTYPE_DragonFly ++#if defined(OSTYPE_FreeBSD) || defined(OSTYPE_DragonFly) + { "Acpi", initACPI, exitACPI, updateACPI, NULLVVFUNC, 0, NULLTIME }, + #ifdef __i386__ + { "Apm", initApm, exitApm, updateApm, NULLVVFUNC, 0, NULLTIME }, Index: x11/kde4-workspace/Makefile =================================================================== --- x11/kde4-workspace/Makefile +++ x11/kde4-workspace/Makefile @@ -2,10 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 7 -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src -DIST_SUBDIR= KDE/${PORTVERSION} +CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop @@ -14,6 +11,8 @@ 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 \ @@ -42,18 +41,20 @@ USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ pkgconfig shebangfix tar:xz -USE_GL= glu -USE_GNOME= glib20 +USE_GL= gl glu +USE_GNOME= glib20 libxml2 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons4 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi USE_QT4= corelib dbus declarative designer_build gui network \ - opengl phonon qtestlib script sql webkit xml \ + opengl phonon qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build -USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \ - xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst +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 \ Index: x11/kde4-workspace/distinfo =================================================================== --- x11/kde4-workspace/distinfo +++ x11/kde4-workspace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466144753 -SHA256 (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 7196c68802af335b15a3b8e14c55a15ed7c2c0e9145a047dc6d4a281fe7f7c8f -SIZE (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 13550508 +TIMESTAMP = 1490594696 +SHA256 (KDE/4.11.22/kde-workspace-4.11.22.tar.xz) = f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 +SIZE (KDE/4.11.22/kde-workspace-4.11.22.tar.xz) = 13553668 Index: x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt =================================================================== --- /dev/null +++ x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt @@ -0,0 +1,13 @@ +* build fails with bare -lXss, the macro uses proper path for libXss +* +--- plasma/generic/applets/systemtray/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC ++++ plasma/generic/applets/systemtray/CMakeLists.txt +@@ -43,7 +43,7 @@ include (CheckLibraryExists) + check_library_exists (Xss XScreenSaverQueryInfo "" HAVE_LIBXSS) + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + IF (HAVE_LIBXSS) +- SET (IDLE_DETECTION_LIB "Xss") ++ SET (IDLE_DETECTION_LIB ${X11_Xss_LIB}) + ENDIF (HAVE_LIBXSS) + + kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS}) Index: x11/plasma-scriptengine-python/Makefile =================================================================== --- x11/plasma-scriptengine-python/Makefile +++ x11/plasma-scriptengine-python/Makefile @@ -2,10 +2,8 @@ PORTNAME= plasma-scriptengine-python PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= x11 kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Python @@ -15,6 +13,8 @@ USE_QT4= qmake_build moc_build uic_build rcc_build DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo +KDE_APPLICATIONS_VERSION= 15.08.0 + CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python pre-configure: Index: x11/plasma-scriptengine-python/pkg-plist =================================================================== --- x11/plasma-scriptengine-python/pkg-plist +++ x11/plasma-scriptengine-python/pkg-plist @@ -1,21 +1,15 @@ %%PYTHON_SITELIBDIR%%/PyKDE4/plasmascript.py %%PYTHON_SITELIBDIR%%/PyKDE4/%%PYCACHE%%plasmascript.%%PYC_SUFFIX%% -%%PYTHON_SITELIBDIR%%/PyKDE4/%%PYCACHE%%plasmascript.%%PYO_SUFFIX%% share/apps/plasma_scriptengine_python/plasma_importer.py share/apps/plasma_scriptengine_python/%%PYCACHE%%plasma_importer.%%PYC_SUFFIX%% -share/apps/plasma_scriptengine_python/%%PYCACHE%%plasma_importer.%%PYO_SUFFIX%% share/apps/plasma_scriptengine_python/pyappletscript.py share/apps/plasma_scriptengine_python/%%PYCACHE%%pyappletscript.%%PYC_SUFFIX%% -share/apps/plasma_scriptengine_python/%%PYCACHE%%pyappletscript.%%PYO_SUFFIX%% share/apps/plasma_scriptengine_python/pydataengine.py share/apps/plasma_scriptengine_python/%%PYCACHE%%pydataengine.%%PYC_SUFFIX%% -share/apps/plasma_scriptengine_python/%%PYCACHE%%pydataengine.%%PYO_SUFFIX%% share/apps/plasma_scriptengine_python/pyrunner.py share/apps/plasma_scriptengine_python/%%PYCACHE%%pyrunner.%%PYC_SUFFIX%% -share/apps/plasma_scriptengine_python/%%PYCACHE%%pyrunner.%%PYO_SUFFIX%% share/apps/plasma_scriptengine_python/pywallpaper.py share/apps/plasma_scriptengine_python/%%PYCACHE%%pywallpaper.%%PYC_SUFFIX%% -share/apps/plasma_scriptengine_python/%%PYCACHE%%pywallpaper.%%PYO_SUFFIX%% share/kde4/services/plasma-scriptengine-applet-python.desktop share/kde4/services/plasma-scriptengine-dataengine-python.desktop share/kde4/services/plasma-scriptengine-runner-python.desktop Index: x11/plasma-scriptengine-ruby/Makefile =================================================================== --- x11/plasma-scriptengine-ruby/Makefile +++ x11/plasma-scriptengine-ruby/Makefile @@ -2,10 +2,8 @@ PORTNAME= plasma-scriptengine-ruby PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= x11 kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Ruby @@ -16,6 +14,8 @@ USE_RUBY= yes DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo +KDE_APPLICATIONS_VERSION= 15.08.0 + CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby .include