Date: Tuesday, May 1, 2018 @ 17:07:27 Author: arojas Revision: 323258
archrelease: copy trunk to extra-x86_64 Added: discover/repos/extra-x86_64/PKGBUILD (from rev 323257, discover/trunk/PKGBUILD) discover/repos/extra-x86_64/discover-no-deb-rpm.patch (from rev 323257, discover/trunk/discover-no-deb-rpm.patch) discover/repos/extra-x86_64/discover-pk-qt-1.0c.patch (from rev 323257, 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 discover/repos/extra-x86_64/discover-pk-qt-1.0c.patch ---------------------------+ PKGBUILD | 92 ++++++++++++++++++++++---------------------- discover-no-deb-rpm.patch | 22 +++++----- discover-pk-qt-1.0c.patch | 42 ++++++++++---------- 3 files changed, 78 insertions(+), 78 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-01 17:06:32 UTC (rev 323257) +++ PKGBUILD 2018-05-01 17:07:27 UTC (rev 323258) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <aro...@archlinux.org> - -pkgname=discover -pkgver=5.12.5 -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 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=('f5889b89a69ad2ed7db488631d59d13e7511235d759cc05e19b4086402d0d209' - 'SKIP' - '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d') -validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell - '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bs...@kde.org> - 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson - '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notm...@gmail.com> - -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_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 323257, discover/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-01 17:07:27 UTC (rev 323258) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> + +pkgname=discover +pkgver=5.12.5 +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 kitemmodels qt5-graphicaleffects appstream-qt archlinux-appstream-data + hicolor-icon-theme kirigami2 qt5-quickcontrols) +makedepends=(extra-cmake-modules 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=('f5889b89a69ad2ed7db488631d59d13e7511235d759cc05e19b4086402d0d209' + 'SKIP' + '1910a7a95c8537cdf59fea87bdb4a4ac750d073c63182536358ef5c75508521d') +validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell + '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bs...@kde.org> + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson + '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notm...@gmail.com> + +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_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-05-01 17:06:32 UTC (rev 323257) +++ discover-no-deb-rpm.patch 2018-05-01 17:07:27 UTC (rev 323258) @@ -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 323257, discover/trunk/discover-no-deb-rpm.patch) =================================================================== --- discover-no-deb-rpm.patch (rev 0) +++ discover-no-deb-rpm.patch 2018-05-01 17:07:27 UTC (rev 323258) @@ -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: discover-pk-qt-1.0c.patch =================================================================== --- discover-pk-qt-1.0c.patch 2018-05-01 17:06:32 UTC (rev 323257) +++ discover-pk-qt-1.0c.patch 2018-05-01 17:07:27 UTC (rev 323258) @@ -1,21 +0,0 @@ -From 69c2d24a0a71b1c50a56beda90febdae97aa3128 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleix...@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; - }); - } - Copied: discover/repos/extra-x86_64/discover-pk-qt-1.0c.patch (from rev 323257, discover/trunk/discover-pk-qt-1.0c.patch) =================================================================== --- discover-pk-qt-1.0c.patch (rev 0) +++ discover-pk-qt-1.0c.patch 2018-05-01 17:07:27 UTC (rev 323258) @@ -0,0 +1,21 @@ +From 69c2d24a0a71b1c50a56beda90febdae97aa3128 Mon Sep 17 00:00:00 2001 +From: Aleix Pol <aleix...@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; + }); + } +