1 |
commit: 4192a8a2ac751d40de78a84c7ffdc272f5cfeb71 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 27 15:47:25 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 27 15:52:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4192a8a2 |
7 |
|
8 |
dev-util/gtk-builder-convert: add Python 3 patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/741410 |
11 |
Closes: https://bugs.gentoo.org/741412 |
12 |
Closes: https://bugs.gentoo.org/741408 |
13 |
Closes: https://bugs.gentoo.org/735324 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../gtk-builder-convert-2.24.32-python3.patch | 56 ++++++++++++++++++++++ |
17 |
...build => gtk-builder-convert-2.24.32-r1.ebuild} | 12 +++-- |
18 |
profiles/package.mask | 4 -- |
19 |
3 files changed, 63 insertions(+), 9 deletions(-) |
20 |
|
21 |
diff --git a/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch |
22 |
new file mode 100644 |
23 |
index 00000000000..01dc3d0aaff |
24 |
--- /dev/null |
25 |
+++ b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch |
26 |
@@ -0,0 +1,56 @@ |
27 |
+https://trac.macports.org/export/50710/trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff |
28 |
+--- a/gtk/gtk-builder-convert 2009-04-27 14:02:41.000000000 +0300 |
29 |
++++ b/gtk/gtk-builder-convert 2009-04-27 13:58:26.000000000 +0300 |
30 |
+@@ -258,7 +258,7 @@ |
31 |
+ for node in objects: |
32 |
+ self._convert(node.getAttribute("class"), node) |
33 |
+ if self._get_object(node.getAttribute('id')) is not None: |
34 |
+- print "WARNING: duplicate id \"" + node.getAttribute('id') + "\"" |
35 |
++ print("WARNING: duplicate id \"" + node.getAttribute('id') + "\"") |
36 |
+ self.objects[node.getAttribute('id')] = node |
37 |
+ |
38 |
+ # Convert Gazpachos UI tag |
39 |
+@@ -441,8 +441,8 @@ |
40 |
+ if signal_name in ['activate', 'toggled']: |
41 |
+ action.appendChild(signal) |
42 |
+ else: |
43 |
+- print 'Unhandled signal %s::%s' % (node.getAttribute('class'), |
44 |
+- signal_name) |
45 |
++ print('Unhandled signal %s::%s' % (node.getAttribute('class'), |
46 |
++ signal_name)) |
47 |
+ |
48 |
+ if not uimgr.childNodes: |
49 |
+ child = self._dom.createElement('child') |
50 |
+@@ -461,8 +461,8 @@ |
51 |
+ for accelerator in get_accelerator_nodes(node): |
52 |
+ signal_name = accelerator.getAttribute('signal') |
53 |
+ if signal_name != 'activate': |
54 |
+- print 'Unhandled accelerator signal for %s::%s' % ( |
55 |
+- node.getAttribute('class'), signal_name) |
56 |
++ print('Unhandled accelerator signal for %s::%s' % ( |
57 |
++ node.getAttribute('class'), signal_name)) |
58 |
+ continue |
59 |
+ accelerator.removeAttribute('signal') |
60 |
+ child.appendChild(accelerator) |
61 |
+@@ -711,7 +711,7 @@ |
62 |
+ return s.stdout.read() |
63 |
+ |
64 |
+ def usage(): |
65 |
+- print __doc__ |
66 |
++ print(__doc__) |
67 |
+ |
68 |
+ def main(args): |
69 |
+ try: |
70 |
+@@ -745,10 +745,10 @@ |
71 |
+ |
72 |
+ xml = _indent(conv.to_xml()) |
73 |
+ if output_filename == "-": |
74 |
+- print xml |
75 |
++ print(xml) |
76 |
+ else: |
77 |
+ open(output_filename, 'w').write(xml) |
78 |
+- print "Wrote", output_filename |
79 |
++ print("Wrote", output_filename) |
80 |
+ |
81 |
+ return 0 |
82 |
+ |
83 |
|
84 |
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild |
85 |
similarity index 91% |
86 |
rename from dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild |
87 |
rename to dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild |
88 |
index 323ce94de3e..889c321a3bc 100644 |
89 |
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild |
90 |
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild |
91 |
@@ -2,8 +2,9 @@ |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
|
94 |
EAPI=6 |
95 |
+ |
96 |
GNOME_ORG_MODULE="gtk+" |
97 |
-PYTHON_COMPAT=( python2_7 ) |
98 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
99 |
PYTHON_REQ_USE="xml" |
100 |
|
101 |
inherit gnome.org python-single-r1 |
102 |
@@ -14,12 +15,9 @@ HOMEPAGE="https://www.gtk.org/" |
103 |
LICENSE="LGPL-2+" |
104 |
SLOT="0" |
105 |
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
106 |
- |
107 |
-IUSE="" |
108 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
109 |
|
110 |
COMMON_DEPEND="${PYTHON_DEPS}" |
111 |
- |
112 |
# gtk-builder-convert was part of gtk+ until 2.24.10-r1 |
113 |
# man page transitioned in 2.24.31-r1 |
114 |
RDEPEND="${COMMON_DEPEND} |
115 |
@@ -32,10 +30,14 @@ DEPEND="${COMMON_DEPEND} |
116 |
dev-libs/libxslt |
117 |
" |
118 |
|
119 |
+PATCHES=( |
120 |
+ "${FILESDIR}/${PN}-2.24.32-python3.patch" |
121 |
+) |
122 |
+ |
123 |
src_configure() { :; } |
124 |
|
125 |
src_compile() { |
126 |
- xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml |
127 |
+ xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml || die |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
|
132 |
diff --git a/profiles/package.mask b/profiles/package.mask |
133 |
index 216fd455c3a..c805d6e5b48 100644 |
134 |
--- a/profiles/package.mask |
135 |
+++ b/profiles/package.mask |
136 |
@@ -45,14 +45,10 @@ net-voip/telepathy-haze |
137 |
# unresponsive. Please do not remove any packages from this list unless |
138 |
# you actually port them to Python 3. |
139 |
# Removal in 30 days. Please find relevant bugs on tracker bug #694800. |
140 |
-app-misc/klavaro |
141 |
-dev-util/gtk-builder-convert |
142 |
games-arcade/diameter |
143 |
games-board/gnome-hearts |
144 |
net-analyzer/sguil-server |
145 |
net-analyzer/tcpflow |
146 |
-sci-chemistry/rasmol |
147 |
-sys-apps/gsmartcontrol |
148 |
|
149 |
# Michał Górny <mgorny@g.o> (2020-09-26) |
150 |
# Dead Python 2-only package. No significant revdeps left. |