[arch-commits] Commit in discover/trunk (PKGBUILD discover-glib-2.68.patch)

Antonio Rojas arojas at archlinux.org
Wed Apr 7 07:25:58 UTC 2021


    Date: Wednesday, April 7, 2021 @ 07:25:58
  Author: arojas
Revision: 411676

Use upstream fix

Modified:
  discover/trunk/PKGBUILD
Deleted:
  discover/trunk/discover-glib-2.68.patch

--------------------------+
 PKGBUILD                 |    6 ++--
 discover-glib-2.68.patch |   61 ---------------------------------------------
 2 files changed, 3 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-07 05:51:07 UTC (rev 411675)
+++ PKGBUILD	2021-04-07 07:25:58 UTC (rev 411676)
@@ -2,7 +2,7 @@
 
 pkgname=discover
 pkgver=5.21.4
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE and Plasma resources management GUI'
 arch=(x86_64)
 url='https://userbase.kde.org/Discover'
@@ -14,10 +14,10 @@
             'fwupd: firmware update support')
 groups=(plasma)
 source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
-         discover-glib-2.68.patch)
+         discover-glib-2.68.patch::"https://invent.kde.org/plasma/discover/commit/12f83062.patch")
 sha256sums=('6064cffde175ca7aae3a709025aee94fbddecf505115cb7d506f0ae79dda70b8'
             'SKIP'
-            'd989b9e67939b7a4ddc7437127c706854e938a7864a0e6dd22463ec394ed8b1d')
+            '6b2a7a122a021147e0ea2c48903066df2da5a92d9a4ff9741ed1b99a9444ab5e')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr at jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson at kde.org>

Deleted: discover-glib-2.68.patch
===================================================================
--- discover-glib-2.68.patch	2021-04-07 05:51:07 UTC (rev 411675)
+++ discover-glib-2.68.patch	2021-04-07 07:25:58 UTC (rev 411676)
@@ -1,61 +0,0 @@
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-index b9aaf80e..3e01eb7b 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-@@ -8,10 +8,8 @@
- #define FLATPAKFETCHDATAJOB_H
- 
- #include <QByteArray>
--extern "C" {
- #include <flatpak.h>
- #include <glib.h>
--}
- 
- class FlatpakResource;
- 
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-index 9499c566..37adb046 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-@@ -13,9 +13,6 @@
- #include <QDebug>
- #include <QTimer>
- 
--extern "C" {
--}
--
- FlatpakJobTransaction::FlatpakJobTransaction(FlatpakResource *app, Role role, bool delayStart)
-     : Transaction(app->backend(), app, role, {})
-     , m_app(app)
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-index ea2aafaa..bcfbc31e 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-@@ -11,11 +11,9 @@
- #include <Transaction/Transaction.h>
- #include <QPointer>
- 
--extern "C" {
- #include <flatpak.h>
- #include <gio/gio.h>
- #include <glib.h>
--}
- 
- class FlatpakResource;
- class FlatpakTransactionThread;
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-index b8eef827..f1c21997 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-@@ -7,11 +7,9 @@
- #ifndef FLATPAKTRANSACTIONTHREAD_H
- #define FLATPAKTRANSACTIONTHREAD_H
- 
--extern "C" {
- #include <flatpak.h>
- #include <gio/gio.h>
- #include <glib.h>
--}
- 
- #include <Transaction/Transaction.h>
- #include <QThread>



More information about the arch-commits mailing list