Merge pull request #624 from ayhanyalcinsoy/master

qt5-base:fixed patches
2015-10-17 17:17:40 +03:00
parent c14195c36b 9176b487b6
commit ef6ca9d575
10 changed files with 80344 additions and 79683 deletions
@@ -39,7 +39,7 @@
            <Dependency>kwidgetsaddons-devel</Dependency>
            <Dependency>qt5-declarative-devel</Dependency>
            <Dependency>kdelibs4-support-devel</Dependency>
-            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kdesignerplugin-devel</Dependency>
        </BuildDependencies>
    </Source>

@@ -19,6 +19,12 @@
            <Dependency>qt5-script-devel</Dependency>
            <Dependency>kdoctools-devel</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kparts-devel</Dependency>
+            <Dependency>solid-devel</Dependency>
+            <Dependency>kxmlgui-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
        </BuildDependencies>
    </Source>

@@ -19,7 +19,7 @@
            <Dependency>kdoctools-devel</Dependency>
            <Dependency>cmake</Dependency>
            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kcoreaddons-devel<Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
            <Dependency>kauth-devel</Dependency>
            <Dependency>kwallet-devel</Dependency>
            <Dependency>kservice-devel</Dependency>
@@ -1,5 +1,5 @@
 --- g++-base.conf	2014-12-05 18:24:38.000000000 +0200
-+++ qtbase-opensource-src-5.4.0/mkspecs/common/g++-base.conf	2015-02-16 12:34:43.603049664 +0200
+++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-base.conf	2015-02-16 12:34:43.603049664 +0200
@@ -10,17 +10,22 @@
 
 QMAKE_COMPILER          = gcc
@@ -1,5 +1,5 @@
 --- g++-unix.conf	2015-02-16 12:35:34.978050836 +0200
-+++ qtbase-opensource-src-5.4.0/mkspecs/common/g++-unix.conf	2015-02-16 12:35:58.703051378 +0200
+++ qtbase-opensource-src-5.5.1/mkspecs/common/g++-unix.conf	2015-02-16 12:35:58.703051378 +0200
@@ -10,5 +10,5 @@
 
 include(g++-base.conf)
@@ -1,5 +1,5 @@
 --- linux.conf	2014-12-05 18:24:38.000000000 +0200
-+++ qtbase-opensource-src-5.4.0/mkspecs/common/linux.conf	2015-02-16 12:36:52.547052606 +0200
+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf	2015-02-16 12:36:52.547052606 +0200
@@ -49,7 +49,7 @@
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
@@ -1 +1 @@
-f7d8ed47553ee17c6c7358149846be07cd710254
+c06915b840a48a85b9442c160eda0064c43b79a7
@@ -1 +1 @@
-75891b6fd4aa45484faa6afebe483e6775328272
+c8ebf8830d3000d00a706685d53e8fb134a2e9cf