From 3cfafd8fddee9f9b6716b9743a838830d71a1b54 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Mon, 16 Dec 2024 12:42:30 +0300
Subject: [PATCH] applications-24.12.0

---
 .../kde6/applications/marble-kf6/actions.py   |  2 +-
 .../kde6/applications/marble-kf6/pspec.xml    | 60 +------------------
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/desktop/kde6/applications/marble-kf6/actions.py b/desktop/kde6/applications/marble-kf6/actions.py
index b0f02b2aef..15de630ede 100755
--- a/desktop/kde6/applications/marble-kf6/actions.py
+++ b/desktop/kde6/applications/marble-kf6/actions.py
@@ -9,7 +9,7 @@ from pisi.actionsapi import kde6
 from pisi.actionsapi import kde5
 
 def setup():
-    kde5.configure("-DWITH_libshp=OFF \
+    kde6.configure("-DWITH_libshp=OFF \
                     -DWITH_libgps=OFF \
                     -DWITH_QextSerialPort=OFF \
                     -DWITH_liblocation=OFF \
diff --git a/desktop/kde6/applications/marble-kf6/pspec.xml b/desktop/kde6/applications/marble-kf6/pspec.xml
index e8c718018b..1f1dd42231 100755
--- a/desktop/kde6/applications/marble-kf6/pspec.xml
+++ b/desktop/kde6/applications/marble-kf6/pspec.xml
@@ -25,6 +25,7 @@
             <Dependency versionFrom="6.6.3">qt6-sql-sqlite</Dependency>
             <Dependency versionFrom="6.6.3">qt6-linguist</Dependency>
             <Dependency versionFrom="6.6.3">qt6-webengine-devel</Dependency>
+            <Dependency versionFrom="6.6.3">qt6-5compat-devel</Dependency>
             <Dependency>kdoctools-kf6-devel</Dependency>
             <Dependency>qt6-phonon-devel</Dependency>
             <Dependency>kio-kf6-devel</Dependency>
@@ -42,38 +43,6 @@
             <Dependency>qt6-serialport-devel</Dependency>
             <Dependency>plasma-desktop-kf6</Dependency>
             <Dependency>extra-cmake-modules-kf6</Dependency>
-<!--             kf5 -->
-            <!--Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-webkit-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-script-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-svg-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-sql-postgresql</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-sql-mysql</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-sql-odbc</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-sql-sqlite</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-linguist</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-webengine-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>qt5-phonon-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>quazip-devel</Dependency>
-            <Dependency>kwallet-devel</Dependency>
-            <Dependency>knewstuff-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency>kcoreaddons-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>krunner-devel</Dependency>
-            <Dependency>kservice-devel</Dependency>
-            <Dependency>libwlocate-devel</Dependency>
-            <Dependency>shared-mime-info</Dependency>
-            <Dependency>qt5-serialport-devel</Dependency>
-            <Dependency>protobuf-devel</Dependency>
-            <Dependency>qt5-webchannel-devel</Dependency>
-            <Dependency>ffmpeg4-devel</Dependency-->
         </BuildDependencies>
     </Source>
 
@@ -99,33 +68,6 @@
             <Dependency>kwidgetsaddons-kf6</Dependency>
             <Dependency versionFrom="6.6.3">qt6-declarative</Dependency>
             <Dependency versionFrom="6.6.3">qt6-serialport</Dependency>
-<!--             kf5 -->
-            <!--Dependency>kio</Dependency>
-            <Dependency>zlib</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kcrash</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>krunner</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>protobuf</Dependency>
-            <Dependency>qt5-webengine</Dependency>
-            <Dependency>qt5-webchannel</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-svg</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-base</Dependency>
-            <Dependency>knewstuff</Dependency>
-            <Dependency>libwlocate</Dependency>
-            <Dependency>qt5-phonon</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-script</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-webkit</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-location</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>ffmpeg4</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
-            <Dependency versionFrom="5.15.2">qt5-serialport</Dependency-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>