1 |
commit: 7488e1201b5655cee6968fe29f8c68409ffcc9ad |
2 |
Author: PPed72 <paolo.pedroni <AT> iol <DOT> it> |
3 |
AuthorDate: Mon May 2 08:39:04 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 5 08:59:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7488e120 |
7 |
|
8 |
dev-python/pypy3-bin: fix regression in tkinter |
9 |
|
10 |
Gentoo-bug: 533384 |
11 |
Fix binary package as well as per mgorny request |
12 |
Closes: https://github.com/gentoo/gentoo/pull/1326 |
13 |
|
14 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
15 |
|
16 |
.../files/pypy3-2.4.0-fix-tkinter-regression.patch | 74 ++++++++++++++++++++++ |
17 |
dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild | 1 + |
18 |
2 files changed, 75 insertions(+) |
19 |
|
20 |
diff --git a/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch b/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch |
21 |
new file mode 100644 |
22 |
index 0000000..a92152e |
23 |
--- /dev/null |
24 |
+++ b/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch |
25 |
@@ -0,0 +1,74 @@ |
26 |
+# HG changeset patch |
27 |
+# User Philip Jenvey <pjenvey@×××××××××.org> |
28 |
+# Date 1414136649 25200 |
29 |
+# Branch py3k |
30 |
+# Node ID 8c340acffe279d63dd2df525173713b2054619c8 |
31 |
+# Parent a87e6542c186bdc7408ea027aed83c62820a9c49 |
32 |
+issue1899: fix broken bytes usage from default |
33 |
+ |
34 |
+diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py |
35 |
+--- a/lib_pypy/_tkinter/app.py |
36 |
++++ b/lib_pypy/_tkinter/app.py |
37 |
+@@ -439,7 +439,7 @@ |
38 |
+ if isinstance(s, int): |
39 |
+ return s |
40 |
+ s = s.encode('utf-8') |
41 |
+- if '\x00' in s: |
42 |
++ if b'\x00' in s: |
43 |
+ raise TypeError |
44 |
+ v = tkffi.new("int*") |
45 |
+ res = tklib.Tcl_GetBoolean(self.interp, s, v) |
46 |
+@@ -451,7 +451,7 @@ |
47 |
+ if isinstance(s, int): |
48 |
+ return s |
49 |
+ s = s.encode('utf-8') |
50 |
+- if '\x00' in s: |
51 |
++ if b'\x00' in s: |
52 |
+ raise TypeError |
53 |
+ v = tkffi.new("int*") |
54 |
+ res = tklib.Tcl_GetInt(self.interp, s, v) |
55 |
+@@ -463,7 +463,7 @@ |
56 |
+ if isinstance(s, float): |
57 |
+ return s |
58 |
+ s = s.encode('utf-8') |
59 |
+- if '\x00' in s: |
60 |
++ if b'\x00' in s: |
61 |
+ raise TypeError |
62 |
+ v = tkffi.new("double*") |
63 |
+ res = tklib.Tcl_GetDouble(self.interp, s, v) |
64 |
+@@ -472,7 +472,7 @@ |
65 |
+ return v[0] |
66 |
+ |
67 |
+ def exprboolean(self, s): |
68 |
+- if '\x00' in s: |
69 |
++ if b'\x00' in s: |
70 |
+ raise TypeError |
71 |
+ v = tkffi.new("int*") |
72 |
+ res = tklib.Tcl_ExprBoolean(self.interp, s, v) |
73 |
+@@ -481,7 +481,7 @@ |
74 |
+ return v[0] |
75 |
+ |
76 |
+ def exprlong(self, s): |
77 |
+- if '\x00' in s: |
78 |
++ if b'\x00' in s: |
79 |
+ raise TypeError |
80 |
+ v = tkffi.new("long*") |
81 |
+ res = tklib.Tcl_ExprLong(self.interp, s, v) |
82 |
+@@ -490,7 +490,7 @@ |
83 |
+ return v[0] |
84 |
+ |
85 |
+ def exprdouble(self, s): |
86 |
+- if '\x00' in s: |
87 |
++ if b'\x00' in s: |
88 |
+ raise TypeError |
89 |
+ v = tkffi.new("double*") |
90 |
+ res = tklib.Tcl_ExprDouble(self.interp, s, v) |
91 |
+@@ -499,7 +499,7 @@ |
92 |
+ return v[0] |
93 |
+ |
94 |
+ def exprstring(self, s): |
95 |
+- if '\x00' in s: |
96 |
++ if b'\x00' in s: |
97 |
+ raise TypeError |
98 |
+ res = tklib.Tcl_ExprString(self.interp, s) |
99 |
+ if res == tklib.TCL_ERROR: |
100 |
|
101 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild |
102 |
index adee3b6..d80da51 100644 |
103 |
--- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild |
104 |
+++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild |
105 |
@@ -87,6 +87,7 @@ src_prepare() { |
106 |
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
107 |
epatch "${FILESDIR}/2.4.0-ncurses6.patch" |
108 |
epatch "${FILESDIR}"/pypy3-2.4.0-libressl.patch |
109 |
+ epatch "${FILESDIR}/pypy3-2.4.0-fix-tkinter-regression.patch" |
110 |
|
111 |
sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
112 |
-e "s^@libdir@^$(get_libdir)^" \ |