Merge pull request #14796 from Rmys/master

applications-24.08.0

desktop/kde6/applications/libkomparediff2-kf6/actions.py

@@ -4,16 +4,16 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import kde5
+from pisi.actionsapi import kde6
 from pisi.actionsapi import pisitools
 
 def setup():
-    kde5.configure("-DQT_MAJOR_VERSION=5")
+    kde6.configure()
 
 def build():
-    kde5.make()
+    kde6.make()
 
 def install():
-    kde5.install()
+    kde6.install()
 
     pisitools.dodoc("COPYING")

desktop/kde6/applications/libkomparediff2-kf6/pspec.xml

@@ -28,7 +28,7 @@
             <Dependency>kio-kf6-devel</Dependency>
             <Dependency>kparts-kf6-devel</Dependency>
 <!--             KF5 -->
-            <Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
+            <!--Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
             <Dependency>extra-cmake-modules-kf6</Dependency>
             <Dependency>python3-devel</Dependency>
             <Dependency>gettext-devel</Dependency>
@@ -38,7 +38,7 @@
             <Dependency>kxmlgui-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
             <Dependency>kio-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
+            <Dependency>kparts-devel</Dependency-->
         </BuildDependencies>
     </Source>
 
@@ -56,7 +56,7 @@
             <Dependency>kcoreaddons-kf6</Dependency>
             <Dependency>kconfigwidgets-kf6</Dependency>
 <!--             KF5 -->
-            <Dependency versionFrom="5.15.2">qt5-base</Dependency>
+            <!--Dependency versionFrom="5.15.2">qt5-base</Dependency>
             <Dependency>extra-cmake-modules-kf6</Dependency>
             <Dependency>python3</Dependency>
             <Dependency>gettext</Dependency>
@@ -66,7 +66,7 @@
             <Dependency>kxmlgui</Dependency>
             <Dependency>ki18n</Dependency>
             <Dependency>kio</Dependency>
-            <Dependency>kparts</Dependency>
+            <Dependency>kparts</Dependency-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>