Merge pull request #13610 from Rmys/master

applications-24.02.0

desktop/misc/ktextaddons/actions.py

@@ -5,15 +5,40 @@
 # See the file http://www.gnu.org/licenses/gpl.txt
 
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import cmaketools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import kde5
+from pisi.actionsapi import kde6
+from pisi.actionsapi import get
+
 
 def setup():
-    kde5.configure()
+    cmaketools.configure("-B build -DBUILD_TESTING=OFF \
+                                        -DBUILD_DESIGNERPLUGIN=ON \
+                                        -DCMAKE_INSTALL_PREFIX=/usr \
+                                        -DCMAKE_INSTALL_LIBDIR=lib \
+                                        -DQT_MAJOR_VERSION=5 \
+                                        -DBUILD_QCH=ON")
+
+    cmaketools.configure("-B build6 -DBUILD_TESTING=OFF \
+                                        -DCMAKE_INSTALL_PREFIX=/usr \
+                                        -DCMAKE_INSTALL_LIBDIR=lib \
+                                        -DBUILD_DESIGNERPLUGIN=ON \
+                                        -DBUILD_WITH_QT5:BOOL=OFF \
+                                        -DBUILD_QCH=ON \
+                                        -DQT_MAJOR_VERSION=6")
+    # kde5.configure()
 
 def build():
-    kde5.make()
+    cmaketools.make("-C build")
+
+    # shelltools.cd("./build6")
+    cmaketools.make("-C build6")
 
 def install():
-    kde5.install()
+    cmaketools.install("-C build")
+
+    # shelltools.cd("./build6")
+    cmaketools.install("-C build6")
 
     pisitools.dodoc("LICENSES/*", "README*")

desktop/misc/ktextaddons/pspec.xml

@@ -13,21 +13,46 @@
         <Summary>Various text handling addons</Summary>
         <Icon>ktextaddons</Icon>
         <Description>Çeşitli metin işleme eklentileri</Description>
-        <Archive sha1sum="19fd76660c17dcaf68d81d46c62636d8964b97a5" type="tarxz">https://download.kde.org/stable/ktextaddons/ktextaddons-1.4.1.tar.xz</Archive>
+        <Archive sha1sum="1d8d187ed9919fe3aaa3b04ce2535957bba704a2" type="tarxz">https://download.kde.org/stable/ktextaddons/ktextaddons-1.5.3.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>doxygen</Dependency>
+            <Dependency>qt6-linguist</Dependency>
+            <Dependency>ki18n-kf6-devel</Dependency>
+            <Dependency>kio-kf6-devel</Dependency>
+            <Dependency>kconfig-kf6-devel</Dependency>
+            <Dependency>kxmlgui-kf6-devel</Dependency>
+            <Dependency>karchive-kf6-devel</Dependency>
+            <Dependency>qt6-base-devel</Dependency>
+            <Dependency>qt6-speech-devel</Dependency>
+            <Dependency>qt6-keychain-devel</Dependency>
+            <Dependency>qt6-designer-devel</Dependency>
+            <Dependency>qt6-assistant-devel</Dependency>
+            <Dependency>qt6-multimedia-devel</Dependency>
+            <Dependency>kconfigwidgets-kf6-devel</Dependency>
+            <Dependency>kwidgetsaddons-kf6-devel</Dependency>
+            <Dependency>extra-cmake-modules-kf6</Dependency>
+            <Dependency>sonnet-kf6-devel</Dependency>
+            <Dependency>syntax-highlighting-kf6-devel</Dependency>
+<!--             KF5 -->
             <Dependency>qt5-linguist</Dependency>
+            <Dependency>kio-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
             <Dependency>kconfig-devel</Dependency>
             <Dependency>kxmlgui-devel</Dependency>
             <Dependency>karchive-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-sql-mysql</Dependency>
+            <Dependency>qt5-sql-odbc</Dependency>
+            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency>qt5-sql-postgresql</Dependency>
             <Dependency>qt5-speech-devel</Dependency>
             <Dependency>qt5-keychain-devel</Dependency>
             <Dependency>qt5-designer-devel</Dependency>
             <Dependency>qt5-assistant-devel</Dependency>
             <Dependency>kconfigwidgets-devel</Dependency>
             <Dependency>kwidgetsaddons-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>sonnet-devel</Dependency>
+            <Dependency>syntax-highlighting-devel</Dependency>
         </BuildDependencies>
         <!--
         <Patches>
@@ -48,12 +73,53 @@
             <Dependency>qt5-keychain</Dependency>
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
+
+            <Dependency>ktextaddons-localedata</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/libKF5*</Path>
-            <Path fileType="data">/usr/share</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
-            <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="doc">/usr/share/doc/qt5</Path>
+            <Path fileType="data">/usr/share/qlogging-categories5</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>ktextaddons-kf6</Name>
+        <RuntimeDependencies>
+            <Dependency>qt6-linguist</Dependency>
+            <Dependency>ki18n-kf6</Dependency>
+            <Dependency>kio-kf6</Dependency>
+            <Dependency>kconfig-kf6</Dependency>
+            <Dependency>kxmlgui-kf6</Dependency>
+            <Dependency>karchive-kf6</Dependency>
+            <Dependency>qt6-base</Dependency>
+            <Dependency>qt6-speech</Dependency>
+            <Dependency>qt6-keychain</Dependency>
+            <Dependency>qt6-designer</Dependency>
+            <Dependency>qt6-assistant</Dependency>
+            <Dependency>qt6-multimedia</Dependency>
+            <Dependency>kconfigwidgets-kf6</Dependency>
+            <Dependency>kwidgetsaddons-kf6</Dependency>
+            <Dependency>extra-cmake-modules-kf6</Dependency>
+            <Dependency>sonnet-kf6</Dependency>
+            <Dependency>syntax-highlighting-kf6</Dependency>
+
+            <Dependency>ktextaddons-localedata</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/libKF6*</Path>
+            <Path fileType="library">/usr/lib/qt6</Path>
+            <Path fileType="doc">/usr/share/doc/qt6</Path>
+            <Path fileType="data">/usr/share/qlogging-categories6</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>ktextaddons-localedata</Name>
+        <Files>
+            <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
 
@@ -64,13 +130,31 @@
             <Dependency release="current">ktextaddons</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="header">/usr/include</Path>
+            <Path fileType="header">/usr/include/KF5</Path>
-            <Path fileType="data">/usr/lib/cmake</Path>
+            <Path fileType="data">/usr/lib/cmake/KF5*</Path>
-            <Path fileType="library">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>ktextaddons-kf6-devel</Name>
+        <Summary>Development files for ktextaddons</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">ktextaddons-kf6</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include/KF6</Path>
+            <Path fileType="data">/usr/lib/cmake/KF6*</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2024-03-03</Date>
+            <Version>1.5.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2023-08-08</Date>
             <Version>1.4.1</Version>