| 1 |
commit: 37ec56bc389ab73912961b1b86e6a91fbd2c2992 |
| 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:42:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=37ec56bc |
| 7 |
|
| 8 |
kde-apps/kig: Fix crash upon exit when using scripting |
| 9 |
|
| 10 |
Eliminiate CRLF line terminators. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kig/files/kig-19.08.3-scripter-crash.patch | 29 ++++++++++++++++++ |
| 16 |
kde-apps/kig/files/kig-4.12.0-boostpython.patch | 35 +++++++++++----------- |
| 17 |
kde-apps/kig/kig-19.12.49.9999.ebuild | 1 + |
| 18 |
3 files changed, 48 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..9540e9044f |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch |
| 25 |
@@ -0,0 +1,29 @@ |
| 26 |
+From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Maurizio Paolini <paolini@×××××××××××.it> |
| 28 |
+Date: Sat, 11 Jan 2020 19:50:33 +0100 |
| 29 |
+Subject: Fix crash upon exit after transition python2 -> python3 when using |
| 30 |
+ scripting (bug #416037) |
| 31 |
+ |
| 32 |
+Reviewed By: kkevin |
| 33 |
+Differential Revision: https://phabricator.kde.org/D12833 |
| 34 |
+CCBUG: 416037 |
| 35 |
+--- |
| 36 |
+ scripting/python_scripter.cc | 2 +- |
| 37 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 38 |
+ |
| 39 |
+diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc |
| 40 |
+index bb5db39..3edec77 100644 |
| 41 |
+--- a/scripting/python_scripter.cc |
| 42 |
++++ b/scripting/python_scripter.cc |
| 43 |
+@@ -427,8 +427,8 @@ PythonScripter::PythonScripter() |
| 44 |
+ PythonScripter::~PythonScripter() |
| 45 |
+ { |
| 46 |
+ PyErr_Clear(); |
| 47 |
+- Py_Finalize(); |
| 48 |
+ delete d; |
| 49 |
++ Py_FinalizeEx(); |
| 50 |
+ } |
| 51 |
+ |
| 52 |
+ class CompiledPythonScript::Private |
| 53 |
+-- |
| 54 |
+cgit v1.1 |
| 55 |
|
| 56 |
diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
| 57 |
index 7a4b878c6b..5173ba2cd7 100644 |
| 58 |
--- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
| 59 |
+++ b/kde-apps/kig/files/kig-4.12.0-boostpython.patch |
| 60 |
@@ -1,17 +1,18 @@ |
| 61 |
-diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake |
| 62 |
-index 2ccc161..02d9bf6 100644 |
| 63 |
---- a/cmake/modules/FindBoostPython.cmake |
| 64 |
-+++ b/cmake/modules/FindBoostPython.cmake |
| 65 |
-@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) |
| 66 |
- # Second try: try pkg-config way |
| 67 |
- find_package(PkgConfig) |
| 68 |
- if(PKG_CONFIG_FOUND) |
| 69 |
-- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") |
| 70 |
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS) |
| 71 |
- foreach(_pyver ${PYTHON_VERSIONS}) |
| 72 |
- if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) |
| 73 |
-- pkg_check_modules(${_pyver} QUIET ${_pyver}) |
| 74 |
-+ pkg_check_modules(_python python-${_pyver}) |
| 75 |
- if(${_pyver}_FOUND) |
| 76 |
- cmake_push_check_state() |
| 77 |
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) |
| 78 |
\ No newline at end of file |
| 79 |
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake |
| 80 |
+index 2ccc161..02d9bf6 100644 |
| 81 |
+--- a/cmake/modules/FindBoostPython.cmake |
| 82 |
++++ b/cmake/modules/FindBoostPython.cmake |
| 83 |
+@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND) |
| 84 |
+ # Second try: try pkg-config way |
| 85 |
+ find_package(PkgConfig) |
| 86 |
+ if(PKG_CONFIG_FOUND) |
| 87 |
+- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") |
| 88 |
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS) |
| 89 |
+ foreach(_pyver ${PYTHON_VERSIONS}) |
| 90 |
+ if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS) |
| 91 |
+- pkg_check_modules(${_pyver} QUIET ${_pyver}) |
| 92 |
++ pkg_check_modules(_python python-${_pyver}) |
| 93 |
+ if(${_pyver}_FOUND) |
| 94 |
+ cmake_push_check_state() |
| 95 |
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) |
| 96 |
+ |
| 97 |
|
| 98 |
diff --git a/kde-apps/kig/kig-19.12.49.9999.ebuild b/kde-apps/kig/kig-19.12.49.9999.ebuild |
| 99 |
index a64ad2e315..d9087a123f 100644 |
| 100 |
--- a/kde-apps/kig/kig-19.12.49.9999.ebuild |
| 101 |
+++ b/kde-apps/kig/kig-19.12.49.9999.ebuild |
| 102 |
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND} |
| 103 |
PATCHES=( |
| 104 |
"${FILESDIR}"/${PN}-4.12.0-boostpython.patch |
| 105 |
"${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch |
| 106 |
+ "${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch |
| 107 |
) |
| 108 |
|
| 109 |
pkg_setup() { |
Archives