Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Dec 2018 12:52:23 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r488383 - in head: . sysutils sysutils/kshutdown sysutils/kshutdown-kde4 sysutils/kshutdown/files
Message-ID:  <201812261252.wBQCqNgF010654@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Wed Dec 26 12:52:23 2018
New Revision: 488383
URL: https://svnweb.freebsd.org/changeset/ports/488383

Log:
  sysutils/kshutdown: update to KF5 based 4.99-beta

Added:
  head/sysutils/kshutdown/
     - copied from r488382, head/sysutils/kshutdown-kde4/
Deleted:
  head/sysutils/kshutdown-kde4/
Modified:
  head/MOVED
  head/sysutils/Makefile
  head/sysutils/kshutdown/Makefile
  head/sysutils/kshutdown/distinfo
  head/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp
  head/sysutils/kshutdown/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/MOVED	Wed Dec 26 12:52:23 2018	(r488383)
@@ -4695,7 +4695,6 @@ sysutils/klineakconfig||2013-07-26|Has expired: Depend
 sysutils/kmilo||2013-07-26|Has expired: Depends on Qt 3.x
 sysutils/knutclient||2013-07-26|Has expired: Depends on Qt 3.x
 sysutils/komparator||2013-07-26|Has expired: Depends on Qt 3.x
-sysutils/kshutdown||2013-07-26|Has expired: Depends on Qt 3.x
 sysutils/ksynaptics||2013-07-26|Has expired: Depends on Qt 3.x
 sysutils/lineak-kdeplugins||2013-07-26|Has expired: Depends on Qt 3.x
 sysutils/luma||2013-07-26|Has expired: Depends on Qt 3.x
@@ -10931,3 +10930,4 @@ devel/rubygem-peek-rblineprof|devel/rubygem-peek-rblin
 devel/rubygem-health_check26|devel/rubygem-health_check26-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-health_check26-rails50 instead
 devel/rubygem-default_value_for30|devel/rubygem-gitlab-default_value_for|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-gitlab-default_value_for instead
 devel/rubygem-gettext_i18n_rails_js|devel/rubygem-gettext_i18n_rails_js-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-gettext_i18n_rails_js-rails50 instead
+sysutils/kshutdown-kde4|sysutils/kshutdown|2018-12-26|Renamed as no longer kde4 based

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/sysutils/Makefile	Wed Dec 26 12:52:23 2018	(r488383)
@@ -579,7 +579,7 @@
     SUBDIR += knutclient-kde4
     SUBDIR += kops
     SUBDIR += krename
-    SUBDIR += kshutdown-kde4
+    SUBDIR += kshutdown
     SUBDIR += ksysguardd-kde4
     SUBDIR += ksystemlog
     SUBDIR += ksystemlog-kde4

Modified: head/sysutils/kshutdown/Makefile
==============================================================================
--- head/sysutils/kshutdown-kde4/Makefile	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/sysutils/kshutdown/Makefile	Wed Dec 26 12:52:23 2018	(r488383)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	kshutdown
-DISTVERSION=	4.2
-PORTREVISION=	2
+DISTVERSION=	4.99-beta
 CATEGORIES=	sysutils kde
-MASTER_SITES=	SF/${PORTNAME}/KShutdown/${DISTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/KShutdown/4.99%20Beta/
 DISTNAME=	${PORTNAME}-source-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,17 +12,14 @@ COMMENT=	Advanced shutdown utility for KDE
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DEPRECATED=	KDE4 is EOL upstream
-EXPIRATION_DATE=	2018-12-31
+USES=		alias cmake compiler:c++0x gettext kde:5 qt:5 zip
+USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons ecm globalaccel i18n idletime notifications notifyconfig widgetsaddons xmlgui
+USE_QT=		core dbus gui widgets xml \
+		buildtools_build qmake_build
 
-USES=		alias cmake compiler:c++0x gettext kde:4 qt:4 zip
-USE_QT=		corelib dbus gui moc_build qmake_build rcc_build svg uic_build
-USE_KDE=	automoc4 kdelibs workspace
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-# Make sure, we're building the KDE4 version.
-CMAKE_ARGS=	-DKS_KF5:BOOL=FALSE \
-		-DKS_PURE_QT:BOOL=FALSE
+CMAKE_ON=	KS_KF5
+CMAKE_OFF=	KS_PURE_QT
 
 .include <bsd.port.mk>

Modified: head/sysutils/kshutdown/distinfo
==============================================================================
--- head/sysutils/kshutdown-kde4/distinfo	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/sysutils/kshutdown/distinfo	Wed Dec 26 12:52:23 2018	(r488383)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518255984
-SHA256 (kshutdown-source-4.2.zip) = 48e537b593fd2470c0cfeca7c2c48ac3221fdb48b0fb89bfb898e4faf531ee46
-SIZE (kshutdown-source-4.2.zip) = 463140
+TIMESTAMP = 1545827956
+SHA256 (kshutdown-source-4.99-beta.zip) = 8299774b6f00b517a0e6bbee92401bbcccc26de1654940170389a19aa28ac320
+SIZE (kshutdown-source-4.99-beta.zip) = 455309

Modified: head/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp
==============================================================================
--- head/sysutils/kshutdown-kde4/files/patch-src_triggers_processmonitor.cpp	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp	Wed Dec 26 12:52:23 2018	(r488383)
@@ -1,10 +1,10 @@
---- src/triggers/processmonitor.cpp.orig	2018-03-09 21:45:20 UTC
+--- src/triggers/processmonitor.cpp.orig	2018-12-26 12:42:28 UTC
 +++ src/triggers/processmonitor.cpp
-@@ -20,6 +20,7 @@
- #include "../config.h"
- #include "../utils.h"
+@@ -28,6 +28,7 @@
+ 	#include <csignal> // for ::kill
+ #endif // !Q_OS_WIN32
  
 +#include <errno.h>
- #include <QHBoxLayout>
- #include <QPushButton>
+ // public
  
+ Process::Process(QObject *parent, const QString &command)

Modified: head/sysutils/kshutdown/pkg-plist
==============================================================================
--- head/sysutils/kshutdown-kde4/pkg-plist	Wed Dec 26 12:36:53 2018	(r488382)
+++ head/sysutils/kshutdown/pkg-plist	Wed Dec 26 12:52:23 2018	(r488383)
@@ -1,23 +1,12 @@
 bin/kshutdown
-share/applications/kde4/kshutdown.desktop
-share/apps/kshutdown/extras/multimedia/.directory
-share/apps/kshutdown/extras/multimedia/amarok.desktop
-share/apps/kshutdown/extras/multimedia/juk.desktop
-share/apps/kshutdown/extras/multimedia/kaffeine.desktop
-share/apps/kshutdown/extras/multimedia/kscd.desktop
-share/apps/kshutdown/extras/multimedia/mplayer.desktop
-share/apps/kshutdown/extras/multimedia/tvtime.desktop
-share/apps/kshutdown/extras/multimedia/vlc.desktop
-share/apps/kshutdown/extras/multimedia/xmms.desktop
-share/apps/kshutdown/extras/system/.directory
-share/apps/kshutdown/extras/system/kppp.desktop
-share/apps/kshutdown/kshutdown.notifyrc
+share/applications/kshutdown.desktop
 share/icons/hicolor/128x128/apps/kshutdown.png
 share/icons/hicolor/16x16/apps/kshutdown.png
 share/icons/hicolor/22x22/apps/kshutdown.png
 share/icons/hicolor/32x32/apps/kshutdown.png
 share/icons/hicolor/48x48/apps/kshutdown.png
 share/icons/hicolor/64x64/apps/kshutdown.png
+share/knotifications5/kshutdown.notifyrc
 share/locale/ar/LC_MESSAGES/kshutdown.mo
 share/locale/bg/LC_MESSAGES/kshutdown.mo
 share/locale/cs/LC_MESSAGES/kshutdown.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812261252.wBQCqNgF010654>