diff options
| author | abs <abs@pkgsrc.org> | 2017-09-26 13:10:07 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2017-09-26 13:10:07 +0000 |
| commit | bd31f9d1e20310bc6804c636089f5c2c762a9541 (patch) | |
| tree | 24e9e2b47ede274c661694fc64ab5396a820d447 /x11 | |
| parent | 5931a316cea25acb537c2bf5fb5b6b3b11e3a910 (diff) | |
| download | pkgsrc-bd31f9d1e20310bc6804c636089f5c2c762a9541.tar.gz | |
Remove PYTHON_VERSIONS_INCOMPATIBLE now builds with python 3.x
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde-workspace4/Makefile | 4 | ||||
| -rw-r--r-- | x11/kde-workspace4/distinfo | 3 | ||||
| -rw-r--r-- | x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py | 27 |
3 files changed, 30 insertions, 4 deletions
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index 721585442ff..e6e29aec125 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -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 diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo index ba806667082..550762f1065 100644 --- a/x11/kde-workspace4/distinfo +++ b/x11/kde-workspace4/distinfo @@ -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_digital-clock_clock.cpp) = dd052f6c36fbd62dd5 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 diff --git a/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py b/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py new file mode 100644 index 00000000000..226ebd7fb61 --- /dev/null +++ b/x11/kde-workspace4/patches/patch-plasma_generic_scriptengines_python_plasma__importer.py @@ -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 |