[arch-commits] Commit in kpmcore/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Sunday, May 12, 2019 @ 17:55:48
  Author: arojas
Revision: 467052

archrelease: copy trunk to community-x86_64

Added:
  kpmcore/repos/community-x86_64/PKGBUILD
    (from rev 467051, kpmcore/trunk/PKGBUILD)
  kpmcore/repos/community-x86_64/kpmcore-dbusdir.patch
    (from rev 467051, kpmcore/trunk/kpmcore-dbusdir.patch)
Deleted:
  kpmcore/repos/community-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   92 +++++++++++++++++++++++++-----------------------
 kpmcore-dbusdir.patch |   15 +++++++
 2 files changed, 63 insertions(+), 44 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-12 17:55:22 UTC (rev 467051)
+++ PKGBUILD	2019-05-12 17:55:48 UTC (rev 467052)
@@ -1,44 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=kpmcore
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="Library for managing partitions"
-arch=(x86_64)
-url="https://www.kde.org/applications/system/kdepartitionmanager/"
-license=(GPL2)
-depends=(smartmontools kwidgetsaddons ki18n kauth qca)
-makedepends=(extra-cmake-modules)
-optdepends=('e2fsprogs: ext2/3/4 support'
-	    'xfsprogs: XFS support'
-	    'jfsutils: JFS support'
-	    'reiserfsprogs: Reiser support'
-	    'ntfs-3g: NTFS support'
-            'dosfstools: FAT32 support'
-            'fatresize: FAT resize support'
-            'f2fs-tools: F2FS support'
-            'exfat-utils: exFAT support'
-            'nilfs-utils: nilfs support'
-            'udftools: UDF support')
-source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('d7f044ca256369bec62ec5460bad397cd67473f4a8b2d48686e91a9bf24ddf6d'
-            'SKIP')
-validpgpkeys=(1EE5A3205904BAA2B88C0A9D24FD31940095C0E1) # Andrius Štikonas <andrius at stikonas.eu>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kpmcore/repos/community-x86_64/PKGBUILD (from rev 467051, kpmcore/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-12 17:55:48 UTC (rev 467052)
@@ -0,0 +1,48 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=kpmcore
+pkgver=4.0.0
+pkgrel=3
+pkgdesc="Library for managing partitions"
+arch=(x86_64)
+url="https://www.kde.org/applications/system/kdepartitionmanager/"
+license=(GPL2)
+depends=(smartmontools kwidgetsaddons ki18n kauth qca)
+makedepends=(extra-cmake-modules)
+optdepends=('e2fsprogs: ext2/3/4 support'
+	    'xfsprogs: XFS support'
+	    'jfsutils: JFS support'
+	    'reiserfsprogs: Reiser support'
+	    'ntfs-3g: NTFS support'
+            'dosfstools: FAT32 support'
+            'fatresize: FAT resize support'
+            'f2fs-tools: F2FS support'
+            'exfat-utils: exFAT support'
+            'nilfs-utils: nilfs support'
+            'udftools: UDF support')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} kpmcore-dbusdir.patch)
+sha256sums=('d7f044ca256369bec62ec5460bad397cd67473f4a8b2d48686e91a9bf24ddf6d'
+            'SKIP'
+            '52b81ba66ff3e23640a2e56927acaf028a7b7db81d615bf82fb99b9bb7b7de59')
+validpgpkeys=(1EE5A3205904BAA2B88C0A9D24FD31940095C0E1) # Andrius Štikonas <andrius at stikonas.eu>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kpmcore-dbusdir.patch # Fix d-bus policy install dir
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: kpmcore/repos/community-x86_64/kpmcore-dbusdir.patch (from rev 467051, kpmcore/trunk/kpmcore-dbusdir.patch)
===================================================================
--- kpmcore-dbusdir.patch	                        (rev 0)
+++ kpmcore-dbusdir.patch	2019-05-12 17:55:48 UTC (rev 467052)
@@ -0,0 +1,15 @@
+diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
+index d616933..b3f2ee2 100644
+--- a/src/util/CMakeLists.txt
++++ b/src/util/CMakeLists.txt
+@@ -50,8 +50,8 @@ target_link_libraries(kpmcore_externalcommand
+ )
+ 
+ install(TARGETS kpmcore_externalcommand DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
+-install( FILES util/org.kde.kpmcore.helperinterface.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
+-install( FILES util/org.kde.kpmcore.applicationinterface.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
++install( FILES util/org.kde.kpmcore.helperinterface.conf DESTINATION ${KDE_INSTALL_DBUSDIR}/system.d )
++install( FILES util/org.kde.kpmcore.applicationinterface.conf DESTINATION ${KDE_INSTALL_DBUSDIR}/system.d )
+ 
+ kauth_install_helper_files(kpmcore_externalcommand org.kde.kpmcore.externalcommand root)
+ kauth_install_actions(org.kde.kpmcore.externalcommand util/org.kde.kpmcore.externalcommand.actions)