[arch-commits] Commit in apper/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Monday, November 5, 2018 @ 20:55:30
  Author: arojas
Revision: 401681

Fix conflict with gnome-software (FS#60702), fix build with Qt 5.11

Modified:
  apper/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-05 20:52:49 UTC (rev 401680)
+++ PKGBUILD	2018-11-05 20:55:30 UTC (rev 401681)
@@ -5,7 +5,7 @@
 
 pkgname=apper
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An application and package manager using PackageKit"
 arch=(x86_64)
 url="https://www.kde.org/applications/system/apper/"
@@ -13,10 +13,12 @@
 depends=(packagekit-qt5 kcmutils appstream-qt)
 makedepends=(extra-cmake-modules kdoctools plasma-workspace)
 optdepends=('plasma-workspace: Updates daemon')
-source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} apper-rpath.patch)
+source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} apper-rpath.patch
+        apper-qt5.11.patch::"https://cgit.kde.org/apper.git/patch/?id=d8960ea9")
 sha256sums=('1a30be92aab8bd258c2a8824f533c5646b934e06b4268edbd11724ea450f4923'
             'SKIP'
-            '17ce82a3f9ba8888febc5d2b2dc63e5c73d7be4b216e9110f0ca73050be0010d')
+            '17ce82a3f9ba8888febc5d2b2dc63e5c73d7be4b216e9110f0ca73050be0010d'
+            'bf9ef24294d88b4a072330c1836c60691682b23e003c89bb462491eed49dee36')
 validpgpkeys=(70C26659D184ABC01FFAF45228DDEDC6E4480AD0) # Daniel Nicoletti <dantti12 at gmail.com>
 
 prepare() {
@@ -24,6 +26,7 @@
 
   cd $pkgname-$pkgver
   patch -p1 -i ../apper-rpath.patch # Fix RPATH of apper binary
+  patch -p1 -i ../apper-qt5.11.patch # fix build with Qt 5.11
 }
 
 build() {
@@ -41,4 +44,7 @@
 package() {
   cd build
   make DESTDIR="$pkgdir" install
+
+# fix conflicts with gnome-software
+  mv "$pkgdir"/usr/share/dbus-1/services/{,kde_}org.freedesktop.PackageKit.service
 }