[arch-commits] Commit in discover/repos/extra-x86_64 (4 files)

[Antonio Rojas]

    Date: Tuesday, November 28, 2017 @ 14:57:49
  Author: arojas
Revision: 311091

archrelease: copy trunk to extra-x86_64

Added:
  discover/repos/extra-x86_64/PKGBUILD
    (from rev 311090, discover/trunk/PKGBUILD)
  discover/repos/extra-x86_64/discover-no-deb-rpm.patch
    (from rev 311090, discover/trunk/discover-no-deb-rpm.patch)
Deleted:
  discover/repos/extra-x86_64/PKGBUILD
  discover/repos/extra-x86_64/discover-no-deb-rpm.patch

---------------------------+
 PKGBUILD                  |   92 ++++++++++++++++++++++----------------------
 discover-no-deb-rpm.patch |   22 +++++-----
 2 files changed, 57 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-28 14:57:35 UTC (rev 311090)
+++ PKGBUILD	2017-11-28 14:57:49 UTC (rev 311091)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org> 
-
-pkgname=discover
-pkgver=5.11.3
-pkgrel=1
-pkgdesc='KDE and Plasma resources management GUI'
-arch=(i686 x86_64)
-url='https://projects.kde.org/projects/kde/workspace/discover'
-license=(LGPL)
-depends=(knewstuff kdeclarative kitemmodels qt5-graphicaleffects appstream-qt archlinux-appstream-data
-         hicolor-icon-theme kirigami2 qt5-quickcontrols)
-makedepends=(extra-cmake-modules python plasma-framework packagekit-qt5 flatpak)
-optdepends=('packagekit-qt5: to manage packages from Arch Linux repositories' 'flatpak: Flatpak packages support')
-groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
-sha256sums=('3d6e8d7c86dabc949afdcf40cdfa1b4111fd8daf8cc0cac569f657eba1e05bad'
-            'SKIP'
-            '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
-              '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-# Don't handle .rpm or .deb files
-  patch -p1 -i ../discover-no-deb-rpm.patch
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: discover/repos/extra-x86_64/PKGBUILD (from rev 311090, discover/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-28 14:57:49 UTC (rev 311091)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org> 
+
+pkgname=discover
+pkgver=5.11.4
+pkgrel=1
+pkgdesc='KDE and Plasma resources management GUI'
+arch=(x86_64)
+url='https://projects.kde.org/projects/kde/workspace/discover'
+license=(LGPL)
+depends=(knewstuff kdeclarative kitemmodels qt5-graphicaleffects appstream-qt archlinux-appstream-data
+         hicolor-icon-theme kirigami2 qt5-quickcontrols)
+makedepends=(extra-cmake-modules python plasma-framework packagekit-qt5 flatpak)
+optdepends=('packagekit-qt5: to manage packages from Arch Linux repositories' 'flatpak: Flatpak packages support')
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
+sha256sums=('3f8a2e9635fc34888b9a23231741702548fd6dee6e4e2639ab5e5b8fac28dad8'
+            'SKIP'
+            '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
+              '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+# Don't handle .rpm or .deb files
+  patch -p1 -i ../discover-no-deb-rpm.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: discover-no-deb-rpm.patch
===================================================================
--- discover-no-deb-rpm.patch	2017-11-28 14:57:35 UTC (rev 311090)
+++ discover-no-deb-rpm.patch	2017-11-28 14:57:49 UTC (rev 311091)
@@ -1,11 +0,0 @@
---- discover-5.10.5/discover/CMakeLists.txt.orig	2017-08-22 17:30:12.209293604 +0000
-+++ discover-5.10.5/discover/CMakeLists.txt	2017-08-22 17:30:25.102651653 +0000
-@@ -36,7 +36,7 @@
- 
- # Standard desktop file accepts local files as input.
- set(DesktopNoDisplay "false")
--set(DesktopMimeType "application/vnd.debian.binary-package;application/x-rpm;")
-+set(DesktopMimeType "")
- set(DesktopExec "plasma-discover %F")
- configure_file(org.kde.discover.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.discover.desktop)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )

Copied: discover/repos/extra-x86_64/discover-no-deb-rpm.patch (from rev 311090, discover/trunk/discover-no-deb-rpm.patch)
===================================================================
--- discover-no-deb-rpm.patch	                        (rev 0)
+++ discover-no-deb-rpm.patch	2017-11-28 14:57:49 UTC (rev 311091)
@@ -0,0 +1,11 @@
+--- discover-5.10.5/discover/CMakeLists.txt.orig	2017-08-22 17:30:12.209293604 +0000
++++ discover-5.10.5/discover/CMakeLists.txt	2017-08-22 17:30:25.102651653 +0000
+@@ -36,7 +36,7 @@
+ 
+ # Standard desktop file accepts local files as input.
+ set(DesktopNoDisplay "false")
+-set(DesktopMimeType "application/vnd.debian.binary-package;application/x-rpm;")
++set(DesktopMimeType "")
+ set(DesktopExec "plasma-discover %F")
+ configure_file(org.kde.discover.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.discover.desktop)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )