From 5485cb6b89dd4fa2fae6af2ca835e9fa820d54f0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 2 Jan 2025 20:31:23 -0500
Subject: calamares: update to 3.3.12

---
 linhes/calamares/PKGBUILD | 65 +++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/linhes/calamares/PKGBUILD b/linhes/calamares/PKGBUILD
index c749ce5..4acad0c 100644
--- a/linhes/calamares/PKGBUILD
+++ b/linhes/calamares/PKGBUILD
@@ -1,38 +1,23 @@
-# Maintainer: Cecil Watson <knoppmyth@gmail.com>
+# Ezarcher Calamares Installer pkgbuild
 
 pkgname=calamares
-pkgver=3.2.62
-_pkgver=3.2.62
-pkgrel=1
+pkgver=3.3.12
+_pkgver=3.3.12
+pkgrel=2
 pkgdesc='Distribution-independent installer framework'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=(GPL)
 url="https://github.com/calamares/calamares"
 license=('LGPL')
-depends=('kconfig' 'kcoreaddons' 'kiconthemes' 'ki18n' 'kio' 'solid' 'yaml-cpp' 'kpmcore>=4.1.0' 'mkinitcpio-openswap'
-         'boost-libs' 'ckbcomp' 'hwinfo' 'qt5-svg' 'polkit-qt5' 'gtk-update-icon-cache' 'plasma-framework'
-         'qt5-xmlpatterns' 'squashfs-tools' 'libpwquality' 'appstream-qt')
-makedepends=('extra-cmake-modules' 'qt5-tools' 'qt5-translations' 'git' 'boost' 'python-yaml' 
-         'python-jsonschema')
-
-source=("https://github.com/calamares/calamares/releases/download/v$pkgver/calamares-$pkgver.tar.gz")
-
-#pkgver() {
-#	cd ${srcdir}/calamares-${pkgver}
-#	sed -i -e "s|\${CALAMARES_VERSION_MAJOR}.\${CALAMARES_VERSION_MINOR}.\${CALAMARES_VERSION_PATCH}|${_ver}-${pkgrel}|g" CMakeLists.txt
-#	sed -i -e "s|CALAMARES_VERSION_RC 1|CALAMARES_VERSION_RC 0|g" CMakeLists.txt
-#}
-
-prepare() {
-	cd ${srcdir}/calamares-${pkgver}
-	sed -i -e 's/"Install configuration files" OFF/"Install configuration files" ON/' CMakeLists.txt
-	sed -i -e 's|$pkgver|$_pkgver|g' CMakeLists.txt
-	printf 'Version: %s-%s' "${_ver}" "${pkgrel}"
-	
-	sed -i -e "s|\${CALAMARES_VERSION_MAJOR}.\${CALAMARES_VERSION_MINOR}.\${CALAMARES_VERSION_PATCH}|${_ver}-${pkgrel}|g" CMakeLists.txt
-	sed -i -e "s|CALAMARES_VERSION_RC 1|CALAMARES_VERSION_RC 0|g" CMakeLists.txt
-}
+depends=('cryptsetup' 'dmidecode' 'doxygen' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n' 'kparts' 
+         'kpmcore' 'kservice' 'kwidgetsaddons' 'libatasmart' 'libplasma' 'libpwquality' 'polkit-qt6' 
+         'pybind11' 'python' 'qt6-declarative' 'qt6-svg' 'qt6-tools' 'qt6-virtualkeyboard' 'qt6-webengine' 
+         'rsync' 'solid' 'squashfs-tools' 'udisks2' 'upower' 'yaml-cpp')
+makedepends=('cmake' 'extra-cmake-modules' 'gawk' 'git' 'kpmcore' 'python-jsonschema' 'python-pyaml' 
+             'python-unidecode')
 
+source=("$pkgname-$pkgver.tar.gz::https://github.com/calamares/calamares/releases/download/v$pkgver/calamares-$pkgver.tar.gz")
+sha256sums=('f44110a91a4394f34728042136af4b906541babc37e72b3b33664888b3220f2d')
 
 build() {
 	cd ${srcdir}/calamares-${pkgver}
@@ -42,24 +27,20 @@ build() {
         cmake .. \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_INSTALL_PREFIX=/usr \
-              -DCMAKE_INSTALL_LIBDIR=lib \
-              -DWITH_PYTHONQT:BOOL=ON \
-              -DBoost_NO_BOOST_CMAKE=ON \
-              -DSKIP_MODULES="webview interactiveterminal initramfs \
-                              initramfscfg dracut dracutlukscfg \
-                              dummyprocess dummypython dummycpp \
-                              dummypythonqt services-openrc"
+              -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+              -DINSTALL_CONFIG=OFF \
+              -DWITH_QT6=ON \
+              -DWITH_PYBIND11=ON \
+              -DSKIP_MODULES="tracking webview interactiveterminal initramfs netinstall \
+                              initramfscfg dracut dracutlukscfg finishedq summaryq \
+                              dummyprocess dummypython dummycpp usersq oemid packagechooser \
+                              dummypythonqt services-openrc keyboardq zfs zfshostid \
+                              localeq plasmalnf welcomeq notesqml packagechooserq"
         make
 }
 
 package() {
 	cd ${srcdir}/calamares-${pkgver}/build
 	make DESTDIR="$pkgdir" install
-
-	# rename services-systemd back to services
-	mv "$pkgdir/usr/lib/calamares/modules/services-systemd" "$pkgdir/usr/lib/calamares/modules/services"
-	mv "$pkgdir/usr/share/calamares/modules/services-systemd.conf" "$pkgdir/usr/share/calamares/modules/services.conf"
-	sed -i -e 's/-systemd//' "$pkgdir/usr/lib/calamares/modules/services/module.desc"
-	sed -i -e 's/-systemd//' "$pkgdir/usr/share/calamares/settings.conf"
+	install -Dm644 "../calamares.desktop" "$pkgdir/usr/share/applications/calamares.desktop"
 }
-sha256sums=('a0fbcec2a438693753fc174220356119ad7adb8a2b19c317518aa1cb025d6dd0')
-- 
cgit v0.12

