[arch-commits] Commit in discover/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Tuesday, April 6, 2021 @ 15:56:02
  Author: arojas
Revision: 411619

archrelease: copy trunk to extra-x86_64

Added:
  discover/repos/extra-x86_64/PKGBUILD
    (from rev 411618, discover/trunk/PKGBUILD)
  discover/repos/extra-x86_64/discover-glib-2.68.patch
    (from rev 411618, discover/trunk/discover-glib-2.68.patch)
Deleted:
  discover/repos/extra-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   72 ++++++++++++++++++++++++---------------------
 discover-glib-2.68.patch |   61 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-06 15:55:51 UTC (rev 411618)
+++ PKGBUILD	2021-04-06 15:56:02 UTC (rev 411619)
@@ -1,33 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org> 
-
-pkgname=discover
-pkgver=5.21.3
-pkgrel=1
-pkgdesc='KDE and Plasma resources management GUI'
-arch=(x86_64)
-url='https://userbase.kde.org/Discover'
-license=(LGPL)
-depends=(knewstuff kitemmodels kcmutils kidletime qt5-graphicaleffects appstream-qt archlinux-appstream-data
-         hicolor-icon-theme kirigami2 discount kuserfeedback)
-makedepends=(extra-cmake-modules plasma-framework packagekit-qt5 flatpak fwupd)
-optdepends=('packagekit-qt5: to manage packages from Arch Linux repositories' 'flatpak: Flatpak packages support'
-            'fwupd: firmware update support')
-groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('ddea3878522968a8e6d923ea7749cee77ad7ba1edfb3f37091bb12c933ec139c'
-            'SKIP')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr at jriddell.org>
-              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson at kde.org>
-              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DBUILD_TESTING=OFF
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: discover/repos/extra-x86_64/PKGBUILD (from rev 411618, discover/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-06 15:56:02 UTC (rev 411619)
@@ -0,0 +1,39 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org> 
+
+pkgname=discover
+pkgver=5.21.4
+pkgrel=1
+pkgdesc='KDE and Plasma resources management GUI'
+arch=(x86_64)
+url='https://userbase.kde.org/Discover'
+license=(LGPL)
+depends=(knewstuff kitemmodels kcmutils kidletime qt5-graphicaleffects appstream-qt archlinux-appstream-data
+         hicolor-icon-theme kirigami2 discount kuserfeedback)
+makedepends=(extra-cmake-modules plasma-framework packagekit-qt5 flatpak fwupd)
+optdepends=('packagekit-qt5: to manage packages from Arch Linux repositories' 'flatpak: Flatpak packages support'
+            'fwupd: firmware update support')
+groups=(plasma)
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+         discover-glib-2.68.patch)
+sha256sums=('6064cffde175ca7aae3a709025aee94fbddecf505115cb7d506f0ae79dda70b8'
+            'SKIP'
+            'd989b9e67939b7a4ddc7437127c706854e938a7864a0e6dd22463ec394ed8b1d')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr at jriddell.org>
+              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson at kde.org>
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < discover-glib-2.68.patch # Fix build with glib 2.68
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: discover/repos/extra-x86_64/discover-glib-2.68.patch (from rev 411618, discover/trunk/discover-glib-2.68.patch)
===================================================================
--- discover-glib-2.68.patch	                        (rev 0)
+++ discover-glib-2.68.patch	2021-04-06 15:56:02 UTC (rev 411619)
@@ -0,0 +1,61 @@
+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>