From 59c0b493ecd1808ae5d67c6320254f039243165d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sun, 7 Jul 2024 12:42:16 +0300
Subject: [PATCH 1/2] calamares ver. bump

---
 .../installer/Calamares/files/pisi_set_hostname2.patch   | 4 ++--
 system/installer/Calamares/pspec.xml                     | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/system/installer/Calamares/files/pisi_set_hostname2.patch b/system/installer/Calamares/files/pisi_set_hostname2.patch
index 8ff40dbe06..d92c71f014 100644
--- a/system/installer/Calamares/files/pisi_set_hostname2.patch
+++ b/system/installer/Calamares/files/pisi_set_hostname2.patch
@@ -1,10 +1,10 @@
 diff -Nuar a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp
 --- a/src/modules/users/SetHostNameJob.cpp	2020-02-28 01:26:29.000000000 +0300
 +++ b/src/modules/users/SetHostNameJob.cpp	2020-03-21 14:05:55.674849075 +0300
-@@ -64,7 +64,7 @@
+@@ -52,7 +52,7 @@
  setFileHostname( const QString& hostname )
  {
-     return CalamaresUtils::System::instance()->createTargetFile(
+     return Calamares::System::instance()->createTargetFile(
 -        QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite );
 +        QStringLiteral( "/etc/env.d/01hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite );
  }
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index 67ccda6233..7c7c353f37 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -11,7 +11,7 @@
         <License>LGPLv2</License>
         <Summary>A distribution independent installer framework</Summary>
         <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
-        <Archive sha1sum="d2a3a7b96531ba51ec2c569cab11aaa565970149" type="targz">https://github.com/calamares/calamares/archive/v3.2.62.tar.gz</Archive>
+        <Archive sha1sum="0a89a031e963c37ac5641d6a0d429c3477f48d45" type="targz">https://github.com/calamares/calamares/archive/v3.3.8.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext-devel</Dependency>
             <Dependency>yaml-cpp</Dependency>
@@ -137,6 +137,13 @@
     </Package>
     
     <History>
+        <Update release="21">
+            <Date>2024-07-07</Date>
+            <Version>3.3.8</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="20">
             <Date>2023-10-29</Date>
             <Version>3.2.62</Version>

From 8397a37e5979a0255120a7a1eabdffd5591f6277 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sun, 7 Jul 2024 13:17:29 +0300
Subject: [PATCH 2/2] calamares ver. bump

---
 system/installer/Calamares/actions.py |   3 +
 system/installer/Calamares/pspec.xml  | 110 +++++++++++++-------------
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/system/installer/Calamares/actions.py b/system/installer/Calamares/actions.py
index 2632b070a2..097f51b153 100644
--- a/system/installer/Calamares/actions.py
+++ b/system/installer/Calamares/actions.py
@@ -22,6 +22,9 @@ def setup():
                           -DCMAKE_INSTALL_LIBDIR=lib \
                           -DWITH_PYTHONQT=OFF \
                           -DINSTALL_CONFIG=ON \
+                          -DWITH_QT6=ON \
+                          -DWITH_QT5=OFF \
+                          -DWITH_KF5DBus=OFF \
                           -DWITH_CRASHREPORTER=ON", \
                           sourceDir=".." )
     
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index 7c7c353f37..f3f3839370 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -17,43 +17,42 @@
             <Dependency>yaml-cpp</Dependency>
             <Dependency versionFrom="1.83.0">boost-devel</Dependency>
             <Dependency versionFrom="1.83.0">boost-python3</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>solid-devel</Dependency>
+            <Dependency>ki18n-kf6-devel</Dependency>
+            <Dependency>solid-kf6-devel</Dependency>
             <Dependency>parted-devel</Dependency>
-            <Dependency>qt5-linguist</Dependency>
-            <Dependency>qt5-svg-devel</Dependency>
+            <Dependency>qt6-linguist</Dependency>
+            <Dependency>qt6-svg-devel</Dependency>
             <Dependency>udisks2-devel</Dependency>
             <Dependency>libyaml-devel</Dependency>
             <Dependency>python3-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
-            <Dependency>polkit-qt-devel</Dependency>
-            <Dependency>qt5-webkit-devel</Dependency>
-            <Dependency>qt5-webengine-devel</Dependency>
+            <Dependency>kconfig-kf6-devel</Dependency>
+            <Dependency>qt6-base-devel</Dependency>
+            <Dependency>polkit-qt6-devel</Dependency>
+            <Dependency>qt6-webengine-devel</Dependency>
             <Dependency>libatasmart-devel</Dependency>
-            <Dependency>kcoreaddons-devel</Dependency>
-            <Dependency>qt5-designer-devel</Dependency>
-            <Dependency>qt5-assistant-devel</Dependency>
+            <Dependency>kcoreaddons-kf6-devel</Dependency>
+            <Dependency>qt6-designer-devel</Dependency>
+            <Dependency>qt6-assistant-devel</Dependency>
             <Dependency>libutil-linux-devel</Dependency>
-            <Dependency>qt5-declarative-devel</Dependency>
+            <Dependency>qt6-declarative-devel</Dependency>
             <Dependency>libxkbfile-devel</Dependency>
             <Dependency>e2fsprogs-devel</Dependency>
             <Dependency>squashfs-tools</Dependency>
             <Dependency>efibootmgr-devel</Dependency>
             <Dependency>rsync</Dependency>
             <Dependency>gptfdisk</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kpmcore-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>kservice-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency>kcrash-devel</Dependency>
-            <Dependency>kcompletion-devel</Dependency>
-            <Dependency>kbookmarks-devel</Dependency>
-            <Dependency>kwidgetsaddons-devel</Dependency>
-            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>extra-cmake-modules-kf6</Dependency>
+            <Dependency>kpmcore-kf6-devel</Dependency>
+            <Dependency>kiconthemes-kf6-devel</Dependency>
+            <Dependency>kio-kf6-devel</Dependency>
+            <Dependency>kservice-kf6-devel</Dependency>
+            <Dependency>kconfig-kf6-devel</Dependency>
+            <Dependency>kparts-kf6-devel</Dependency>
+            <Dependency>kcrash-kf6-devel</Dependency>
+            <Dependency>kcompletion-kf6-devel</Dependency>
+            <Dependency>kbookmarks-kf6-devel</Dependency>
+            <Dependency>kwidgetsaddons-kf6-devel</Dependency>
+            <Dependency>libplasma-kf6-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">pisilocalayar.patch</Patch>
@@ -69,20 +68,19 @@
             <Dependency>boost</Dependency>
             <Dependency>boost-python3</Dependency>
             <Dependency>python3</Dependency>
-            <Dependency>kcrash</Dependency>
+            <Dependency>kcrash-kf6</Dependency>
             <Dependency>parted</Dependency>
-            <Dependency>solid</Dependency>
-            <Dependency>ki18n</Dependency>
+            <Dependency>solid-kf6</Dependency>
+            <Dependency>ki18n-kf6</Dependency>
             <Dependency>rsync</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>qt5-svg</Dependency>
-            <Dependency>qt5-webkit</Dependency>
+            <Dependency>kconfig-kf6</Dependency>
+            <Dependency>kcoreaddons-kf6</Dependency>
+            <Dependency>qt6-svg</Dependency>
             <Dependency>libatasmart</Dependency>
-            <Dependency>qt5-declarative</Dependency>            
+            <Dependency>qt6-declarative</Dependency>
             <Dependency>rsync</Dependency>
             <Dependency>ntfs-3g</Dependency>
-            <Dependency>qt5-base</Dependency>
+            <Dependency>qt6-base</Dependency>
             <Dependency>gptfdisk</Dependency>
             <Dependency>e2fsprogs</Dependency>
             <Dependency>dmidecode</Dependency>
@@ -91,33 +89,33 @@
             <Dependency>dosfstools</Dependency>
             <Dependency>libutil-linux</Dependency>
             <Dependency>util-linux</Dependency>
-            <Dependency>kpmcore</Dependency>
-            <Dependency>partitionmanager</Dependency>
-            <Dependency>qt5-webengine</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>kio</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kparts</Dependency>
-            <Dependency>kpackage</Dependency>
+            <Dependency>kpmcore-kf6</Dependency>
+            <Dependency>partitionmanager-kf6</Dependency>
+            <Dependency>qt6-webengine</Dependency>
+            <Dependency>kiconthemes-kf6</Dependency>
+            <Dependency>kio-kf6</Dependency>
+            <Dependency>kservice-kf6</Dependency>
+            <Dependency>kconfig-kf6</Dependency>
+            <Dependency>kparts-kf6</Dependency>
+            <Dependency>kpackage-kf6</Dependency>
             <Dependency>calamares-theme-pisilinux</Dependency>
             <Dependency>icu4c</Dependency>
-            <Dependency>kauth</Dependency>
+            <Dependency>kauth-kf6</Dependency>
             <Dependency>libX11</Dependency>
-            <Dependency>sonnet</Dependency>
-            <Dependency>kcodecs</Dependency>
-            <Dependency>kxmlgui</Dependency>
+            <Dependency>sonnet-kf6</Dependency>
+            <Dependency>kcodecs-kf6</Dependency>
+            <Dependency>kxmlgui-kf6</Dependency>
             <Dependency>yaml-cpp</Dependency>
-            <Dependency>kcompletion</Dependency>
-            <Dependency>kjobwidgets</Dependency>
-            <Dependency>ktextwidgets</Dependency>
+            <Dependency>kcompletion-kf6</Dependency>
+            <Dependency>kjobwidgets-kf6</Dependency>
+            <Dependency>ktextwidgets-kf6</Dependency>
             <Dependency>libpwquality</Dependency>
-            <Dependency>qt5-location</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>qt5-webchannel</Dependency>
-            <Dependency>plasma-framework</Dependency>
+            <Dependency>qt6-location</Dependency>
+            <Dependency>kwindowsystem-kf6</Dependency>
+            <Dependency>kconfigwidgets-kf6</Dependency>
+            <Dependency>kwidgetsaddons-kf6</Dependency>
+            <Dependency>qt6-webchannel</Dependency>
+            <Dependency>libplasma-kf6</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>