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-CMakeLists.txt =================================================================== --- sysutils/ksysguardd/files/patch-CMakeLists.txt +++ sysutils/ksysguardd/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2014-10-10 07:47:23 UTC +--- CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ CMakeLists.txt @@ -7,16 +7,19 @@ include_directories( ${CMAKE_CURRENT_SOU # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc Index: sysutils/ksysguardd/files/patch-config-ksysguardd.h.cmake =================================================================== --- sysutils/ksysguardd/files/patch-config-ksysguardd.h.cmake +++ sysutils/ksysguardd/files/patch-config-ksysguardd.h.cmake @@ -1,5 +1,5 @@ ---- ./config-ksysguardd.h.cmake.orig 2011-02-25 22:54:48.000000000 +0100 -+++ ./config-ksysguardd.h.cmake 2011-03-05 16:30:54.367061295 +0100 +--- config-ksysguardd.h.cmake.orig 2015-08-12 07:03:15 UTC ++++ config-ksysguardd.h.cmake @@ -1,3 +1,4 @@ #cmakedefine HAVE_LMSENSORS 1 #cmakedefine HAVE_XRES 1 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 +KDE4_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-CMakeLists.txt =================================================================== --- x11/kde4-workspace/files/patch-CMakeLists.txt +++ x11/kde4-workspace/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ CMakeLists.txt @@ -198,7 +198,7 @@ if(NOT WIN32) configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) Index: x11/kde4-workspace/files/patch-ConfigureChecks.cmake =================================================================== --- x11/kde4-workspace/files/patch-ConfigureChecks.cmake +++ x11/kde4-workspace/files/patch-ConfigureChecks.cmake @@ -1,4 +1,4 @@ ---- ConfigureChecks.cmake.orig 2015-06-26 03:17:21 UTC +--- ConfigureChecks.cmake.orig 2015-08-12 07:03:15 UTC +++ ConfigureChecks.cmake @@ -21,16 +21,7 @@ if (PAM_FOUND) endmacro(define_pam_service) Index: x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt =================================================================== --- x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt +++ x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt @@ -1,4 +1,4 @@ ---- kdm/kfrontend/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- kdm/kfrontend/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ kdm/kfrontend/CMakeLists.txt @@ -111,6 +111,6 @@ install(TARGETS kdmctl ${INSTALL_TARGETS Index: x11/kde4-workspace/files/patch-kdm__backend__client.c =================================================================== --- x11/kde4-workspace/files/patch-kdm__backend__client.c +++ x11/kde4-workspace/files/patch-kdm__backend__client.c @@ -1,35 +0,0 @@ ---- kdm/backend/client.c.orig 2015-06-26 03:17:21 UTC -+++ kdm/backend/client.c -@@ -1322,6 +1322,9 @@ startClient(volatile int *pid) - char ckDeviceBuf[20] = ""; - const char *ckDevice = ckDeviceBuf; - dbus_bool_t isLocal; -+# ifdef BSD -+ FILE *proc; -+# endif - #endif - char *failsafeArgv[2]; - char *buf, *buf2; -@@ -1353,6 +1356,13 @@ startClient(volatile int *pid) - # ifdef HAVE_VTS - if (td->serverVT > 0) - sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT); -+# elif defined(BSD) -+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) { -+ fscanf( proc, "%s", ckDeviceBuf ); -+ pclose(proc); -+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0) -+ ckDeviceBuf[0] = '\0'; -+ } - # endif - isLocal = ((td->displayType & d_location) == dLocal); - # ifdef XDMCP -@@ -1532,7 +1542,7 @@ startClient(volatile int *pid) - environ = pam_env; - # endif - removeCreds = True; /* set it first - i don't trust PAM's rollback */ -- pretc = pam_setcred(pamh, 0); -+ pretc = pam_setcred(pamh, PAM_ESTABLISH_CRED); - reInitErrorLog(); - # ifndef HAVE_PAM_GETENVLIST - pam_env = environ; Index: x11/kde4-workspace/files/patch-kdm_backend_client.c =================================================================== --- x11/kde4-workspace/files/patch-kdm_backend_client.c +++ x11/kde4-workspace/files/patch-kdm_backend_client.c @@ -1,4 +1,4 @@ ---- kdm/backend/client.c.orig 2015-06-26 03:17:21 UTC +--- kdm/backend/client.c.orig 2015-08-12 07:03:15 UTC +++ kdm/backend/client.c @@ -1322,6 +1322,9 @@ startClient(volatile int *pid) char ckDeviceBuf[20] = ""; Index: x11/kde4-workspace/files/patch-kinfocenter =================================================================== --- x11/kde4-workspace/files/patch-kinfocenter +++ x11/kde4-workspace/files/patch-kinfocenter @@ -5,7 +5,7 @@ Improve GetInfo_ReadfromPipe function to use Qt types, pass program name and its parameters as separate arguments. ---- cmake/modules/FindBSDDevinfo.cmake.orig 2016-12-13 11:26:31 UTC +--- cmake/modules/FindBSDDevinfo.cmake.orig 2015-08-12 07:03:15 UTC +++ cmake/modules/FindBSDDevinfo.cmake @@ -0,0 +1,15 @@ +# Find FreeBSD devinfo library @@ -23,7 +23,7 @@ +find_package_handle_standard_args(BSDDEVINFO DEFAULT_MSG BSDDEVINFO_LIBRARY BSDDEVINFO_INCLUDE_DIR) + +mark_as_advanced(BSDDEVINFO_INCLUDE_DIR BSDDEVINFO_LIBRARY) ---- kinfocenter/Modules/base/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/base/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/base/CMakeLists.txt @@ -1,6 +1,7 @@ # TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later) @@ -34,7 +34,7 @@ +macro_bool_to_01(BSDDEVINFO_FOUND HAVE_DEVINFO_H) configure_file (../base/config-infocenter.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-infocenter.h ) ---- kinfocenter/Modules/base/info_fbsd.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/base/info_fbsd.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/base/info_fbsd.cpp @@ -15,8 +15,6 @@ */ @@ -290,7 +290,7 @@ new QTreeWidgetItem(tree, list); return 0; ---- kinfocenter/Modules/base/info_hpux.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/base/info_hpux.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/base/info_hpux.cpp @@ -30,6 +30,7 @@ along with this program. If not, see @@ -318,7 +318,7 @@ } /* Parts taken from fsusage.c from the Midnight Commander (mc) ---- kinfocenter/Modules/base/info_linux.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/base/info_linux.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/base/info_linux.cpp @@ -33,6 +33,7 @@ along with this program. If not, see @@ -344,7 +344,7 @@ /* if lspci failed, read the contents of /proc/pci */ return GetInfo_ReadfromFile(tree, INFO_PCI, 0); ---- kinfocenter/Modules/base/os_base.h.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/base/os_base.h.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/base/os_base.h @@ -330,12 +330,12 @@ static bool GetInfo_XServer_Generic(QTre } @@ -361,7 +361,7 @@ if (!proc.waitForFinished()) { // Process hanged or did not start return 0; ---- kinfocenter/Modules/info/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/info/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/info/CMakeLists.txt @@ -13,6 +13,9 @@ set(kcm_info_PART_SRCS main.cpp info.cpp kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS}) Index: x11/kde4-workspace/files/patch-kinfocenter_Modules_pci_kpci.cpp =================================================================== --- x11/kde4-workspace/files/patch-kinfocenter_Modules_pci_kpci.cpp +++ x11/kde4-workspace/files/patch-kinfocenter_Modules_pci_kpci.cpp @@ -1,7 +1,7 @@ * Obey user's unit preferences when displaying PCI info. * Use correct units, someone forgot about terabytes * ---- kinfocenter/Modules/pci/kpci.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/pci/kpci.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/pci/kpci.cpp @@ -22,6 +22,8 @@ extern "C" { #include Index: x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h =================================================================== --- x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h +++ x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.h @@ -1,6 +1,6 @@ * Add a couple variables for the additional functionality in FancyPlotter.cpp * ---- ksysguard/gui/SensorDisplayLib/FancyPlotter.h.orig 2015-06-26 03:17:21 UTC +--- ksysguard/gui/SensorDisplayLib/FancyPlotter.h.orig 2015-08-12 07:03:15 UTC +++ ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -52,6 +52,7 @@ class FPSensorProperties : public KSGRD: double minValue; Index: x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp =================================================================== --- x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp +++ x11/kde4-workspace/files/patch-ksysguard_gui_SensorDisplayLib_FancyPlotter.cpp @@ -6,7 +6,7 @@ * * Allow a stored description for sensors to override the label * ---- ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp.orig 2015-06-26 03:17:21 UTC +--- ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp.orig 2015-08-12 07:03:15 UTC +++ ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -48,6 +48,7 @@ class SensorToAdd { QRegExp name; Index: x11/kde4-workspace/files/patch-ksysguard_gui_SystemLoad2.sgrd =================================================================== --- x11/kde4-workspace/files/patch-ksysguard_gui_SystemLoad2.sgrd +++ x11/kde4-workspace/files/patch-ksysguard_gui_SystemLoad2.sgrd @@ -1,7 +1,7 @@ * Provide a detailed view of Memory and Swap Used instead of the simplistic and * misleading view that showed only application use (kernel use was neglected) * ---- ksysguard/gui/SystemLoad2.sgrd.orig 2015-06-26 03:17:21 UTC +--- ksysguard/gui/SystemLoad2.sgrd.orig 2015-08-12 07:03:15 UTC +++ ksysguard/gui/SystemLoad2.sgrd @@ -3,11 +3,14 @@ Index: x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.h =================================================================== --- x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.h +++ x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.h @@ -1,6 +1,6 @@ * Add the detailed setMemInfo used in ksysguard.cpp * ---- ksysguard/gui/ksysguard.h.orig 2015-06-26 03:17:21 UTC +--- ksysguard/gui/ksysguard.h.orig 2015-08-12 07:03:15 UTC +++ ksysguard/gui/ksysguard.h @@ -77,6 +77,7 @@ class TopLevel : public KXmlGuiWindow, p void configureCurrentSheet(); Index: x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.cpp =================================================================== --- x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.cpp +++ x11/kde4-workspace/files/patch-ksysguard_gui_ksysguard.cpp @@ -2,7 +2,7 @@ * * Make the the Status Bar elements reasonably proportional in size * ---- ksysguard/gui/ksysguard.cpp.orig 2015-06-26 03:17:21 UTC +--- ksysguard/gui/ksysguard.cpp.orig 2015-08-12 07:03:15 UTC +++ ksysguard/gui/ksysguard.cpp @@ -93,19 +93,21 @@ TopLevel::TopLevel() /* Create the status bar. It displays some information about the Index: x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt =================================================================== --- x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt +++ x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt @@ -1,4 +1,4 @@ ---- kwin/opengltest/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- kwin/opengltest/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ kwin/opengltest/CMakeLists.txt @@ -2,9 +2,11 @@ Index: x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h =================================================================== --- x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h +++ x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.h @@ -1,6 +1,6 @@ * Add handler for change of mutability of the desktop toolbox * ---- plasma/desktop/toolboxes/desktoptoolbox.h.orig 2015-06-26 03:17:21 UTC +--- plasma/desktop/toolboxes/desktoptoolbox.h.orig 2015-08-12 07:03:15 UTC +++ plasma/desktop/toolboxes/desktoptoolbox.h @@ -81,6 +81,7 @@ protected Q_SLOTS: * show/hide the toolbox Index: x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp =================================================================== --- x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp +++ x11/kde4-workspace/files/patch-plasma_desktop_toolboxes_desktoptoolbox.cpp @@ -1,6 +1,6 @@ * Hide the desktop toolbox (aka "cashew") when widgets are locked * ---- plasma/desktop/toolboxes/desktoptoolbox.cpp.orig 2015-06-26 03:17:21 UTC +--- plasma/desktop/toolboxes/desktoptoolbox.cpp.orig 2015-08-12 07:03:15 UTC +++ plasma/desktop/toolboxes/desktoptoolbox.cpp @@ -177,6 +177,8 @@ void DesktopToolBox::init() connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), 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/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp =================================================================== --- x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp +++ x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp @@ -1,21 +0,0 @@ ---- powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2015-06-26 03:17:21 UTC -+++ powerdevil/daemon/backends/upower/xrandrbrightness.cpp -@@ -62,6 +62,9 @@ XRandrBrightness::XRandrBrightness() - qWarning("No available Randr resources"); - return; - } -+ -+ if (brightness() == -1) -+ m_resources = 0; - } - - XRandrBrightness::~XRandrBrightness() -@@ -89,7 +92,7 @@ bool XRandrBrightness::isSupported() con - - float XRandrBrightness::brightness() const - { -- float result = 0; -+ float result = -1; - - if (!m_resources) - return result; Index: x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp =================================================================== --- x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp +++ x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp @@ -1,4 +1,4 @@ ---- powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2015-06-26 03:17:21 UTC +--- powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2015-08-12 07:03:15 UTC +++ powerdevil/daemon/backends/upower/xrandrbrightness.cpp @@ -62,6 +62,9 @@ XRandrBrightness::XRandrBrightness() qWarning("No available Randr resources"); Index: x11/kde4-workspace/files/patch-startkde.cmake =================================================================== --- x11/kde4-workspace/files/patch-startkde.cmake +++ x11/kde4-workspace/files/patch-startkde.cmake @@ -1,4 +1,4 @@ ---- startkde.cmake.orig 2015-06-26 03:17:21 UTC +--- startkde.cmake.orig 2015-08-12 07:03:15 UTC +++ startkde.cmake @@ -271,7 +271,8 @@ export XDG_DATA_DIRS # Make sure that D-Bus is running Index: x11/kde4-workspace/files/patch-usbview =================================================================== --- x11/kde4-workspace/files/patch-usbview +++ x11/kde4-workspace/files/patch-usbview @@ -4,7 +4,7 @@ Old code probably works on NetBSD, but let it use libusb-1 as well. Use DeviceNotifier instead of polling. ---- cmake/modules/FindLibUSB1.cmake.orig 2016-12-13 11:26:31 UTC +--- cmake/modules/FindLibUSB1.cmake.orig 2015-08-12 07:03:15 UTC +++ cmake/modules/FindLibUSB1.cmake @@ -0,0 +1,21 @@ +# - Try to find libusb v1.0 library @@ -28,7 +28,7 @@ +find_package_handle_standard_args(LIBUSB1 DEFAULT_MSG LIBUSB1_LIBRARY LIBUSB1_INCLUDE_DIR) + +mark_as_advanced(LIBUSB1_INCLUDE_DIR LIBUSB1_LIBRARY) ---- kinfocenter/Modules/usbview/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/usbview/CMakeLists.txt.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/usbview/CMakeLists.txt @@ -1,15 +1,25 @@ +macro_optional_find_package(LibUSB1) @@ -58,12 +58,12 @@ install(TARGETS kcm_usb DESTINATION ${PLUGIN_INSTALL_DIR} ) ---- kinfocenter/Modules/usbview/config-kcmusb.h.cmake.orig 2016-12-13 11:26:31 UTC +--- kinfocenter/Modules/usbview/config-kcmusb.h.cmake.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/usbview/config-kcmusb.h.cmake @@ -0,0 +1,2 @@ +/* Defined if you have libusb */ +#cmakedefine HAVE_LIBUSB1 1 ---- kinfocenter/Modules/usbview/kcmusb.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/usbview/kcmusb.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/usbview/kcmusb.cpp @@ -12,7 +12,6 @@ #include @@ -108,7 +108,7 @@ int level = 0; bool found = true; ---- kinfocenter/Modules/usbview/usbdevices.cpp.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/usbview/usbdevices.cpp.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/usbview/usbdevices.cpp @@ -27,9 +27,9 @@ @@ -428,7 +428,7 @@ -#endif // !(defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) +#endif // defined(Q_OS_LINUX) +#endif // defined(HAVE_LIBUSB1) ---- kinfocenter/Modules/usbview/usbdevices.h.orig 2015-06-26 03:17:21 UTC +--- kinfocenter/Modules/usbview/usbdevices.h.orig 2015-08-12 07:03:15 UTC +++ kinfocenter/Modules/usbview/usbdevices.h @@ -14,18 +14,9 @@ #include 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