git » kwallet.git » commit e77a21f

upgpkg: 5.240.0.20231020-2: Temporarily drop conflicting files

author Antonio Rojas
2023-10-20 18:39:34 UTC
committer Antonio Rojas
2023-10-20 18:39:34 UTC
parent 4ca15e135c4c98906e1af9663fc49e8fc32d90e4

upgpkg: 5.240.0.20231020-2: Temporarily drop conflicting files

.SRCINFO +1 -1
PKGBUILD +6 -2

diff --git a/.SRCINFO b/.SRCINFO
index f53b0ec..c032a57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kwallet
 	pkgdesc = Secure and unified container for user passwords
 	pkgver = 5.240.0.20231020
-	pkgrel = 1
+	pkgrel = 2
 	url = https://community.kde.org/Frameworks
 	arch = x86_64
 	groups = kf6
diff --git a/PKGBUILD b/PKGBUILD
index 9372579..4382132 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kwallet
 pkgver=5.240.0.20231020
-pkgrel=1
+pkgrel=2
 pkgdesc='Secure and unified container for user passwords'
 arch=(x86_64)
 url='https://community.kde.org/Frameworks'
@@ -42,10 +42,14 @@ validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde
 build() {
   cmake -B build -S $pkgname \
     -DBUILD_TESTING=OFF \
-    -DBUILD_QCH=ON
+    -DBUILD_QCH=ON \
+    -DBUILD_KWALLET_QUERY=OFF
   cmake --build build
 }
 
 package() {
   DESTDIR="$pkgdir" cmake --install build
+
+# Fix conflicts for now
+  rm "$pkgdir"/usr/share/dbus-1/services/org.kde.kwalletd5.service
 }