From 7bba167a694b703694d15d594d1fc9e98239ab4d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 3 Nov 2017 08:24:47 -0500
Subject: [PATCH] pull in committed upstream commits for qml crasher (#1508924,
 kde#385413)

---
 .gitignore           |  2 ++
 D8544.diff           | 20 --------------------
 kf5-ktexteditor.spec | 11 +++++++----
 sources              |  2 ++
 4 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 D8544.diff

diff --git a/.gitignore b/.gitignore
index 5bcd191..2f903cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /ktexteditor-5.39.0.tar.xz
+/0008-Avoid-a-QML-crash-triggered-by-C-style-indentation-s.patch
+/0009-Avoid-certain-crashes-while-executing-QML-scripts.patch
diff --git a/D8544.diff b/D8544.diff
deleted file mode 100644
index cc788c3..0000000
--- a/D8544.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/utils/kateglobal.cpp
-===================================================================
---- a/src/utils/kateglobal.cpp
-+++ b/src/utils/kateglobal.cpp
-@@ -99,6 +99,15 @@
-     // remember this
-     staticInstance = this;
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 1)
-+    // disable the QML JIT compiler as a protection against an unknown bug
-+    // in Qt's V4 engine which can provoke a crash in certain of our scripts.
-+    // See https://bugreports.qt.io/browse/QTBUG-63045
-+    // and https://bugs.kde.org/show_bug.cgi?id=385413
-+    qputenv("QV4_FORCE_INTERPRETER", QByteArrayLiteral("1"));
-+    qCDebug(LOG_KTE) << "QV4_FORCE_INTERPRETER set to 1";
-+#endif
-+
-     // init libgit2, we require at least 0.22 which has this function!
- #if LIBGIT2_FOUND
-     git_libgit2_init();
diff --git a/kf5-ktexteditor.spec b/kf5-ktexteditor.spec
index 96b9760..37c2cd5 100644
--- a/kf5-ktexteditor.spec
+++ b/kf5-ktexteditor.spec
@@ -9,7 +9,7 @@
 
 Name:           kf5-%{framework}
 Version: 5.39.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 with advanced embeddable text editor
 
 License:        LGPLv2+
@@ -24,11 +24,11 @@ URL:            https://cgit.kde.org/%{framework}.git
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
-## upstream patches
+## upstream patches (lookaside cache)
+Patch8: 0008-Avoid-a-QML-crash-triggered-by-C-style-indentation-s.patch
+Patch9: 0009-Avoid-certain-crashes-while-executing-QML-scripts.patch
 
 ## upstreamable patches
-# https://phabricator.kde.org/D8544
-Patch100: D8544.diff
 
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$
@@ -145,6 +145,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* Fri Nov 03 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.39.0-2
+- pull in committed upstream commits for qml crasher (#1508924, kde#385413)
+
 * Thu Nov 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.39.0-1.1
 - pull in crash workaround (#1508924, kde#385413)
 
diff --git a/sources b/sources
index 7ab2970..1c2b90e 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (ktexteditor-5.39.0.tar.xz) = a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f
+SHA512 (0008-Avoid-a-QML-crash-triggered-by-C-style-indentation-s.patch) = 7afac578dc1f00d6f2bb22bba5cfdeb6e018def4a61ee5134bea7c919c11df5b77eb49e58d9ad25bb39c049fd0d4a5cc878ce918cfcbf1bb3b7b29b0555b07fd
+SHA512 (0009-Avoid-certain-crashes-while-executing-QML-scripts.patch) = 94a271de8cf8453a594643fb0b68155b0de550533539638f8605832f47cd7b671c9d319f7794d0b6b585325d3fd11eb0723a87d1258d40d746591d21dde2d3ea