[arch-commits] Commit in discover/repos/extra-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Sun Jan 14 12:38:41 UTC 2018
Date: Sunday, January 14, 2018 @ 12:38:40
Author: arojas
Revision: 314782
archrelease: copy trunk to extra-x86_64
Added:
discover/repos/extra-x86_64/PKGBUILD
(from rev 314781, discover/trunk/PKGBUILD)
discover/repos/extra-x86_64/discover-no-deb-rpm.patch
(from rev 314781, discover/trunk/discover-no-deb-rpm.patch)
discover/repos/extra-x86_64/discover-pk-qt-1.0c.patch
(from rev 314781, discover/trunk/discover-pk-qt-1.0c.patch)
Deleted:
discover/repos/extra-x86_64/PKGBUILD
discover/repos/extra-x86_64/discover-no-deb-rpm.patch
---------------------------+
PKGBUILD | 111 ++++++++++++++++++++++----------------------
discover-no-deb-rpm.patch | 22 ++++----
discover-pk-qt-1.0c.patch | 21 ++++++++
3 files changed, 89 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-14 12:38:02 UTC (rev 314781)
+++ PKGBUILD 2018-01-14 12:38:40 UTC (rev 314782)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=discover
-pkgver=5.11.5
-pkgrel=2
-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
- discover-pk-qt-1.0a.patch::"https://cgit.kde.org/discover.git/patch/?id=d1070951"
- discover-pk-qt-1.0b.patch::"https://cgit.kde.org/discover.git/patch/?id=243ad65f")
-sha256sums=('b4cec7b23ee43b8c6caa2cb69ebbab903ce64351d846288eeb3afb1a25b9ba7b'
- 'SKIP'
- '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d'
- '4a8a2e802b9b290082caacb2b8fa7439e3932dd056bb9f3939c51d8eee3799d7'
- 'e8e0b153b2644747f692d056b1189857ee91657444fdb34d29d1d59bcc086b70')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell
- '348C8651206633FD983A8FC4DEACEA00075E1D76' # KDE Neon
- 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
- '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
-# Don't handle .rpm or .deb files
- patch -p1 -i ../discover-no-deb-rpm.patch
-# Fix build with packagekit-qt 1.0.0
- patch -p1 -i ../discover-pk-qt-1.0a.patch
- patch -p1 -i ../discover-pk-qt-1.0b.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 314781, discover/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-14 12:38:40 UTC (rev 314782)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=discover
+pkgver=5.11.5
+pkgrel=3
+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
+ discover-pk-qt-1.0a.patch::"https://cgit.kde.org/discover.git/patch/?id=d1070951"
+ discover-pk-qt-1.0b.patch::"https://cgit.kde.org/discover.git/patch/?id=243ad65f"
+ discover-pk-qt-1.0c.patch)
+sha256sums=('b4cec7b23ee43b8c6caa2cb69ebbab903ce64351d846288eeb3afb1a25b9ba7b'
+ 'SKIP'
+ '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d'
+ '4a8a2e802b9b290082caacb2b8fa7439e3932dd056bb9f3939c51d8eee3799d7'
+ 'e8e0b153b2644747f692d056b1189857ee91657444fdb34d29d1d59bcc086b70'
+ '418ac41a56b62810d3ad355752d1ffde81e7ea1b41494eebb5f8e18ffaf44f30')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell
+ '348C8651206633FD983A8FC4DEACEA00075E1D76' # KDE Neon
+ 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson
+ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Don't handle .rpm or .deb files
+ patch -p1 -i ../discover-no-deb-rpm.patch
+# Fix build with packagekit-qt 1.0.0
+ patch -p1 -i ../discover-pk-qt-1.0a.patch
+ patch -p1 -i ../discover-pk-qt-1.0b.patch
+ patch -p1 -i ../discover-pk-qt-1.0c.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 2018-01-14 12:38:02 UTC (rev 314781)
+++ discover-no-deb-rpm.patch 2018-01-14 12:38:40 UTC (rev 314782)
@@ -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 314781, discover/trunk/discover-no-deb-rpm.patch)
===================================================================
--- discover-no-deb-rpm.patch (rev 0)
+++ discover-no-deb-rpm.patch 2018-01-14 12:38:40 UTC (rev 314782)
@@ -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} )
Copied: discover/repos/extra-x86_64/discover-pk-qt-1.0c.patch (from rev 314781, discover/trunk/discover-pk-qt-1.0c.patch)
===================================================================
--- discover-pk-qt-1.0c.patch (rev 0)
+++ discover-pk-qt-1.0c.patch 2018-01-14 12:38:40 UTC (rev 314782)
@@ -0,0 +1,21 @@
+From 69c2d24a0a71b1c50a56beda90febdae97aa3128 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Tue, 9 Jan 2018 18:21:44 +0100
+Subject: No need to manage these pointers anymore
+
+---
+ libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
+index fdabd81..0113a06 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
+@@ -225,7 +225,6 @@ void PackageKitNotifier::refreshDatabase()
+ m_refresher = PackageKit::Daemon::refreshCache(false);
+ connect(m_refresher.data(), &PackageKit::Transaction::finished, this, [this]() {
+ recheckSystemUpdateNeeded();
+- delete m_refresher;
+ });
+ }
+
More information about the arch-commits
mailing list