diff --git a/office/calligra/calligra/actions.py b/office/calligra/calligra/actions.py
index 8bfb51dd8b..844b4021b0 100644
--- a/office/calligra/calligra/actions.py
+++ b/office/calligra/calligra/actions.py
@@ -5,21 +5,22 @@
 # See the file http://www.gnu.org/licenses/gpl.txt
 
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import kde5
+from pisi.actionsapi import kde6
 from pisi.actionsapi import get
 
 def setup():
-    kde5.configure("-DPYTHON_EXECUTABLE=python3 \
+    kde6.configure("-DPYTHON_EXECUTABLE=python3 \
                     -DBUILD_TESTING=OFF \
                     -DCMAKE_BUILD_TYPE=debugfull \
                     -DCMAKE_INSTALL_LIBDIR=lib \
                     -Wno-dev  \
+                    -DQT_MAJOR_VERSION=6 \
                     -DBUILD_UNMAINTAINED=ON")
 
 def build():
-    kde5.make()
+    kde6.make()
 
 def install():
-    kde5.install("DESTDIR=%s" % get.installDIR())
+    kde6.install("DESTDIR=%s" % get.installDIR())
 
     pisitools.dodoc("ANNOTATIONS-ODF", "AUTHORS", "COPYING*", "OBSOLETE.TXT", "README*", "TODO-ANNOTATIONS", "doc/status.txt")
diff --git a/office/calligra/calligra/pspec.xml b/office/calligra/calligra/pspec.xml
index 559cadd4c5..f6e1172586 100644
--- a/office/calligra/calligra/pspec.xml
+++ b/office/calligra/calligra/pspec.xml
@@ -14,71 +14,62 @@
         <IsA>app:gui</IsA>
         <Summary>Office and graphic art suite by KDE</Summary>
         <Description>Calligra is a free, integrated office suite for KDE. The application suite consists of a word-processor, a spreadsheet application, a presentation creator and viewer application, an organizer and more.</Description>
-        <Archive sha1sum="210ee802d687580a7ca5b8f57d88c1484337543a" type="tarbz2">https://invent.kde.org/office/calligra/-/archive/cd8e37552f3201391da424a95b9e3f581d89d8b6/calligra-cd8e37552f3201391da424a95b9e3f581d89d8b6.tar.bz2</Archive>
+        <Archive sha1sum="1b3df7c7a27f8d4db116ea08a28ecb14ec3c9c76" type="tarxz">https://download.kde.org/stable/calligra/calligra-4.0.0.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>
-            <Dependency>qt5-declarative-devel</Dependency>
-            <Dependency>qt5-svg-devel</Dependency>
-            <Dependency>qt5-x11extras-devel</Dependency>
-            <Dependency>qt5-quickcontrols2-devel</Dependency>
-            <Dependency>qt5-sql-mysql</Dependency>
-            <Dependency>qt5-sql-odbc</Dependency>
-            <Dependency>qt5-sql-postgresql</Dependency>
-            <Dependency>qt5-sql-sqlite</Dependency>
-            <Dependency>qt5-webkit-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>karchive-devel</Dependency>
-            <Dependency>kcodecs-devel</Dependency>
-            <Dependency>kcompletion-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>kconfigwidgets-devel</Dependency>
-            <Dependency>kcoreaddons-devel</Dependency>
-            <Dependency>kdbusaddons-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>kguiaddons-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency>kitemviews-devel</Dependency>
-            <Dependency>kdelibs4-support-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>kross-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency>sonnet-devel</Dependency>
-            <Dependency>kholidays-devel</Dependency>
-            <Dependency>ktexteditor-devel</Dependency>
-            <Dependency>ktextwidgets-devel</Dependency>
-            <Dependency>threadweaver-devel</Dependency>
-            <Dependency>kwallet-devel</Dependency>
-            <Dependency>kwidgetsaddons-devel</Dependency>
-            <Dependency>kwindowsystem-devel</Dependency>
-            <Dependency>kjobwidgets-devel</Dependency>
-            <Dependency>kxmlgui-devel</Dependency>
-            <Dependency>knotifyconfig-devel</Dependency>
-            <Dependency>knotifications-devel</Dependency>
-            <Dependency>kcmutils-devel</Dependency>
-            <Dependency>kdesignerplugin</Dependency>
-            <Dependency>kemoticons-devel</Dependency>
-            <Dependency>kitemmodels-devel</Dependency>
-            <Dependency>kinit-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <Dependency>kactivities-devel</Dependency>
-            <Dependency>khtml-devel</Dependency>
-            <Dependency>kcontacts-devel</Dependency>
-            <Dependency>akonadi-contacts-devel</Dependency>
-            <Dependency>akonadi-devel</Dependency>
-            <Dependency>kdiagram-devel</Dependency>
-            <Dependency>kreport-devel</Dependency>
-            <Dependency>kproperty-devel</Dependency>
-            <Dependency>qca2-qt5-devel</Dependency>
-            <Dependency>marble-devel</Dependency>
+            <Dependency>qt6-base-devel</Dependency>
+            <Dependency>qt6-keychain-devel</Dependency>
+            <Dependency>qt6-declarative-devel</Dependency>
+            <Dependency>qt6-svg-devel</Dependency>
+            <Dependency>qt6-sql-mysql</Dependency>
+            <Dependency>qt6-sql-odbc</Dependency>
+            <Dependency>qt6-sql-postgresql</Dependency>
+            <Dependency>qt6-sql-sqlite</Dependency>
+            <Dependency>qt6-phonon-devel</Dependency>
+            <Dependency>qt6-webengine-devel</Dependency>
+            <Dependency>extra-cmake-modules-kf6</Dependency>
+            <Dependency>karchive-kf6-devel</Dependency>
+            <Dependency>kcodecs-kf6-devel</Dependency>
+            <Dependency>kcompletion-kf6-devel</Dependency>
+            <Dependency>kconfig-kf6-devel</Dependency>
+            <Dependency>kconfigwidgets-kf6-devel</Dependency>
+            <Dependency>kcoreaddons-kf6-devel</Dependency>
+            <Dependency>kdbusaddons-kf6-devel</Dependency>
+            <Dependency>kdoctools-kf6-devel</Dependency>
+            <Dependency>kguiaddons-kf6-devel</Dependency>
+            <Dependency>ki18n-kf6-devel</Dependency>
+            <Dependency>kiconthemes-kf6-devel</Dependency>
+            <Dependency>kitemviews-kf6-devel</Dependency>
+            <Dependency>kio-kf6-devel</Dependency>
+            <Dependency>kparts-kf6-devel</Dependency>
+            <Dependency>sonnet-kf6-devel</Dependency>
+            <Dependency>kholidays-kf6-devel</Dependency>
+            <Dependency>ktexteditor-kf6-devel</Dependency>
+            <Dependency>ktextwidgets-kf6-devel</Dependency>
+            <Dependency>threadweaver-kf6-devel</Dependency>
+            <Dependency>kwallet-kf6-devel</Dependency>
+            <Dependency>kwidgetsaddons-kf6-devel</Dependency>
+            <Dependency>kwindowsystem-kf6-devel</Dependency>
+            <Dependency>kjobwidgets-kf6-devel</Dependency>
+            <Dependency>kxmlgui-kf6-devel</Dependency>
+            <Dependency>knotifyconfig-kf6-devel</Dependency>
+            <Dependency>knotifications-kf6-devel</Dependency>
+            <Dependency>kcmutils-kf6-devel</Dependency>
+            <Dependency>kitemmodels-kf6-devel</Dependency>
+            <Dependency>kunitconversion-kf6-devel</Dependency>
+            <Dependency>kcontacts-kf6-devel</Dependency>
+<!--             <Dependency>akonadi-contacts-kf6-devel</Dependency> -->
+<!--             <Dependency>akonadi-kf6-devel</Dependency> -->
+            <Dependency>kdiagram-kf6-devel</Dependency>
+            <Dependency>qca2-qt6-devel</Dependency>
+            <Dependency>marble-kf6-devel</Dependency>
             <Dependency>lcms2-devel</Dependency>
-            <Dependency>okular-devel</Dependency>
+            <Dependency>okular-kf6-devel</Dependency>
             <Dependency>libwpg-devel</Dependency>
             <Dependency>libvisio-devel</Dependency>
             <Dependency>libwpd-devel</Dependency>
             <Dependency>poppler-devel</Dependency>
-            <Dependency>poppler-qt5-devel</Dependency>
-            <Dependency>libspnav-devel</Dependency>
+            <Dependency>poppler-qt6-devel</Dependency>
+<!--             <Dependency>libspnav-devel</Dependency> -->
             <Dependency>eigen3</Dependency>
             <Dependency>fontconfig-devel</Dependency>
             <Dependency>freetype-devel</Dependency>
@@ -100,7 +91,10 @@
             <Dependency>libzip-devel</Dependency>
             <Dependency>libspectre-devel</Dependency>
             <Dependency>ebook-tools-devel</Dependency>
-        </BuildDependencies>        
+        </BuildDependencies>
+        <Patches>
+<!--             <Patch level="1">dependencies.patch</Patch> -->
+        </Patches>
     </Source>
 
     <Package>
@@ -110,56 +104,48 @@
             <Dependency>freetype</Dependency>
             <Dependency>gsl</Dependency>
             <Dependency>imath</Dependency>
-            <Dependency>kactivities</Dependency>
-            <Dependency>karchive</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kdelibs4-support</Dependency>
-            <Dependency>kdiagram</Dependency>
-            <Dependency>kguiaddons</Dependency>
-            <Dependency>khtml</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kio</Dependency>
-            <Dependency>kitemviews</Dependency>
-            <Dependency>kjobwidgets</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>knotifyconfig</Dependency>
-            <Dependency>kross</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>ktextwidgets</Dependency>
-            <Dependency>kwallet</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>kxmlgui</Dependency>
+            <Dependency>karchive-kf6</Dependency>
+            <Dependency>kcmutils-kf6</Dependency>
+            <Dependency>kcodecs-kf6</Dependency>
+            <Dependency>kcompletion-kf6</Dependency>
+            <Dependency>kconfig-kf6</Dependency>
+            <Dependency>kconfigwidgets-kf6</Dependency>
+            <Dependency>kcoreaddons-kf6</Dependency>
+            <Dependency>kdbusaddons-kf6</Dependency>
+            <Dependency>kdiagram-kf6</Dependency>
+            <Dependency>kguiaddons-kf6</Dependency>
+            <Dependency>ki18n-kf6</Dependency>
+            <Dependency>kiconthemes-kf6</Dependency>
+            <Dependency>kio-kf6</Dependency>
+            <Dependency>kitemviews-kf6</Dependency>
+            <Dependency>kjobwidgets-kf6</Dependency>
+            <Dependency>knotifications-kf6</Dependency>
+            <Dependency>knotifyconfig-kf6</Dependency>
+            <Dependency>kservice-kf6</Dependency>
+            <Dependency>ktextwidgets-kf6</Dependency>
+            <Dependency>kwallet-kf6</Dependency>
+            <Dependency>kwidgetsaddons-kf6</Dependency>
+            <Dependency>kwindowsystem-kf6</Dependency>
+            <Dependency>kxmlgui-kf6</Dependency>
             <Dependency>pstoedit</Dependency>
             <Dependency>lcms2</Dependency>
             <Dependency>libetonyek</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libodfgen</Dependency>
             <Dependency>librevenge</Dependency>
-            <Dependency>libspnav</Dependency>
+<!--             <Dependency>libspnav</Dependency> -->
             <Dependency>libvisio</Dependency>
             <Dependency>libwpg</Dependency>
-            <Dependency>okular</Dependency>
-            <Dependency>poppler-qt5</Dependency>
+            <Dependency>okular-kf6</Dependency>
+            <Dependency>poppler-qt6</Dependency>
             <Dependency>poppler</Dependency>
-            <Dependency>qca2-qt5</Dependency>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>qt5-declarative</Dependency>
-            <Dependency>qt5-phonon</Dependency>
-            <Dependency>qt5-quickcontrols2</Dependency>
-            <Dependency>qt5-svg</Dependency>
-            <Dependency>qt5-webkit</Dependency>
-            <Dependency>qt5-x11extras</Dependency>
-            <Dependency>sonnet</Dependency>
+            <Dependency>qca2-qt6</Dependency>
+            <Dependency>qt6-base</Dependency>
+            <Dependency>qt6-declarative</Dependency>
+            <Dependency>qt6-phonon</Dependency>
+            <Dependency>qt6-svg</Dependency>
+            <Dependency>sonnet-kf6</Dependency>
             <Dependency>zlib</Dependency>
-            <Dependency>kcrash</Dependency>
             <Dependency>libwpd</Dependency>
             <Dependency>libwps</Dependency>
             <Dependency>libgit2</Dependency>
@@ -168,6 +154,13 @@
             <Dependency>libzip</Dependency>
             <Dependency>libspectre</Dependency>
             <Dependency>ebook-tools</Dependency>
+            <Dependency>openssl</Dependency>
+            <Dependency>kirigami-addons-kf6</Dependency>
+            <Dependency>kcrash-kf6</Dependency>
+            <Dependency>qt6-webengine</Dependency>
+            <Dependency>kcolorscheme-kf6</Dependency>
+            <Dependency>qt6-keychain</Dependency>
+            <Dependency>kparts-kf6</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/xdg/braindump</Path>
@@ -225,39 +218,39 @@
             <Path fileType="config">/etc/xdg</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
-            <Path fileType="library">/usr/lib/qt5</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/colorspaces</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/devices</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/dockers</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/formatfilters</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/parts</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/presentationeventactions</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/shapefiltereffects</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/shapes</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/textediting</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/textinlineobjects</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra/tools</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligra</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrasheets/extensions</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrasheets/functions</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrasheets</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrastage/pageeffects</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrastage/shapeanimations</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrastage/tools</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/calligrastage</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/karbon/extensions</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/karbon</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/okular/generators</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/okular</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/Calligra/Gemini/Dropbox</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/Calligra/Gemini/Git</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/Calligra/Gemini</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/Calligra</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/org/kde/calligra</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/org/kde</Path>
-            <Path fileType="library">/usr/lib/qt5/qml/org</Path>
-            <Path fileType="library">/usr/lib/qt5/qml</Path>
+            <Path fileType="library">/usr/lib/qt6</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/colorspaces</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/devices</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/dockers</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/formatfilters</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/parts</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/presentationeventactions</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/shapefiltereffects</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/shapes</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/textediting</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/textinlineobjects</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra/tools</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligra</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrasheets/extensions</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrasheets/functions</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrasheets</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrastage/pageeffects</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrastage/shapeanimations</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrastage/tools</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/calligrastage</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/karbon/extensions</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/karbon</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/okular-kf6/generators</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins/okular-kf6</Path>
+            <Path fileType="library">/usr/lib/qt6/plugins</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/Calligra/Gemini/Dropbox</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/Calligra/Gemini/Git</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/Calligra/Gemini</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/Calligra</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/org/kde/calligra</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/org/kde</Path>
+            <Path fileType="library">/usr/lib/qt6/qml/org</Path>
+            <Path fileType="library">/usr/lib/qt6/qml</Path>
             <Path fileType="data">/usr/share/applications</Path>
             <Path fileType="data">/usr/share/calligra/autocorrect</Path>
             <Path fileType="data">/usr/share/calligra/cursors</Path>
@@ -336,11 +329,11 @@
             <Path fileType="data">/usr/share/kservices5/ServiceMenus/calligra</Path>
             <Path fileType="data">/usr/share/kservices5/ServiceMenus</Path>
             <Path fileType="data">/usr/share/kservices5</Path>
-            <Path fileType="data">/usr/share/kxmlgui5/calligrasheets</Path>
-            <Path fileType="data">/usr/share/kxmlgui5/calligrastage</Path>
-            <Path fileType="data">/usr/share/kxmlgui5/calligrawords</Path>
-            <Path fileType="data">/usr/share/kxmlgui5/karbon</Path>
-            <Path fileType="data">/usr/share/kxmlgui5</Path>
+            <Path fileType="data">/usr/share/kxmlgui-kf65/calligrasheets</Path>
+            <Path fileType="data">/usr/share/kxmlgui-kf65/calligrastage</Path>
+            <Path fileType="data">/usr/share/kxmlgui-kf65/calligrawords</Path>
+            <Path fileType="data">/usr/share/kxmlgui-kf65/karbon</Path>
+            <Path fileType="data">/usr/share/kxmlgui-kf65</Path>
             <Path fileType="data">/usr/share/locale/*/LC_MESSAGES</Path>
             <Path fileType="data">/usr/share/metainfo</Path>
             <Path fileType="data">/usr/share/mime</Path>
@@ -351,6 +344,13 @@
     </Package>
     
     <History>
+        <Update release="10">
+            <Date>2024-08-29</Date>
+            <Version>4.0.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="9">
             <Date>2023-11-03</Date>
             <Version>3.2.1</Version>