From 5996341fa1c6dd2a7229664594b4b974f97b3f03 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 21 Mar 2025 09:37:23 +0100
Subject: core/pacman: patching trailing / problem when using muon

---
 core/pacman/PKGBUILD                         |  7 +++++--
 core/pacman/makepkg.conf                     |  2 ++
 core/pacman/pacman-trailing-slash-muon.patch | 22 ++++++++++++++++++++++
 core/pacman/pacman.conf                      |  1 -
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 core/pacman/pacman-trailing-slash-muon.patch

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 8b799985..64597ba3 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -6,11 +6,11 @@ depends+=(archlinux32-keyring)
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   # pacman.conf
   if [ "${sha256sums[${i}]}" = 'bc80e9d0439caddd29b99a69b5060b5589cad2398c23abc5b2b8b990fae6ad8c' ]; then
-    sha256sums[${i}]='394dd60f0033e65f1ccfac4f70450a5957516ab1467add723e65a8a4c7891b9d'
+    sha256sums[${i}]='3e482ca4e98386679cec02b51e32c6a13caf3dee365a850567547f616a69408f'
   fi
   # makepkg.conf
   if [ "${sha256sums[${i}]}" = 'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c' ]; then
-    sha256sums[${i}]='c63a4902c4d2f0928c0cd68ee5dedec08b1b372b6d90c71d7cfe0384b681559e'
+    sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894'
   fi
   # rust.conf (for now keep the upstream one)
 done
@@ -73,6 +73,9 @@ fi
 makedepends=(${makedepends[@]//meson/})
 makedepends+=(muon-meson)
 
+source+=(pacman-trailing-slash-muon.patch)
+sha256sums+=(f295ff9967d38117bb5a29237716abb997197c69d8d2eeb449db49b85582be02)
+
 eval "$(
   declare -f build | \
     sed '
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index e44bcf8e..69c05355 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -48,11 +48,13 @@ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
          -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
+RUSTFLAGS="-Cforce-frame-pointers=yes"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
diff --git a/core/pacman/pacman-trailing-slash-muon.patch b/core/pacman/pacman-trailing-slash-muon.patch
new file mode 100644
index 00000000..4b3c393f
--- /dev/null
+++ b/core/pacman/pacman-trailing-slash-muon.patch
@@ -0,0 +1,22 @@
+diff -rauN pacman-orig/meson.build pacman-trailing-slash-muon-patch/meson.build
+--- pacman-orig/meson.build	2025-03-20 17:46:34.979754357 +0100
++++ pacman-trailing-slash-muon-patch/meson.build	2025-03-20 17:47:38.620712716 +0100
+@@ -68,13 +68,13 @@
+ conf.set_quoted('SCRIPTLET_SHELL', get_option('scriptlet-shell'))
+ conf.set_quoted('LDCONFIG', LDCONFIG)
+ conf.set_quoted('LIB_VERSION', libalpm_version)
+-conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/'))
++conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/') + '/')
+ conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf'))
+-conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/'))
+-conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/'))
++conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/') + '/')
++conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/') + '/')
+ conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log'))
+-conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/'))
+-conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/'))
++conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/') +'/')
++conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/') + '/')
+ conf.set_quoted('ROOTDIR', ROOTDIR)
+ 
+ libintl = dependency('', required: false)
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index 37fe7443..780c9a87 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -15,7 +15,6 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
-HookDir = /usr/share/libalpm/hooks/
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-- 
cgit v1.2.3-70-g09d2