calamares: update to 3.4testing

3 files changed, 86 insertions, 37 deletions

diff --git a/linhes/calamares/.SRCINFO b/linhes/calamares/.SRCINFO
new file mode 100644
index 0000000..37a540f
--- /dev/null
+++ b/linhes/calamares/.SRCINFO
@@ -0,0 +1,22 @@
+pkgbase = calamares
+	pkgdesc = Distribution-independent installer framework
+	pkgver = 3.4.0
+	pkgrel = 1
+	url = https://codeberg.org/Calamares/calamares
+	arch = i686
+	arch = x86_64
+	license = GPL-3.0-or-later
+	makedepends = extra-cmake-modules
+	makedepends = ninja
+	makedepends = qt6-tools
+	makedepends = qt6-translations
+	depends = kcoreaddons
+	depends = kpmcore
+	depends = libpwquality
+	depends = qt6-declarative
+	depends = qt6-svg
+	depends = yaml-cpp
+	source = calamares-3.4.0.tar.gz::https://codeberg.org/Calamares/calamares/archive/v3.4.0.tar.gz
+	sha256sums = 45de0214f4a16095374e2ed3982032c34f0f2c2104987089152e4b928dd0548f
+
+pkgname = calamares
diff --git a/linhes/calamares/.gitignore b/linhes/calamares/.gitignore
new file mode 100644
index 0000000..018a3de
--- /dev/null
+++ b/linhes/calamares/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/linhes/calamares/PKGBUILD b/linhes/calamares/PKGBUILD
index 4acad0c..eeb1b03 100644
--- a/linhes/calamares/PKGBUILD
+++ b/linhes/calamares/PKGBUILD
@@ -1,46 +1,69 @@
-# Ezarcher Calamares Installer pkgbuild
+# Maintainer:
+# Contributor: Rustmilian Rustmilian@proton.me
 
-pkgname=calamares
-pkgver=3.3.12
-_pkgver=3.3.12
-pkgrel=2
-pkgdesc='Distribution-independent installer framework'
-arch=('x86_64')
-license=(GPL)
-url="https://github.com/calamares/calamares"
-license=('LGPL')
-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')
+_pkgname="calamares"
+pkgname="$_pkgname"
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="Distribution-independent installer framework"
+url="https://codeberg.org/Calamares/calamares"
+license=("GPL-3.0-or-later")
+arch=('i686' 'x86_64')
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/calamares/calamares/releases/download/v$pkgver/calamares-$pkgver.tar.gz")
-sha256sums=('f44110a91a4394f34728042136af4b906541babc37e72b3b33664888b3220f2d')
+depends=(
+  'kcoreaddons'
+  'kpmcore'
+  'libpwquality'
+  'qt6-declarative'
+  'qt6-svg'
+  'yaml-cpp'
+)
+makedepends=(
+  'extra-cmake-modules'
+  'ninja'
+  'qt6-tools'
+  'qt6-translations'
+)
+
+_pkgsrc="$_pkgname"
+_pkgext="tar.gz"
+source=("$_pkgname-$pkgver.$_pkgext"::"$url/archive/v$pkgver.$_pkgext")
+sha256sums=('45de0214f4a16095374e2ed3982032c34f0f2c2104987089152e4b928dd0548f')
 
 build() {
-	cd ${srcdir}/calamares-${pkgver}
+  local _skip_modules=(
+    dracut
+    dracutlukscfg
+    dummycpp
+    dummyprocess
+    dummypython
+    dummypythonqt
+    initramfs
+    initramfscfg
+    interactiveterminal
+    packagechooser
+    packagechooserq
+    services-openrc
+  )
+
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DCMAKE_INSTALL_LIBDIR='lib'
+    -DWITH_QT6=ON
+    -DINSTALL_CONFIG=ON
+    -DSKIP_MODULES="${_skip_modules[*]}"
+    -DBUILD_TESTING=OFF
+    -Wno-dev
+  )
 
-	mkdir -p build
-	cd build
-        cmake .. \
-              -DCMAKE_BUILD_TYPE=Release \
-              -DCMAKE_INSTALL_PREFIX=/usr \
-              -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
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
-	cd ${srcdir}/calamares-${pkgver}/build
-	make DESTDIR="$pkgdir" install
-	install -Dm644 "../calamares.desktop" "$pkgdir/usr/share/applications/calamares.desktop"
+  DESTDIR="$pkgdir" cmake --install build
 }