[arch-commits] Commit in discover/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Fri Oct 13 15:03:04 UTC 2017
Date: Friday, October 13, 2017 @ 15:03:03
Author: arojas
Revision: 307824
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
discover/repos/extra-i686/PKGBUILD
(from rev 307823, discover/trunk/PKGBUILD)
discover/repos/extra-i686/discover-no-deb-rpm.patch
(from rev 307823, discover/trunk/discover-no-deb-rpm.patch)
discover/repos/extra-x86_64/PKGBUILD
(from rev 307823, discover/trunk/PKGBUILD)
discover/repos/extra-x86_64/discover-no-deb-rpm.patch
(from rev 307823, 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 | 98 +++++++++++++++++++++++++++++++
/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, 120 insertions(+), 114 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-10-13 15:02:20 UTC (rev 307823)
+++ extra-i686/PKGBUILD 2017-10-13 15:03:03 UTC (rev 307824)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=discover
-pkgver=5.11.0
-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=('5f62347bba692e9885fc8e5d16ea2cc94d1c1c8e848022fdb31178a046320bd3'
- '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-i686/PKGBUILD (from rev 307823, discover/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-10-13 15:03:03 UTC (rev 307824)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=discover
+pkgver=5.11.0
+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')
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch
+ discover-qt5.9.2.patch::"https://cgit.kde.org/discover.git/patch/?id=36fc062a")
+sha256sums=('5f62347bba692e9885fc8e5d16ea2cc94d1c1c8e848022fdb31178a046320bd3'
+ 'SKIP'
+ '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d'
+ 'e458d3d4f5c4d42f5a7c9bc3524ce22a7aea87a1b1149205d279b2e89e2fa522')
+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
+ patch -p1 -i ../discover-qt5.9.2.patch # Fix crash with Qt 5.9.2
+}
+
+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: extra-i686/discover-no-deb-rpm.patch
===================================================================
--- extra-i686/discover-no-deb-rpm.patch 2017-10-13 15:02:20 UTC (rev 307823)
+++ extra-i686/discover-no-deb-rpm.patch 2017-10-13 15:03:03 UTC (rev 307824)
@@ -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-i686/discover-no-deb-rpm.patch (from rev 307823, discover/trunk/discover-no-deb-rpm.patch)
===================================================================
--- extra-i686/discover-no-deb-rpm.patch (rev 0)
+++ extra-i686/discover-no-deb-rpm.patch 2017-10-13 15:03:03 UTC (rev 307824)
@@ -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-10-13 15:02:20 UTC (rev 307823)
+++ extra-x86_64/PKGBUILD 2017-10-13 15:03:03 UTC (rev 307824)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=discover
-pkgver=5.11.0
-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=('5f62347bba692e9885fc8e5d16ea2cc94d1c1c8e848022fdb31178a046320bd3'
- '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 307823, discover/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-10-13 15:03:03 UTC (rev 307824)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=discover
+pkgver=5.11.0
+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')
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} discover-no-deb-rpm.patch
+ discover-qt5.9.2.patch::"https://cgit.kde.org/discover.git/patch/?id=36fc062a")
+sha256sums=('5f62347bba692e9885fc8e5d16ea2cc94d1c1c8e848022fdb31178a046320bd3'
+ 'SKIP'
+ '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d'
+ 'e458d3d4f5c4d42f5a7c9bc3524ce22a7aea87a1b1149205d279b2e89e2fa522')
+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
+ patch -p1 -i ../discover-qt5.9.2.patch # Fix crash with Qt 5.9.2
+}
+
+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: extra-x86_64/discover-no-deb-rpm.patch
===================================================================
--- extra-x86_64/discover-no-deb-rpm.patch 2017-10-13 15:02:20 UTC (rev 307823)
+++ extra-x86_64/discover-no-deb-rpm.patch 2017-10-13 15:03:03 UTC (rev 307824)
@@ -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 307823, 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-10-13 15:03:03 UTC (rev 307824)
@@ -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