[arch-commits] Commit in discover/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Tue Aug 22 20:45:33 UTC 2017
Date: Tuesday, August 22, 2017 @ 20:45:32
Author: arojas
Revision: 303316
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
discover/repos/extra-i686/PKGBUILD
(from rev 303315, discover/trunk/PKGBUILD)
discover/repos/extra-i686/discover-no-deb-rpm.patch
(from rev 303315, discover/trunk/discover-no-deb-rpm.patch)
discover/repos/extra-x86_64/PKGBUILD
(from rev 303315, discover/trunk/PKGBUILD)
discover/repos/extra-x86_64/discover-no-deb-rpm.patch
(from rev 303315, discover/trunk/discover-no-deb-rpm.patch)
Deleted:
discover/repos/extra-i686/PKGBUILD
discover/repos/extra-i686/discover-no-deb-rpm.patch
discover/repos/extra-x86_64/PKGBUILD
discover/repos/extra-x86_64/discover-no-deb-rpm.patch
----------------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++++++++++
/discover-no-deb-rpm.patch | 22 +++++++
extra-i686/PKGBUILD | 46 --------------
extra-i686/discover-no-deb-rpm.patch | 11 ---
extra-x86_64/PKGBUILD | 46 --------------
extra-x86_64/discover-no-deb-rpm.patch | 11 ---
6 files changed, 118 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-22 20:45:11 UTC (rev 303315)
+++ extra-i686/PKGBUILD 2017-08-22 20:45:32 UTC (rev 303316)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=discover
-pkgver=5.10.4
-pkgrel=2
-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')
-conflicts=(muon)
-replaces=(muon)
-groups=(plasma)
-source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
-sha256sums=('489d4976e7d1cd4b08d74cc6692cd4c65cd308ada9704dc3f46dd92907987d21'
- 'SKIP'
- 'c360c21bf6da9b7646169d427868ef4e9811fe3cc4320995eb954e6326c39fde')
-validpgpkeys=(2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell <jr at jriddell.org>
-
-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 \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_LIBEXECDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: discover/repos/extra-i686/PKGBUILD (from rev 303315, discover/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-22 20:45:32 UTC (rev 303316)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=discover
+pkgver=5.10.5
+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')
+conflicts=(muon)
+replaces=(muon)
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
+sha256sums=('ae13990f3d9afcffd713d04d2fc6e072a54c2efe6746d19714211b953cc0b420'
+ '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 \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/discover-no-deb-rpm.patch
===================================================================
--- extra-i686/discover-no-deb-rpm.patch 2017-08-22 20:45:11 UTC (rev 303315)
+++ extra-i686/discover-no-deb-rpm.patch 2017-08-22 20:45:32 UTC (rev 303316)
@@ -1,11 +0,0 @@
---- discover-5.9.1/discover/org.kde.discover.desktop.orig 2017-02-10 10:41:44.439510995 +0000
-+++ discover-5.9.1/discover/org.kde.discover.desktop 2017-02-10 10:42:05.339476223 +0000
-@@ -36,7 +36,7 @@
- Name[x-test]=xxDiscoverxx
- Name[zh_CN]=发现者
- Name[zh_TW]=Discover
--MimeType=x-scheme-handler/appstream;application/vnd.debian.binary-package;application/x-rpm;
-+MimeType=x-scheme-handler/appstream;
- Exec=plasma-discover %U
- Icon=plasmadiscover
- Type=Application
Copied: discover/repos/extra-i686/discover-no-deb-rpm.patch (from rev 303315, discover/trunk/discover-no-deb-rpm.patch)
===================================================================
--- extra-i686/discover-no-deb-rpm.patch (rev 0)
+++ extra-i686/discover-no-deb-rpm.patch 2017-08-22 20:45:32 UTC (rev 303316)
@@ -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} )
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-08-22 20:45:11 UTC (rev 303315)
+++ extra-x86_64/PKGBUILD 2017-08-22 20:45:32 UTC (rev 303316)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=discover
-pkgver=5.10.4
-pkgrel=2
-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')
-conflicts=(muon)
-replaces=(muon)
-groups=(plasma)
-source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
-sha256sums=('489d4976e7d1cd4b08d74cc6692cd4c65cd308ada9704dc3f46dd92907987d21'
- 'SKIP'
- 'c360c21bf6da9b7646169d427868ef4e9811fe3cc4320995eb954e6326c39fde')
-validpgpkeys=(2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell <jr at jriddell.org>
-
-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 \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_LIBEXECDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: discover/repos/extra-x86_64/PKGBUILD (from rev 303315, discover/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-22 20:45:32 UTC (rev 303316)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=discover
+pkgver=5.10.5
+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')
+conflicts=(muon)
+replaces=(muon)
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch)
+sha256sums=('ae13990f3d9afcffd713d04d2fc6e072a54c2efe6746d19714211b953cc0b420'
+ '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 \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/discover-no-deb-rpm.patch
===================================================================
--- extra-x86_64/discover-no-deb-rpm.patch 2017-08-22 20:45:11 UTC (rev 303315)
+++ extra-x86_64/discover-no-deb-rpm.patch 2017-08-22 20:45:32 UTC (rev 303316)
@@ -1,11 +0,0 @@
---- discover-5.9.1/discover/org.kde.discover.desktop.orig 2017-02-10 10:41:44.439510995 +0000
-+++ discover-5.9.1/discover/org.kde.discover.desktop 2017-02-10 10:42:05.339476223 +0000
-@@ -36,7 +36,7 @@
- Name[x-test]=xxDiscoverxx
- Name[zh_CN]=发现者
- Name[zh_TW]=Discover
--MimeType=x-scheme-handler/appstream;application/vnd.debian.binary-package;application/x-rpm;
-+MimeType=x-scheme-handler/appstream;
- Exec=plasma-discover %U
- Icon=plasmadiscover
- Type=Application
Copied: discover/repos/extra-x86_64/discover-no-deb-rpm.patch (from rev 303315, discover/trunk/discover-no-deb-rpm.patch)
===================================================================
--- extra-x86_64/discover-no-deb-rpm.patch (rev 0)
+++ extra-x86_64/discover-no-deb-rpm.patch 2017-08-22 20:45:32 UTC (rev 303316)
@@ -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} )
More information about the arch-commits
mailing list