Tue Sep 26 13:10:07 2017 UTC ()
Remove PYTHON_VERSIONS_INCOMPATIBLE now builds with python 3.x


(abs)
diff -r1.62 -r1.63 pkgsrc/x11/kde-workspace4/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/kde-workspace4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py
cvs diff -r1.62 -r1.63 pkgsrc/x11/kde-workspace4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/Makefile 2017/08/24 20:03:03 1.62
+++ pkgsrc/x11/kde-workspace4/Makefile 2017/09/26 13:10:07 1.63
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: Makefile,v 1.62 2017/08/24 20:03:03 adam Exp $ 1# $NetBSD: Makefile,v 1.63 2017/09/26 13:10:07 abs Exp $
2 2
3DISTNAME= kde-workspace-4.11.22 3DISTNAME= kde-workspace-4.11.22
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 10 5PKGREVISION= 10
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Base workspace for the KDE 4 integrated X11 desktop 7COMMENT= Base workspace for the KDE 4 integrated X11 desktop
8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.08.0/src/} 8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.08.0/src/}
9 9
10PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 4.11.3 
11 
12.include "../../meta-pkgs/kde4/Makefile.kde4" 10.include "../../meta-pkgs/kde4/Makefile.kde4"
13 11
14DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README 12DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
15DISTFILES+= NetBSD-flag-1.0.png 13DISTFILES+= NetBSD-flag-1.0.png
16SITES.Daemon.png= ${MASTER_SITE_LOCAL} 14SITES.Daemon.png= ${MASTER_SITE_LOCAL}
17SITES.Daemon.README= ${MASTER_SITE_LOCAL} 15SITES.Daemon.README= ${MASTER_SITE_LOCAL}
18SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL} 16SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL}
19 17
20EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 18EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
21 19
22CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF 20CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF
23CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF 21CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
24CMAKE_ARGS+= -DWITH_Soprano:BOOL=OFF 22CMAKE_ARGS+= -DWITH_Soprano:BOOL=OFF
cvs diff -r1.19 -r1.20 pkgsrc/x11/kde-workspace4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/distinfo 2017/06/26 11:02:30 1.19
+++ pkgsrc/x11/kde-workspace4/distinfo 2017/09/26 13:10:07 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.19 2017/06/26 11:02:30 markd Exp $ 1$NetBSD: distinfo,v 1.20 2017/09/26 13:10:07 abs 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
@@ -37,14 +37,15 @@ SHA1 (patch-kwin_effects_mousemark_mouse @@ -37,14 +37,15 @@ SHA1 (patch-kwin_effects_mousemark_mouse
37SHA1 (patch-kwin_glxbackend.cpp) = c0e1c43cfb832cdc966156c54e5e12d78e78e7ab 37SHA1 (patch-kwin_glxbackend.cpp) = c0e1c43cfb832cdc966156c54e5e12d78e78e7ab
38SHA1 (patch-kwin_killer_killer.cpp) = b64133ee8b96e4275ed1cbe68a64630e08f77154 38SHA1 (patch-kwin_killer_killer.cpp) = b64133ee8b96e4275ed1cbe68a64630e08f77154
39SHA1 (patch-kwin_scene_opengl.cpp) = 53de757225b74ddf85609b2ec920659964940e59 39SHA1 (patch-kwin_scene_opengl.cpp) = 53de757225b74ddf85609b2ec920659964940e59
40SHA1 (patch-libs_kephal_service_xrandr12_randroutput.cpp) = 03fc906e4ec34b31d9237ea27e7c94f3cfd4213b 40SHA1 (patch-libs_kephal_service_xrandr12_randroutput.cpp) = 03fc906e4ec34b31d9237ea27e7c94f3cfd4213b
41SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248 41SHA1 (patch-libs_ksysguard_ksgrd_SensorManager.cpp) = 5fa92fa4876514198813f900f71f3364794b8248
42SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80 42SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eacb7db79de0ae5eaf80
43SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535 43SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
44SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 37303769e7b3890b47cc4f1f2715f55f2015a3ca 44SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 37303769e7b3890b47cc4f1f2715f55f2015a3ca
45SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43 45SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
46SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c 46SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
47SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e 47SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
48SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c 48SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c
49SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788 49SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788
 50SHA1 (patch-plasma_generic_scriptengines_python_plasma__importer.py) = 813dd7c51c1535e7d69ea493db8eb98084bbaac0
50SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634 51SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634
File Added: pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py
$NetBSD: patch-plasma_generic_scriptengines_python_plasma__importer.py,v 1.1 2017/09/26 13:10:07 abs Exp $
No need to check python version as exec() works in supported 2.x (2.7)
versions now

--- plasma/generic/scriptengines/python/plasma_importer.py.orig	2015-08-12 07:03:15.000000000 +0000
+++ plasma/generic/scriptengines/python/plasma_importer.py
@@ -22,8 +22,6 @@ import sys
 import os
 import imp
 
-PY3 = sys.version_info[0] == 3
-
 
 class PlasmaImporter(object):
     def __init__(self):
@@ -107,10 +105,7 @@ class PlasmaImporter(object):
             mod.__path__ = [self.marker]
         if code is not None:
             try:
-                if PY3:
-                    exec(code in mod.__dict__)
-                else:
-                    exec code in mod.__dict__
+                exec(code in mod.__dict__)
             finally:
                 code.close()
         return mod