Sat Jul 16 00:47:00 2016 UTC ()
gcc6 fixes


(markd)
diff -r1.16 -r1.17 pkgsrc/x11/kde-workspace4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_randroutput.cpp
diff -r0 -r1.1 pkgsrc/x11/kde-workspace4/patches/patch-libs_kephal_service_xrandr12_randroutput.cpp
diff -r1.1 -r1.2 pkgsrc/x11/kde-workspace4/patches/patch-kwin_glxbackend.cpp
cvs diff -r1.16 -r1.17 pkgsrc/x11/kde-workspace4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/distinfo 2016/01/11 00:00:28 1.16
+++ pkgsrc/x11/kde-workspace4/distinfo 2016/07/16 00:47:00 1.17
@@ -1,48 +1,50 @@ @@ -1,48 +1,50 @@
1$NetBSD: distinfo,v 1.16 2016/01/11 00:00:28 markd Exp $ 1$NetBSD: distinfo,v 1.17 2016/07/16 00:47:00 markd Exp $
2 2
3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b 3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
5SHA512 (Daemon.README) = 8aaf704a95c7cd25c85c4e0d789ed050b555f3ec0a3c11754b79d8b118b68c32d0eac1fbc3022124b10a7c588e78b592e77ad2f718ab4120a95b8859ca94fa5b 5SHA512 (Daemon.README) = 8aaf704a95c7cd25c85c4e0d789ed050b555f3ec0a3c11754b79d8b118b68c32d0eac1fbc3022124b10a7c588e78b592e77ad2f718ab4120a95b8859ca94fa5b
6Size (Daemon.README) = 2191 bytes 6Size (Daemon.README) = 2191 bytes
7SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d 7SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
8RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7 8RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
9SHA512 (Daemon.png) = 60a5406526f351644bb2c0bfd3d0b04ffe652bac9adf156e03c4f3c143671527db383e90e376475cfdcae5a94d1d39bd0a18318e46dd27c7ee1f89a08db52284 9SHA512 (Daemon.png) = 60a5406526f351644bb2c0bfd3d0b04ffe652bac9adf156e03c4f3c143671527db383e90e376475cfdcae5a94d1d39bd0a18318e46dd27c7ee1f89a08db52284
10Size (Daemon.png) = 15725 bytes 10Size (Daemon.png) = 15725 bytes
11SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c 11SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
12RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 12RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
13SHA512 (NetBSD-flag-1.0.png) = 79921ca035a3aafba9f9c750fd9793d146ffbe64238cd76a11eab72d98f6eb89844efabb17f2b8c49bc5e638c7fbfc61ae29c68b862abc1aecd545ea65e61654 13SHA512 (NetBSD-flag-1.0.png) = 79921ca035a3aafba9f9c750fd9793d146ffbe64238cd76a11eab72d98f6eb89844efabb17f2b8c49bc5e638c7fbfc61ae29c68b862abc1aecd545ea65e61654
14Size (NetBSD-flag-1.0.png) = 4532 bytes 14Size (NetBSD-flag-1.0.png) = 4532 bytes
15SHA1 (kde-workspace-4.11.22.tar.xz) = f08fbe309ed16c51ad31b0b260b2adeb7af1bb37 15SHA1 (kde-workspace-4.11.22.tar.xz) = f08fbe309ed16c51ad31b0b260b2adeb7af1bb37
16RMD160 (kde-workspace-4.11.22.tar.xz) = 0e21e83765194f5ab7b06a725d70f1d791293b8f 16RMD160 (kde-workspace-4.11.22.tar.xz) = 0e21e83765194f5ab7b06a725d70f1d791293b8f
17SHA512 (kde-workspace-4.11.22.tar.xz) = 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 17SHA512 (kde-workspace-4.11.22.tar.xz) = 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95
18Size (kde-workspace-4.11.22.tar.xz) = 13553668 bytes 18Size (kde-workspace-4.11.22.tar.xz) = 13553668 bytes
19SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71 19SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
 20SHA1 (patch-kcontrol_randr_randroutput.cpp) = 6f9e6f18007023941018d2088a585c2ab30a7299
20SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 21SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
21SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7 22SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
22SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe 23SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
23SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f 24SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
24SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db 25SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db
25SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21 26SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
26SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c 27SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c
27SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb 28SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb
28SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30 29SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30
29SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619 30SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619
30SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d 31SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
31SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13 32SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13
32SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983 33SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983
33SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5 34SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5
34SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b 35SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b
35SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = 4b6625f9bebf6bd2c6057d7045d9ce6af3103578 36SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = 4b6625f9bebf6bd2c6057d7045d9ce6af3103578
36SHA1 (patch-kwin_glxbackend.cpp) = a5e954a70e943a2d40d35f8a49b611b03d072af6 37SHA1 (patch-kwin_glxbackend.cpp) = c0e1c43cfb832cdc966156c54e5e12d78e78e7ab
37SHA1 (patch-kwin_killer_killer.cpp) = b64133ee8b96e4275ed1cbe68a64630e08f77154 38SHA1 (patch-kwin_killer_killer.cpp) = b64133ee8b96e4275ed1cbe68a64630e08f77154
38SHA1 (patch-kwin_scene_opengl.cpp) = 53de757225b74ddf85609b2ec920659964940e59 39SHA1 (patch-kwin_scene_opengl.cpp) = 53de757225b74ddf85609b2ec920659964940e59
 40SHA1 (patch-libs_kephal_service_xrandr12_randroutput.cpp) = 03fc906e4ec34b31d9237ea27e7c94f3cfd4213b
39SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248 41SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248
40SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80 42SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
41SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535 43SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
42SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537c4b242847d3d54c893d28ddcaf4 44SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537c4b242847d3d54c893d28ddcaf4
43SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43 45SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
44SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c 46SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
45SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e 47SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
46SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c 48SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c
47SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788 49SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788
48SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634 50SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634
File Added: pkgsrc/x11/kde-workspace4/patches/patch-kcontrol_randr_randroutput.cpp
$NetBSD: patch-kcontrol_randr_randroutput.cpp,v 1.1 2016/07/16 00:47:00 markd Exp $

fixes for gcc6 from opensuse

--- kcontrol/randr/randroutput.cpp.orig	2015-08-12 07:03:15.000000000 +0000
+++ kcontrol/randr/randroutput.cpp
@@ -202,12 +202,12 @@ void RandROutput::handleEvent(XRROutputC
 		m_connected = (event->connection == RR_Connected);
 		loadSettings(false);
 		if (!m_connected && currentCrtc != None)
-			setCrtc(None);
+			setCrtc(NULL);
 	}
 
 	// check if we are still connected, if not, release the crtc connection
 	if(!m_connected && m_crtc->isValid())
-		setCrtc(None);
+		setCrtc(NULL);
 
 	if(changed)
 		emit outputChanged(m_id, changed);
@@ -267,7 +267,7 @@ ModeList RandROutput::modes() const
 RandRMode RandROutput::mode() const
 {
 	if (!isConnected())
-		return None;
+		return NULL;
 
 	if (!m_crtc)
 		return RandRMode();
File Added: pkgsrc/x11/kde-workspace4/patches/patch-libs_kephal_service_xrandr12_randroutput.cpp
$NetBSD: patch-libs_kephal_service_xrandr12_randroutput.cpp,v 1.1 2016/07/16 00:47:00 markd Exp $

gcc6 fixes from opensuse

--- libs/kephal/service/xrandr12/randroutput.cpp.orig	2015-08-12 07:03:15.000000000 +0000
+++ libs/kephal/service/xrandr12/randroutput.cpp
@@ -227,7 +227,7 @@ ModeList RandROutput::modes() const
 RandRMode RandROutput::mode() const
 {
     if (!isConnected())
-        return None;
+        return NULL;
 
     if (!m_crtc)
         return RandRMode();
cvs diff -r1.1 -r1.2 pkgsrc/x11/kde-workspace4/patches/patch-kwin_glxbackend.cpp (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/patches/patch-kwin_glxbackend.cpp 2013/12/12 11:09:28 1.1
+++ pkgsrc/x11/kde-workspace4/patches/patch-kwin_glxbackend.cpp 2016/07/16 00:47:00 1.2
@@ -1,22 +1,32 @@ @@ -1,22 +1,32 @@
1$NetBSD: patch-kwin_glxbackend.cpp,v 1.1 2013/12/12 11:09:28 markd Exp $ 1$NetBSD: patch-kwin_glxbackend.cpp,v 1.2 2016/07/16 00:47:00 markd Exp $
2 2
 3fixes for gcc6 from opensuse
3Don't fail build with old MesaLib  4Don't fail build with old MesaLib
4 5
5--- kwin/glxbackend.cpp.orig 2013-09-26 19:18:26.000000000 +0000 6--- kwin/glxbackend.cpp.orig 2015-08-12 07:03:15.000000000 +0000
6+++ kwin/glxbackend.cpp 7+++ kwin/glxbackend.cpp
7@@ -152,6 +152,7 @@ bool GlxBackend::initRenderingContext() 8@@ -45,7 +45,7 @@ GlxBackend::GlxBackend()
 9 , window(None)
 10 , fbconfig(NULL)
 11 , glxWindow(None)
 12- , ctx(None)
 13+ , ctx(NULL)
 14 , m_bufferAge(0)
 15 , haveSwapInterval(false)
 16 {
 17@@ -164,6 +164,7 @@ bool GlxBackend::initRenderingContext()
8 { 18 {
9 bool direct = options->isGlDirect(); 19 bool direct = options->isGlDirect();
10  20
11+#if GLX_GLXEXT_VERSION >= 32 21+#if GLX_GLXEXT_VERSION >= 32
12 // Use glXCreateContextAttribsARB() when it's available 22 // Use glXCreateContextAttribsARB() when it's available
13 if (glXCreateContextAttribsARB) { 23 if (glXCreateContextAttribsARB) {
14 const int attribs_31_core_robustness[] = { 24 const int attribs_31_core_robustness[] = {
15@@ -197,6 +198,7 @@ bool GlxBackend::initRenderingContext() 25@@ -209,6 +210,7 @@ bool GlxBackend::initRenderingContext()
16 if (!ctx) 26 if (!ctx)
17 ctx = glXCreateContextAttribsARB(display(), fbconfig, 0, direct, attribs_legacy); 27 ctx = glXCreateContextAttribsARB(display(), fbconfig, 0, direct, attribs_legacy);
18 } 28 }
19+#endif 29+#endif
20  30
21 if (!ctx) 31 if (!ctx)
22 ctx = glXCreateNewContext(display(), fbconfig, GLX_RGBA_TYPE, NULL, direct); 32 ctx = glXCreateNewContext(display(), fbconfig, GLX_RGBA_TYPE, NULL, direct);