Merge pull request #6144 from Rmys/master

qt5-5.12.0:ver.bump

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

@@ -18,7 +18,8 @@ qtbase = qt5.prefix
 absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
 
 #Temporary bindir to avoid qt4 conflicts
-bindirQt5="/usr/lib/qt5/bin"
+#bindirQt5="/usr/lib/qt5/bin"
+bindirQt5="/usr/bin"
 
 def setup():
     checkdeletepath="%s/qtbase/src/3rdparty"  % absoluteWorkDir
@@ -112,9 +113,9 @@ def install():
     qt5.install("INSTALL_ROOT=%s" % get.installDIR())
 
     #I hope qtchooser will manage this issue
-    for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
-        pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
+    #for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
+        #pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
 
     mkspecPath = "%s/mkspecs" %  qt5.archdatadir
 
-    pisitools.dodoc("LGPL_EXCEPTION.txt", "LICENSE.*")
+    pisitools.dodoc("LICENSE.*")

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

@@ -11,7 +11,7 @@
         <Summary>Cross platform application and UI framework</Summary>
         <Description>Cross platform application and UI development framework</Description>
         <License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
-        <Archive sha1sum="6f337bdf04fd988f2da4d0fbce431a82224b1c4e" type="tarxz">http://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz</Archive>
+        <Archive sha1sum="67ea0cdbe65d9406dcef36b3a6899cb17c812678" type="tarxz">http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>at-spi2-core-devel</Dependency>
             <Dependency versionFrom="2.2.2">cups-devel</Dependency>
@@ -73,7 +73,7 @@
         <Patches>
         <!-- Pisilinux Patches -->
             <Patch>mkspecs.patch</Patch>
-            <Patch level="1">qt5-base-stutter.patch</Patch>
+<!--             <Patch level="1">qt5-base-stutter.patch</Patch> -->
 <!--             <Patch level="1">qtbug-65478.patch</Patch> -->
 <!--             <Patch level="1">4a04eea4.patch</Patch> -->
 <!--             <Patch level="1">9395f35c.patch</Patch> -->
@@ -262,6 +262,13 @@
     </Package>-->
 
     <History>
+        <Update release="12">
+            <Date>2018-12-05</Date>
+            <Version>5.12.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="11">
             <Date>2018-11-05</Date>
             <Version>5.11.2</Version>