[arch-commits] Commit in apper/repos/community-x86_64 (4 files)

[Antonio Rojas]

    Date: Monday, November 5, 2018 @ 20:55:58
  Author: arojas
Revision: 401682

archrelease: copy trunk to community-x86_64

Added:
  apper/repos/community-x86_64/PKGBUILD
    (from rev 401681, apper/trunk/PKGBUILD)
  apper/repos/community-x86_64/apper-rpath.patch
    (from rev 401681, apper/trunk/apper-rpath.patch)
Deleted:
  apper/repos/community-x86_64/PKGBUILD
  apper/repos/community-x86_64/apper-rpath.patch

-------------------+
 PKGBUILD          |   94 +++++++++++++++++++++++++++-------------------------
 apper-rpath.patch |   26 +++++++-------
 2 files changed, 63 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-05 20:55:30 UTC (rev 401681)
+++ PKGBUILD	2018-11-05 20:55:58 UTC (rev 401682)
@@ -1,44 +0,0 @@
-# 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
-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 build
-
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DAPPSTREAM=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: apper/repos/community-x86_64/PKGBUILD (from rev 401681, apper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-05 20:55:58 UTC (rev 401682)
@@ -0,0 +1,50 @@
+# 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
+pkgver=1.0.0
+pkgrel=2
+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
+        apper-qt5.11.patch::"https://cgit.kde.org/apper.git/patch/?id=d8960ea9")
+sha256sums=('1a30be92aab8bd258c2a8824f533c5646b934e06b4268edbd11724ea450f4923'
+            'SKIP'
+            '17ce82a3f9ba8888febc5d2b2dc63e5c73d7be4b216e9110f0ca73050be0010d'
+            'bf9ef24294d88b4a072330c1836c60691682b23e003c89bb462491eed49dee36')
+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
+  patch -p1 -i ../apper-qt5.11.patch # fix build with Qt 5.11
+}
+
+build() {
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DAPPSTREAM=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# fix conflicts with gnome-software
+  mv "$pkgdir"/usr/share/dbus-1/services/{,kde_}org.freedesktop.PackageKit.service
+}

Deleted: apper-rpath.patch
===================================================================
--- apper-rpath.patch	2018-11-05 20:55:30 UTC (rev 401681)
+++ apper-rpath.patch	2018-11-05 20:55:58 UTC (rev 401682)
@@ -1,13 +0,0 @@
-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})

Copied: apper/repos/community-x86_64/apper-rpath.patch (from rev 401681, apper/trunk/apper-rpath.patch)
===================================================================
--- apper-rpath.patch	                        (rev 0)
+++ apper-rpath.patch	2018-11-05 20:55:58 UTC (rev 401682)
@@ -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})