summaryrefslogtreecommitdiff
path: root/kde-apps/kig/files
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/kig/files')
-rw-r--r--kde-apps/kig/files/kig-19.08.3-scripter-crash.patch29
-rw-r--r--kde-apps/kig/files/kig-4.12.0-boostpython.patch2
2 files changed, 30 insertions, 1 deletions
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
new file mode 100644
index 000000000000..9540e9044f3b
--- /dev/null
+++ b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch
@@ -0,0 +1,29 @@
+From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001
+From: Maurizio Paolini <paolini@dmf.unicatt.it>
+Date: Sat, 11 Jan 2020 19:50:33 +0100
+Subject: Fix crash upon exit after transition python2 -> python3 when using
+ scripting (bug #416037)
+
+Reviewed By: kkevin
+Differential Revision: https://phabricator.kde.org/D12833
+CCBUG: 416037
+---
+ scripting/python_scripter.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
+index bb5db39..3edec77 100644
+--- a/scripting/python_scripter.cc
++++ b/scripting/python_scripter.cc
+@@ -427,8 +427,8 @@ PythonScripter::PythonScripter()
+ PythonScripter::~PythonScripter()
+ {
+ PyErr_Clear();
+- Py_Finalize();
+ delete d;
++ Py_FinalizeEx();
+ }
+
+ class CompiledPythonScript::Private
+--
+cgit v1.1
diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch
index 7a4b878c6bc3..c9ca1b2f9d06 100644
--- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch
+++ b/kde-apps/kig/files/kig-4.12.0-boostpython.patch
@@ -14,4 +14,4 @@ index 2ccc161..02d9bf6 100644
+ pkg_check_modules(_python python-${_pyver})
if(${_pyver}_FOUND)
cmake_push_check_state()
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) \ No newline at end of file
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS})