Merge pull request #18205 from Rmys/master

qt5-location

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

@@ -9,10 +9,20 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import qt5
 from pisi.actionsapi import get
+import os
 
 def setup():
     #shelltools.system("patch  -R -p1 < 3eaed3d6.diff")
     pisitools.dosed(".qmake.conf", "5.15.18", "5.15.16")
+
+    if not os.path.exists(".git"):
+        shelltools.system("git init")
+        shelltools.system("git add .")
+
+    shelltools.system("git submodule init")
+    shelltools.system('git submodule set-url src/3rdparty/mapbox-gl-native "%s/qtlocation-mapboxgl"' % get.workDIR())
+    shelltools.system("git -c protocol.file.allow=always submodule update")
+
     qt5.configure()
 
 def build():

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

@@ -11,11 +11,13 @@
         <Summary>Provides access to position, satellite and area monitoring classes</Summary>
         <Description>Provides access to position, satellite and area monitoring classes</Description>
         <License>LGPLv2.1-linking-exception</License>
-        <Archive sha1sum="8e1af5b774953bacd363d9921bb0891271d926cb" type="tarbz2">https://invent.kde.org/qt/qt/qtlocation/-/archive/v5.15.18-lts-lgpl/qtlocation-v5.15.18-lts-lgpl.tar.bz2</Archive>
+        <Archive sha1sum="b041fb3b5db95c33c97b1cb9a938c6ce4a796007" type="tarxz">https://source.pisilinux.org/qt5-location-5.15.18.tar.xz</Archive>
+<!--         <Archive sha1sum="8e1af5b774953bacd363d9921bb0891271d926cb" type="tarbz2">https://invent.kde.org/qt/qt/qtlocation/-/archive/v5.15.18-lts-lgpl/qtlocation-v5.15.18-lts-lgpl.tar.bz2</Archive> -->
         <AdditionalFiles>
             <AdditionalFile target="3eaed3d6.diff">3eaed3d6.diff</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
+            <Dependency>git</Dependency>
             <Dependency>mesa-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>icu4c-devel</Dependency>
@@ -27,6 +29,7 @@
             <Dependency versionFrom="5.15.16">qt5-base-devel</Dependency>
             <Dependency versionFrom="5.15.16">qt5-assistant-devel</Dependency>
             <Dependency versionFrom="5.15.16">qt5-declarative-devel</Dependency>
+            <Dependency versionFrom="5.15.16">qt5-serialport-devel</Dependency>
         </BuildDependencies>
         <Patches>
 <!--             <Patch>Fix-build-with-ICU-75.patch</Patch> -->