CVS commit: pkgsrc/x11/kde-workspace4

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jan 17 19:10:23 UTC 2018

Modified Files:
        pkgsrc/x11/kde-workspace4: Makefile PLIST PLIST.Linux distinfo
Added Files:
        pkgsrc/x11/kde-workspace4/patches: patch-kcontrol_randr_krandrtray.cpp
            patch-libs_oxygen_oxygenhelper.cpp

Log Message:
kde-workspace4: PLIST changes for polkit-qt update plus gcc7 fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/x11/kde-workspace4/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/kde-workspace4/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/kde-workspace4/PLIST.Linux
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/kde-workspace4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_krandrtray.cpp \
    pkgsrc/x11/kde-workspace4/patches/patch-libs_oxygen_oxygenhelper.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/kde-workspace4/Makefile
diff -u pkgsrc/x11/kde-workspace4/Makefile:1.64 pkgsrc/x11/kde-workspace4/Makefile:1.65
--- pkgsrc/x11/kde-workspace4/Makefile:1.64     Mon Jan  1 21:18:13 2018
+++ pkgsrc/x11/kde-workspace4/Makefile  Wed Jan 17 19:10:23 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2018/01/01 21:18:13 adam Exp $
+# $NetBSD: Makefile,v 1.65 2018/01/17 19:10:23 markd Exp $
 
 DISTNAME=      kde-workspace-4.11.22
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    x11
 COMMENT=       Base workspace for the KDE 4 integrated X11 desktop
 MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.0/src/}
@@ -161,7 +161,7 @@ PLIST.gles= yes
 .include "../../misc/kdepimlibs4/buildlink3.mk"
 #.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
-.include "../../x11/py-kde4/buildlink3.mk"
+#.include "../../x11/py-kde4/buildlink3.mk"
 .include "../../x11/libkactivities4/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"

Index: pkgsrc/x11/kde-workspace4/PLIST
diff -u pkgsrc/x11/kde-workspace4/PLIST:1.11 pkgsrc/x11/kde-workspace4/PLIST:1.12
--- pkgsrc/x11/kde-workspace4/PLIST:1.11        Sun Feb 14 04:20:24 2016
+++ pkgsrc/x11/kde-workspace4/PLIST     Wed Jan 17 19:10:23 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/02/14 04:20:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/01/17 19:10:23 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -426,10 +426,10 @@ lib/libweather_ion.so.6.0.0
 ${PYSITELIB}/PyKDE4/plasmascript.py
 ${PYSITELIB}/PyKDE4/plasmascript.pyc
 lib/strigi/strigita_font.so
-share/PolicyKit/policy/org.kde.fontinst.policy
-share/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
-share/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy
-share/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy
+share/polkit-1/actions/org.kde.fontinst.policy
+share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
+share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy
+share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
 share/applications/kde4/kdesystemsettings.desktop
 share/applications/kde4/kfontview.desktop
 share/applications/kde4/kinfocenter.desktop

Index: pkgsrc/x11/kde-workspace4/PLIST.Linux
diff -u pkgsrc/x11/kde-workspace4/PLIST.Linux:1.5 pkgsrc/x11/kde-workspace4/PLIST.Linux:1.6
--- pkgsrc/x11/kde-workspace4/PLIST.Linux:1.5   Mon Jan  1 22:30:04 2018
+++ pkgsrc/x11/kde-workspace4/PLIST.Linux       Wed Jan 17 19:10:23 2018
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.Linux,v 1.5 2018/01/01 22:30:04 rillig Exp $
+@comment $NetBSD: PLIST.Linux,v 1.6 2018/01/17 19:10:23 markd Exp $
 lib/kde4/kcm_joystick.so
 lib/kde4/libexec/backlighthelper
-share/PolicyKit/policy/org.kde.powerdevil.backlighthelper.policy
 share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
 share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
 share/kde4/services/joystick.desktop
+share/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy

Index: pkgsrc/x11/kde-workspace4/distinfo
diff -u pkgsrc/x11/kde-workspace4/distinfo:1.20 pkgsrc/x11/kde-workspace4/distinfo:1.21
--- pkgsrc/x11/kde-workspace4/distinfo:1.20     Tue Sep 26 13:10:07 2017
+++ pkgsrc/x11/kde-workspace4/distinfo  Wed Jan 17 19:10:23 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/09/26 13:10:07 abs Exp $
+$NetBSD: distinfo,v 1.21 2018/01/17 19:10:23 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -17,6 +17,7 @@ RMD160 (kde-workspace-4.11.22.tar.xz) = 
 SHA512 (kde-workspace-4.11.22.tar.xz) = 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95
 Size (kde-workspace-4.11.22.tar.xz) = 13553668 bytes
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
+SHA1 (patch-kcontrol_randr_krandrtray.cpp) = 47de3212baab5f2f20ccd9b9869ba4450b6a9bb7
 SHA1 (patch-kcontrol_randr_randroutput.cpp) = 6f9e6f18007023941018d2088a585c2ab30a7299
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
@@ -42,6 +43,7 @@ SHA1 (patch-libs_ksysguard_ksgrd_SensorM
 SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
 SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
 SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 37303769e7b3890b47cc4f1f2715f55f2015a3ca
+SHA1 (patch-libs_oxygen_oxygenhelper.cpp) = ef013d9492a1e59e627a82a5b842cb0b7a23160f
 SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
 SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
 SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e

Added files:

Index: pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_krandrtray.cpp
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_krandrtray.cpp:1.1
--- /dev/null   Wed Jan 17 19:10:23 2018
+++ pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_krandrtray.cpp       Wed Jan 17 19:10:23 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-kcontrol_randr_krandrtray.cpp,v 1.1 2018/01/17 19:10:23 markd Exp $
+
+gcc-7 fix
+
+--- kcontrol/randr/krandrtray.cpp.orig 2015-08-12 07:03:15.000000000 +0000
++++ kcontrol/randr/krandrtray.cpp
+@@ -361,7 +361,7 @@ void KRandRSystemTray::populateMenu(KMen
+                                       if (screen->activeCount() != 1)
+                                       {
+                                               action = outputMenu->addAction(i18n("Disable"));
+-                                              if (output->crtc() == None)
++                                              if (output->crtc() == NULL)
+                                               {
+                                                       QFont font = action->font();
+                                                       font.setBold(true);
Index: pkgsrc/x11/kde-workspace4/patches/patch-libs_oxygen_oxygenhelper.cpp
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-libs_oxygen_oxygenhelper.cpp:1.1
--- /dev/null   Wed Jan 17 19:10:23 2018
+++ pkgsrc/x11/kde-workspace4/patches/patch-libs_oxygen_oxygenhelper.cpp        Wed Jan 17 19:10:23 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_oxygen_oxygenhelper.cpp,v 1.1 2018/01/17 19:10:23 markd Exp $
+
+gcc-7 fix
+
+--- libs/oxygen/oxygenhelper.cpp.orig  2015-08-12 07:03:15.000000000 +0000
++++ libs/oxygen/oxygenhelper.cpp
+@@ -1089,7 +1089,7 @@ namespace Oxygen
+             &data);
+ 
+         // finish if no data is found
+-        if( data == None || n != 1 ) return false;
++        if( data == NULL || n != 1 ) return false;
+         else return *data;
+ 
+     }