[arch-commits] Commit in plasma-workspace/kde-unstable (PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, May 27, 2020 @ 08:35:27
  Author: arojas
Revision: 387706

Don't start a second session dbus instance (FS#66766)

Modified:
  plasma-workspace/kde-unstable/PKGBUILD

----------+
 PKGBUILD |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 08:32:03 UTC (rev 387705)
+++ PKGBUILD	2020-05-27 08:35:27 UTC (rev 387706)
@@ -26,15 +26,14 @@
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
 
 prepare() {
-  mkdir -p build
+  sed -e 's|dbus-run-session ||' -i $pkgbase-$pkgver/login-sessions/plasmawayland.desktop.cmake # Don't start a second user dbus session
 }
 
 build() {
-  cd build
-  cmake ../$pkgbase-$pkgver \
+  cmake -B build -S $pkgbase-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package_plasma-workspace() {
@@ -47,8 +46,7 @@
   provides=(notification-daemon)
   backup=('etc/pam.d/kde')
 
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
   install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde