Merge pull request #2420 from groni/master

add again new patch
2016-12-23 13:48:44 +01:00
parent 8de3b1a9b5 9ce98e54cf
commit 0c0f5bdd5f
3 changed files with 15 additions and 13 deletions
@@ -1,12 +0,0 @@
-diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2016-10-07 01:59:50.000000000 +0300
-+++ b/CMakeLists.txt	2016-10-27 22:52:08.637969443 +0300
-@@ -10,7 +10,7 @@
- set (KDE_APPLICATIONS_VERSION "0.2.1")
- 
- set(ECM_MIN_VERSION "5.29.0")
-set(QT_MIN_VERSION "5.7.0")
-+set(QT_MIN_VERSION "5.6.2")
- set(KF5_MIN_VERSION "5.29.0")
- 
- find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
@@ -0,0 +1,14 @@
+--- qtfix.patch	2016-12-22 15:50:07.000000000 +0100
+++ qtfixb.patch	2016-12-23 13:00:31.000000000 +0100
+@@ -4,9 +4,9 @@
+ @@ -10,7 +10,7 @@
+  set (KDE_APPLICATIONS_VERSION "0.2.1")
+  
+- set(ECM_MIN_VERSION "5.15.0")
+ set(ECM_MIN_VERSION "5.29.0")
+ -set(QT_MIN_VERSION "5.7.0")
+ +set(QT_MIN_VERSION "5.6.2")
+- set(KF5_MIN_VERSION "5.15.0")
+ set(KF5_MIN_VERSION "5.29.0")
+  
+  find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
@@ -25,7 +25,7 @@
            <Dependency>fluidsynth-devel</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch>qtfix.patch</Patch>
+            <Patch>qtfixc.patch</Patch>
        </Patches>
    </Source>