Merge pull request #6509 from Rmys/master

qt5-base:rebuild nouveau.patch

desktop/toolkit/qt5/qt5-base/actions.py

@@ -22,6 +22,8 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
 bindirQt5="/usr/bin"
 
 def setup():
+    shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch")
+    
     checkdeletepath="%s/qtbase/src/3rdparty"  % absoluteWorkDir
     for dir in ('libjpeg', 'freetype', 'libpng', 'zlib', "xcb", "sqlite"):
         if os.path.exists(checkdeletepath+dir):

desktop/toolkit/qt5/qt5-base/pspec.xml

@@ -12,6 +12,9 @@
         <Description>Cross platform application and UI development framework</Description>
         <License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
         <Archive sha1sum="e48e91f343a7b02dc7012c787a2e3fcb3589f16d" type="tarxz">http://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz</Archive>
+        <AdditionalFiles>
+            <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile>
+        </AdditionalFiles>
         <BuildDependencies>
             <Dependency>at-spi2-core-devel</Dependency>
             <Dependency versionFrom="2.2.2">cups-devel</Dependency>
@@ -77,7 +80,6 @@
         <Patch>mkspecs.patch</Patch>
             <Patch level="1">qt-delayed-highlight.patch</Patch>
             <Patch level="1">qtbug-69310.patch</Patch>
-            <Patch level="1">qt5-base-nouveau-freeze.patch</Patch>
         </Patches>
     </Source>