From aa89dee6d763d48a1a759d507af83147ac4886c9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 25 Aug 2017 10:09:17 -0500 Subject: [PATCH] pull in upstream fix(es) --- .gitignore | 2 ++ kf5-syntax-highlighting.spec | 12 +++++------- sources | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ae9a42c..ed605c1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /syntax-highlighting-5.35.0.tar.xz /syntax-highlighting-5.36.0.tar.xz /syntax-highlighting-5.37.0.tar.xz +/0007-indexer-Use-qWarning-for-every-error-message.patch +/0009-Escape-hyphen-in-rest.xml-regular-expressions.patch diff --git a/kf5-syntax-highlighting.spec b/kf5-syntax-highlighting.spec index ab13dbd..78c74e6 100644 --- a/kf5-syntax-highlighting.spec +++ b/kf5-syntax-highlighting.spec @@ -24,7 +24,11 @@ URL: https://cgit.kde.org/%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -BuildRequires: extra-cmake-modules +## upstream fixes (lookaside cache) +Patch7: 0007-indexer-Use-qWarning-for-every-error-message.patch +Patch9: 0009-Escape-hyphen-in-rest.xml-regular-expressions.patch + +BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros BuildRequires: perl-interpreter @@ -50,12 +54,6 @@ developing applications that use %{name}. %prep %autosetup -n %{framework}-%{version} -p1 -# to allow building on non-rawhide (for now) -sed -i \ - -e 's|^find_package(ECM 5.29.0 |find_package(ECM 5.27.0 |' \ - CMakeLists.txt - - %build mkdir %{_target_platform} diff --git a/sources b/sources index c1eaaf9..4f558ad 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (syntax-highlighting-5.37.0.tar.xz) = d49f62934283c07c1b6e8fad11b9fa469b21bb55f35ddbc6c28ab29bd79b7cba67a93d0b46abb8b3d86ee7ba7a90ea50a98553aac7bdfe396bc2b010611c24c2 +SHA512 (0007-indexer-Use-qWarning-for-every-error-message.patch) = 6674da081912e87b532cea522b1eb09b7a115dee7b2b95818ba2313413c260b4a1f06af48667aa844f3290724864c43790eb20e4b4714e35fb2eafdd2c67c716 +SHA512 (0009-Escape-hyphen-in-rest.xml-regular-expressions.patch) = 2a846ea2e4a5cb57277cd1853ff156e451169f7425d61f00d6b7f8d8cf881c8ce757a839b7221d6eeba17f42022025032c72c40f8c321612a9775e7f1a578071