From 8304d96c981a0f41c4cdc00091cac25bd43584e8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 4 Apr 2026 20:14:09 -0400
Subject: calamares: update to 3.4.2

---
 linhes/calamares/.SRCINFO |  9 +++++----
 linhes/calamares/PKGBUILD | 31 +++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/linhes/calamares/.SRCINFO b/linhes/calamares/.SRCINFO
index 37a540f..31fccaf 100644
--- a/linhes/calamares/.SRCINFO
+++ b/linhes/calamares/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = calamares
 	pkgdesc = Distribution-independent installer framework
-	pkgver = 3.4.0
-	pkgrel = 1
+	pkgver = 3.4.2
+	pkgrel = 2
 	url = https://codeberg.org/Calamares/calamares
 	arch = i686
 	arch = x86_64
 	license = GPL-3.0-or-later
 	makedepends = extra-cmake-modules
+	makedepends = libglvnd
 	makedepends = ninja
 	makedepends = qt6-tools
 	makedepends = qt6-translations
@@ -16,7 +17,7 @@ pkgbase = calamares
 	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
+	source = calamares-3.4.2.tar.gz::https://codeberg.org/Calamares/calamares/releases/download/v3.4.2/calamares-3.4.2.tar.gz
+	sha256sums = 733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc
 
 pkgname = calamares
diff --git a/linhes/calamares/PKGBUILD b/linhes/calamares/PKGBUILD
index eeb1b03..be5bf9e 100644
--- a/linhes/calamares/PKGBUILD
+++ b/linhes/calamares/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname="calamares"
 pkgname="$_pkgname"
-pkgver=3.4.0
-pkgrel=1
+pkgver=3.4.2
+pkgrel=2
 pkgdesc="Distribution-independent installer framework"
 url="https://codeberg.org/Calamares/calamares"
 license=("GPL-3.0-or-later")
@@ -20,15 +20,15 @@ depends=(
 )
 makedepends=(
   'extra-cmake-modules'
+  'libglvnd'
   'ninja'
   'qt6-tools'
   'qt6-translations'
 )
 
-_pkgsrc="$_pkgname"
 _pkgext="tar.gz"
-source=("$_pkgname-$pkgver.$_pkgext"::"$url/archive/v$pkgver.$_pkgext")
-sha256sums=('45de0214f4a16095374e2ed3982032c34f0f2c2104987089152e4b928dd0548f')
+source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext")
+sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc')
 
 build() {
   local _skip_modules=(
@@ -46,9 +46,12 @@ build() {
     services-openrc
   )
 
+  # Correct source directory (inside src/)
+  local _pkgsrc_dir="$srcdir/$_pkgname-$pkgver"
+
   local _cmake_options=(
     -B build
-    -S "$_pkgsrc"
+    -S "$_pkgsrc_dir"
     -G Ninja
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX='/usr'
@@ -57,6 +60,22 @@ build() {
     -DINSTALL_CONFIG=ON
     -DSKIP_MODULES="${_skip_modules[*]}"
     -DBUILD_TESTING=OFF
+
+    # Explicit KDE install dirs to suppress warnings
+    -DKDE_INSTALL_BINDIR=/usr/bin
+    -DKDE_INSTALL_SBINDIR=/usr/sbin
+    -DKDE_INSTALL_LIBDIR=/usr/lib
+    -DKDE_INSTALL_LIBEXECDIR=/usr/libexec
+    -DKDE_INSTALL_INCLUDEDIR=/usr/include
+    -DKDE_INSTALL_LOCALSTATEDIR=/var
+    -DKDE_INSTALL_SHAREDSTATEDIR=/usr/share
+    -DKDE_INSTALL_DATAROOTDIR=/usr/share
+    -DKDE_INSTALL_DATADIR=/usr/share
+    -DKDE_INSTALL_LOCALEDIR=/usr/share/locale
+    -DKDE_INSTALL_MANDIR=/usr/share/man
+    -DKDE_INSTALL_INFODIR=/usr/share/info
+    -DKDE_INSTALL_SYSCONFDIR=/etc
+
     -Wno-dev
   )
 
-- 
cgit v0.12