CVS commit: pkgsrc/x11/kde-workspace4

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue Sep 26 13:10:07 UTC 2017

Modified Files:
        pkgsrc/x11/kde-workspace4: Makefile distinfo
Added Files:
        pkgsrc/x11/kde-workspace4/patches:
            patch-plasma_generic_scriptengines_python_plasma__importer.py

Log Message:
Remove PYTHON_VERSIONS_INCOMPATIBLE now builds with python 3.x


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/x11/kde-workspace4/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/kde-workspace4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py

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.62 pkgsrc/x11/kde-workspace4/Makefile:1.63
--- pkgsrc/x11/kde-workspace4/Makefile:1.62     Thu Aug 24 20:03:03 2017
+++ pkgsrc/x11/kde-workspace4/Makefile  Tue Sep 26 13:10:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2017/08/24 20:03:03 adam Exp $
+# $NetBSD: Makefile,v 1.63 2017/09/26 13:10:07 abs Exp $
 
 DISTNAME=      kde-workspace-4.11.22
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
@@ -7,8 +7,6 @@ CATEGORIES=     x11
 COMMENT=       Base workspace for the KDE 4 integrated X11 desktop
 MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.0/src/}
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 4.11.3
-
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
 DISTFILES=     ${DEFAULT_DISTFILES} Daemon.png Daemon.README

Index: pkgsrc/x11/kde-workspace4/distinfo
diff -u pkgsrc/x11/kde-workspace4/distinfo:1.19 pkgsrc/x11/kde-workspace4/distinfo:1.20
--- pkgsrc/x11/kde-workspace4/distinfo:1.19     Mon Jun 26 11:02:30 2017
+++ pkgsrc/x11/kde-workspace4/distinfo  Tue Sep 26 13:10:07 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2017/06/26 11:02:30 markd Exp $
+$NetBSD: distinfo,v 1.20 2017/09/26 13:10:07 abs Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -47,4 +47,5 @@ SHA1 (patch-plasma_generic_applets_digit
 SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
 SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c
 SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788
+SHA1 (patch-plasma_generic_scriptengines_python_plasma__importer.py) = 813dd7c51c1535e7d69ea493db8eb98084bbaac0
 SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634

Added files:

Index: pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py
diff -u /dev/null pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py:1.1
--- /dev/null   Tue Sep 26 13:10:07 2017
+++ pkgsrc/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py     Tue Sep 26 13:10:07 2017
@@ -0,0 +1,27 @@
+$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