svn commit: r437224 - in head: Mk/Uses sysutils/ksysguardd sysutils/ksysguardd/files x11/kde4-workspace x11/kde4-workspace/files x11/plasma-scriptengine-python x11/plasma-scriptengine-ruby
Matthew Rezny
rezny at FreeBSD.org
Wed Mar 29 19:18:37 UTC 2017
Author: rezny
Date: Wed Mar 29 19:18:34 2017
New Revision: 437224
URL: https://svnweb.freebsd.org/changeset/ports/437224
Log:
Update to 4.11.22, the last release from KDE.org
Drop obsolete patches, add one to fix build, and rename a few patches.
Reviewed by: rakuco, tcberner, mat
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D10148
Added:
head/sysutils/ksysguardd/files/patch-modules.h (contents, props changed)
head/x11/kde4-workspace/files/patch-kdm_backend_client.c
- copied unchanged from r437223, head/x11/kde4-workspace/files/patch-kdm__backend__client.c
head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt
- copied unchanged from r437223, head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp
- copied unchanged from r437223, head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp
Deleted:
head/x11/kde4-workspace/files/patch-git_0f43493
head/x11/kde4-workspace/files/patch-git_68a4d76
head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt
head/x11/kde4-workspace/files/patch-kdm__backend__client.c
head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp
Modified:
head/Mk/Uses/kde.mk
head/sysutils/ksysguardd/Makefile
head/x11/kde4-workspace/Makefile
head/x11/kde4-workspace/distinfo
head/x11/plasma-scriptengine-python/Makefile
head/x11/plasma-scriptengine-ruby/Makefile
Modified: head/Mk/Uses/kde.mk
==============================================================================
--- head/Mk/Uses/kde.mk Wed Mar 29 18:43:19 2017 (r437223)
+++ head/Mk/Uses/kde.mk Wed Mar 29 19:18:34 2017 (r437224)
@@ -57,7 +57,7 @@ _KDE_RELNAME= KDE${_KDE_VERSION}
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
Modified: head/sysutils/ksysguardd/Makefile
==============================================================================
--- head/sysutils/ksysguardd/Makefile Wed Mar 29 18:43:19 2017 (r437223)
+++ head/sysutils/ksysguardd/Makefile Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 at FreeBSD.org
COMMENT= KDE System Guard Daemon
@@ -15,11 +13,13 @@ USES= cmake kde:4 tar:xz
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'
-WRKSRC= ${WRKDIR}/${DISTNAME}/ksysguard/${PORTNAME}
+WRKSRC_SUBDIR= ksysguard/${PORTNAME}
PLIST_FILES= bin/${PORTNAME} \
etc/${PORTNAME}rc
Added: head/sysutils/ksysguardd/files/patch-modules.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/ksysguardd/files/patch-modules.h Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 },
Modified: head/x11/kde4-workspace/Makefile
==============================================================================
--- head/x11/kde4-workspace/Makefile Wed Mar 29 18:43:19 2017 (r437223)
+++ head/x11/kde4-workspace/Makefile Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 at FreeBSD.org
COMMENT= KDE Plasma Desktop
@@ -14,6 +11,8 @@ 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 \
@@ -42,18 +41,20 @@ RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.s
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 \
Modified: head/x11/kde4-workspace/distinfo
==============================================================================
--- head/x11/kde4-workspace/distinfo Wed Mar 29 18:43:19 2017 (r437223)
+++ head/x11/kde4-workspace/distinfo Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 = 1490623839
+SHA256 (KDE/applications/15.08.0/kde-workspace-4.11.22.tar.xz) = f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7
+SIZE (KDE/applications/15.08.0/kde-workspace-4.11.22.tar.xz) = 13553668
Copied: head/x11/kde4-workspace/files/patch-kdm_backend_client.c (from r437223, head/x11/kde4-workspace/files/patch-kdm__backend__client.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/kde4-workspace/files/patch-kdm_backend_client.c Wed Mar 29 19:18:34 2017 (r437224, copy of r437223, head/x11/kde4-workspace/files/patch-kdm__backend__client.c)
@@ -0,0 +1,35 @@
+--- 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;
Copied: head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt (from r437223, head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt Wed Mar 29 19:18:34 2017 (r437224, copy of r437223, head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt)
@@ -0,0 +1,12 @@
+--- kdm/kfrontend/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC
++++ kdm/kfrontend/CMakeLists.txt
+@@ -111,6 +111,6 @@ install(TARGETS kdmctl ${INSTALL_TARGETS
+
+
+ # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
+-install(CODE "
+-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
+-")
++#install(CODE "
++#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS)
++#")
Copied: head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp (from r437223, head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp Wed Mar 29 19:18:34 2017 (r437224, copy of r437223, head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp)
@@ -0,0 +1,21 @@
+--- 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;
Modified: head/x11/plasma-scriptengine-python/Makefile
==============================================================================
--- head/x11/plasma-scriptengine-python/Makefile Wed Mar 29 18:43:19 2017 (r437223)
+++ head/x11/plasma-scriptengine-python/Makefile Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 at FreeBSD.org
COMMENT= Plasma scriptengine for Python
@@ -16,6 +14,8 @@ USE_KDE= kdelibs pykde4 automoc4
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:
Modified: head/x11/plasma-scriptengine-ruby/Makefile
==============================================================================
--- head/x11/plasma-scriptengine-ruby/Makefile Wed Mar 29 18:43:19 2017 (r437223)
+++ head/x11/plasma-scriptengine-ruby/Makefile Wed Mar 29 19:18:34 2017 (r437224)
@@ -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 at FreeBSD.org
COMMENT= Plasma scriptengine for Ruby
@@ -17,6 +15,8 @@ USE_QT4= qmake_build moc_build uic_build
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 <bsd.port.mk>
More information about the svn-ports-all
mailing list