1 |
commit: 9c71027b57506d54c4d3c33edd4d0e8ee40ffb0f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 21 16:05:42 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 21 16:07:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c71027b |
7 |
|
8 |
kde-apps/kig: Fix crash upon exit when using scripting |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../kig/files/kig-19.08.3-scripter-crash.patch | 29 +++++++++ |
14 |
kde-apps/kig/files/kig-4.12.0-boostpython.patch | 2 +- |
15 |
kde-apps/kig/kig-19.08.3-r2.ebuild | 73 ++++++++++++++++++++++ |
16 |
kde-apps/kig/kig-19.12.1-r1.ebuild | 72 +++++++++++++++++++++ |
17 |
4 files changed, 175 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..9540e9044f3 |
22 |
--- /dev/null |
23 |
+++ b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch |
24 |
@@ -0,0 +1,29 @@ |
25 |
+From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001 |
26 |
+From: Maurizio Paolini <paolini@×××××××××××.it> |
27 |
+Date: Sat, 11 Jan 2020 19:50:33 +0100 |
28 |
+Subject: Fix crash upon exit after transition python2 -> python3 when using |
29 |
+ scripting (bug #416037) |
30 |
+ |
31 |
+Reviewed By: kkevin |
32 |
+Differential Revision: https://phabricator.kde.org/D12833 |
33 |
+CCBUG: 416037 |
34 |
+--- |
35 |
+ scripting/python_scripter.cc | 2 +- |
36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
37 |
+ |
38 |
+diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc |
39 |
+index bb5db39..3edec77 100644 |
40 |
+--- a/scripting/python_scripter.cc |
41 |
++++ b/scripting/python_scripter.cc |
42 |
+@@ -427,8 +427,8 @@ PythonScripter::PythonScripter() |
43 |
+ PythonScripter::~PythonScripter() |
44 |
+ { |
45 |
+ PyErr_Clear(); |
46 |
+- Py_Finalize(); |
47 |
+ delete d; |
48 |
++ Py_FinalizeEx(); |
49 |
+ } |
50 |
+ |
51 |
+ class CompiledPythonScript::Private |
52 |
+-- |
53 |
+cgit v1.1 |
54 |
|
55 |
diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
56 |
index 7a4b878c6bc..c9ca1b2f9d0 100644 |
57 |
--- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
58 |
+++ b/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
59 |
@@ -14,4 +14,4 @@ index 2ccc161..02d9bf6 100644 |
60 |
+ pkg_check_modules(_python python-${_pyver}) |
61 |
if(${_pyver}_FOUND) |
62 |
cmake_push_check_state() |
63 |
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) |
64 |
\ No newline at end of file |
65 |
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) |
66 |
|
67 |
diff --git a/kde-apps/kig/kig-19.08.3-r2.ebuild b/kde-apps/kig/kig-19.08.3-r2.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..e6f4820bb30 |
70 |
--- /dev/null |
71 |
+++ b/kde-apps/kig/kig-19.08.3-r2.ebuild |
72 |
@@ -0,0 +1,73 @@ |
73 |
+# Copyright 1999-2020 Gentoo Authors |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI=7 |
77 |
+ |
78 |
+ECM_HANDBOOK="forceoptional" |
79 |
+ECM_TEST="true" |
80 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
81 |
+KFMIN=5.60.0 |
82 |
+QTMIN=5.12.3 |
83 |
+inherit python-single-r1 ecm kde.org |
84 |
+ |
85 |
+DESCRIPTION="KDE Interactive Geometry tool" |
86 |
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig |
87 |
+https://edu.kde.org/kig/" |
88 |
+ |
89 |
+LICENSE="GPL-2" # TODO: CHECK |
90 |
+SLOT="5" |
91 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
92 |
+IUSE="geogebra scripting" |
93 |
+ |
94 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
95 |
+ |
96 |
+RDEPEND="${PYTHON_DEPS} |
97 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
98 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
99 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
100 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
101 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
102 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
103 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
104 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
105 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
106 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
107 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
108 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
109 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
110 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
111 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
112 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
113 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
114 |
+ geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) |
115 |
+ scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) |
116 |
+" |
117 |
+DEPEND="${RDEPEND} |
118 |
+ >=kde-frameworks/ktexteditor-${KFMIN}:5 |
119 |
+" |
120 |
+ |
121 |
+PATCHES=( |
122 |
+ "${FILESDIR}"/${PN}-4.12.0-boostpython.patch |
123 |
+ "${FILESDIR}"/${P}-scripter-python3.patch |
124 |
+ "${FILESDIR}"/${P}-scripter-crash.patch |
125 |
+ "${FILESDIR}"/${P}-pykig-python3.patch |
126 |
+) |
127 |
+ |
128 |
+pkg_setup() { |
129 |
+ python-single-r1_pkg_setup |
130 |
+ ecm_pkg_setup |
131 |
+} |
132 |
+ |
133 |
+src_prepare() { |
134 |
+ ecm_src_prepare |
135 |
+ python_fix_shebang . |
136 |
+} |
137 |
+ |
138 |
+src_configure() { |
139 |
+ local mycmakeargs=( |
140 |
+ $(cmake_use_find_package geogebra Qt5XmlPatterns) |
141 |
+ $(cmake_use_find_package scripting BoostPython) |
142 |
+ ) |
143 |
+ |
144 |
+ ecm_src_configure |
145 |
+} |
146 |
|
147 |
diff --git a/kde-apps/kig/kig-19.12.1-r1.ebuild b/kde-apps/kig/kig-19.12.1-r1.ebuild |
148 |
new file mode 100644 |
149 |
index 00000000000..97c83d4330f |
150 |
--- /dev/null |
151 |
+++ b/kde-apps/kig/kig-19.12.1-r1.ebuild |
152 |
@@ -0,0 +1,72 @@ |
153 |
+# Copyright 1999-2020 Gentoo Authors |
154 |
+# Distributed under the terms of the GNU General Public License v2 |
155 |
+ |
156 |
+EAPI=7 |
157 |
+ |
158 |
+ECM_HANDBOOK="forceoptional" |
159 |
+ECM_TEST="true" |
160 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
161 |
+KFMIN=5.63.0 |
162 |
+QTMIN=5.12.3 |
163 |
+inherit python-single-r1 ecm kde.org |
164 |
+ |
165 |
+DESCRIPTION="KDE Interactive Geometry tool" |
166 |
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig |
167 |
+https://edu.kde.org/kig/" |
168 |
+ |
169 |
+LICENSE="GPL-2" # TODO: CHECK |
170 |
+SLOT="5" |
171 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
172 |
+IUSE="geogebra scripting" |
173 |
+ |
174 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
175 |
+ |
176 |
+RDEPEND="${PYTHON_DEPS} |
177 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
178 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
179 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
180 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
181 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
182 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
183 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
184 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
185 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
186 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
187 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
188 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
189 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
190 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
191 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
192 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
193 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
194 |
+ geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) |
195 |
+ scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) |
196 |
+" |
197 |
+DEPEND="${RDEPEND} |
198 |
+ >=kde-frameworks/ktexteditor-${KFMIN}:5 |
199 |
+" |
200 |
+ |
201 |
+PATCHES=( |
202 |
+ "${FILESDIR}"/${PN}-4.12.0-boostpython.patch |
203 |
+ "${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch |
204 |
+ "${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch |
205 |
+) |
206 |
+ |
207 |
+pkg_setup() { |
208 |
+ python-single-r1_pkg_setup |
209 |
+ ecm_pkg_setup |
210 |
+} |
211 |
+ |
212 |
+src_prepare() { |
213 |
+ ecm_src_prepare |
214 |
+ python_fix_shebang . |
215 |
+} |
216 |
+ |
217 |
+src_configure() { |
218 |
+ local mycmakeargs=( |
219 |
+ $(cmake_use_find_package geogebra Qt5XmlPatterns) |
220 |
+ $(cmake_use_find_package scripting BoostPython) |
221 |
+ ) |
222 |
+ |
223 |
+ ecm_src_configure |
224 |
+} |