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

[Antonio Rojas]

    Date: Wednesday, February 21, 2018 @ 08:34:05
  Author: arojas
Revision: 296660

Readd apper

Added:
  apper/trunk/apper-rpath.patch
Modified:
  apper/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   68 +++++++++++++++++++++++++---------------------------
 apper-rpath.patch |   13 +++++++++
 2 files changed, 46 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-21 07:32:04 UTC (rev 296659)
+++ PKGBUILD	2018-02-21 08:34:05 UTC (rev 296660)
@@ -1,46 +1,44 @@
-# $Id$
-# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Valeriy Lyasotskiy <onestep at ukr.net>
 # Contributor: Zom <zom at eevul.org>
 
 pkgname=apper
-_pkgmainver=0.7
-epoch=1
-pkgver=0.7.2
-pkgrel=7
-pkgdesc="KDE tools for PackageKit"
-arch=('x86_64')
-url="http://kde-apps.org/content/show.php/Apper?content=84745"
-license=('GPL')
-depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17')
-makedepends=('cmake' 'automoc4' 'chrpath')
-install="$pkgname.install"
-provides=('kpackagekit')
-conflicts=('kpackagekit')
-replaces=('kpackagekit')
-source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
-sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f')
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="An application and package manager using PackageKit"
+arch=(x86_64)
+url="https://www.kde.org/applications/system/apper/"
+license=(GPL)
+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)
+sha256sums=('1a30be92aab8bd258c2a8824f533c5646b934e06b4268edbd11724ea450f4923'
+            'SKIP'
+            '17ce82a3f9ba8888febc5d2b2dc63e5c73d7be4b216e9110f0ca73050be0010d')
+validpgpkeys=(70C26659D184ABC01FFAF45228DDEDC6E4480AD0) # Daniel Nicoletti <dantti12 at gmail.com>
 
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../apper-rpath.patch # Fix RPATH of apper binary
+}
+
 build() {
-	cd "$pkgname-$pkgver"
-	[ -d "build" ] && rm -rf build
-	mkdir build
-	cd build
+  cd build
 
-	cmake ../ \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DAPPSTREAM=ON
+  make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	cd build
-	make DESTDIR="$pkgdir" install
-	# avoid gnome-packagekit conflict (stolen from fedora as suggested)
-	mv "$pkgdir/usr/share/dbus-1/services/org.freedesktop.PackageKit.service" \
-		"$pkgdir/usr/share/dbus-1/services/kde-org.freedesktop.PackageKit.service"
-	# Hack around cmake rpath bug (debian)
-	chrpath --list "$pkgdir/usr/bin/apper"
-	chrpath --replace "/usr/lib/apper" "$pkgdir/usr/bin/apper"
+  cd build
+  make DESTDIR="$pkgdir" install
 }

Added: apper-rpath.patch
===================================================================
--- apper-rpath.patch	                        (rev 0)
+++ apper-rpath.patch	2018-02-21 08:34:05 UTC (rev 296660)
@@ -0,0 +1,13 @@
+diff --git a/Apper/CMakeLists.txt b/Apper/CMakeLists.txt
+index 2b71603..8c24305 100644
+--- a/Apper/CMakeLists.txt
++++ b/Apper/CMakeLists.txt
+@@ -49,7 +49,7 @@ target_link_libraries(apper
+ 
+ set_target_properties(apper PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/apper)
+ 
+-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apper DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS apper DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES org.kde.apper.desktop DESTINATION ${CMAKE_INSTALL_APPDIR})
+ install(FILES org.kde.apper_installer.desktop DESTINATION ${CMAKE_INSTALL_APPDIR})
+ install(FILES org.kde.apper_settings.desktop DESTINATION ${CMAKE_INSTALL_APPDIR})