Date: Sunday, September 19, 2021 @ 11:00:02 Author: arojas Revision: 1017259
archrelease: copy trunk to community-x86_64 Added: owncloud-client/repos/community-x86_64/PKGBUILD (from rev 1017258, owncloud-client/trunk/PKGBUILD) owncloud-client/repos/community-x86_64/fix-build-glib2.patch (from rev 1017258, owncloud-client/trunk/fix-build-glib2.patch) Deleted: owncloud-client/repos/community-x86_64/PKGBUILD owncloud-client/repos/community-x86_64/fix-build-glib2.patch -----------------------+ PKGBUILD | 72 +++++++++++++++++++++++++----------------------- fix-build-glib2.patch | 42 ++++++++++++++-------------- 2 files changed, 59 insertions(+), 55 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-19 10:59:52 UTC (rev 1017258) +++ PKGBUILD 2021-09-19 11:00:02 UTC (rev 1017259) @@ -1,34 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> - -pkgname=owncloud-client -pkgver=2.9.0.5150 -pkgrel=1 -pkgdesc='ownCloud client based on mirall' -arch=(x86_64) -url='http://owncloud.org/' -license=(GPL2) -depends=(qtkeychain hicolor-icon-theme) # libcloudproviders -makedepends=(extra-cmake-modules python-sphinx qt5-tools doxygen kio) -optdepends=('python-nautilus: integration with Nautilus' 'nemo-python: integration with Nemo' 'python-caja: integration with Caja') -backup=('etc/ownCloud/sync-exclude.lst') -source=(https://download.owncloud.com/desktop/ownCloud/stable/$pkgver/source/ownCloud-$pkgver.tar.xz{,.asc} - fix-build-glib2.patch) -sha256sums=('5acac2639097b486fe9d9a82cd66061f9087a3a73640479ef5605c405047c659' - 'SKIP' - '091b40721869e0bb38fae7d4e0bb0baf2a4aaaa1c6cdceec52e6a44aa6065e98') -validpgpkeys=(F05F7DD7953A07DF36579DAA498C45EBE94E7B37) # ownCloud Client Team (Signing Key) <i...@owncloud.com> - -prepare() { - patch -d ownCloud-$pkgver -p1 < fix-build-glib2.patch # Fix build with glib 2.68 -} - -build() { - cmake -B build -S ownCloud-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: owncloud-client/repos/community-x86_64/PKGBUILD (from rev 1017258, owncloud-client/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-19 11:00:02 UTC (rev 1017259) @@ -0,0 +1,38 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> + +pkgname=owncloud-client +pkgver=2.9.0.5150 +pkgrel=2 +pkgdesc='ownCloud client based on mirall' +arch=(x86_64) +url='http://owncloud.org/' +license=(GPL2) +depends=(qtkeychain hicolor-icon-theme libcloudproviders) +makedepends=(extra-cmake-modules python-sphinx qt5-tools doxygen kio) +optdepends=('python-nautilus: integration with Nautilus' 'nemo-python: integration with Nemo' 'python-caja: integration with Caja') +backup=('etc/ownCloud/sync-exclude.lst') +source=(https://download.owncloud.com/desktop/ownCloud/stable/$pkgver/source/ownCloud-$pkgver.tar.xz{,.asc} + https://github.com/owncloud/client/commit/608c1434.patch + https://github.com/owncloud/client/commit/a004a91c.patch) +sha256sums=('5acac2639097b486fe9d9a82cd66061f9087a3a73640479ef5605c405047c659' + 'SKIP' + 'e53ce85f65f70b3eaae450892ea5e00bc79d24f469f17112c4b08ccf6749a8ab' + 'acfa37c08b1f6fa5edcaf267fc679534f32268b593b78bde0f86eabb82f50f85') +validpgpkeys=(F05F7DD7953A07DF36579DAA498C45EBE94E7B37) # ownCloud Client Team (Signing Key) <i...@owncloud.com> + +prepare() { + patch -d ownCloud-$pkgver -p1 < 608c1434.patch # Fix build with libcloudproviders + patch -d ownCloud-$pkgver -p1 < a004a91c.patch # Fix build with libcloudproviders +} + +build() { + cmake -B build -S ownCloud-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=share + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: fix-build-glib2.patch =================================================================== --- fix-build-glib2.patch 2021-09-19 10:59:52 UTC (rev 1017258) +++ fix-build-glib2.patch 2021-09-19 11:00:02 UTC (rev 1017259) @@ -1,21 +0,0 @@ -diff --git a/src/gui/libcloudproviders/libcloudproviders.cpp b/src/gui/libcloudproviders/libcloudproviders.cpp -index 99409e813..9e41e30f0 100644 ---- a/src/gui/libcloudproviders/libcloudproviders.cpp -+++ b/src/gui/libcloudproviders/libcloudproviders.cpp -@@ -12,12 +12,10 @@ - * for more details. - */ - --extern "C" { -- #include <cloudproviders/cloudprovidersaccountexporter.h> -- #include <cloudproviders/cloudprovidersproviderexporter.h> -- #include <gio/gio.h> -- #include <glib.h> --} -+#include <cloudproviders/cloudprovidersaccountexporter.h> -+#include <cloudproviders/cloudprovidersproviderexporter.h> -+#include <gio/gio.h> -+#include <glib.h> - - #include "libcloudproviders.h" - #include "libcloudproviders_p.h" Copied: owncloud-client/repos/community-x86_64/fix-build-glib2.patch (from rev 1017258, owncloud-client/trunk/fix-build-glib2.patch) =================================================================== --- fix-build-glib2.patch (rev 0) +++ fix-build-glib2.patch 2021-09-19 11:00:02 UTC (rev 1017259) @@ -0,0 +1,21 @@ +diff --git a/src/gui/libcloudproviders/libcloudproviders.cpp b/src/gui/libcloudproviders/libcloudproviders.cpp +index 99409e813..9e41e30f0 100644 +--- a/src/gui/libcloudproviders/libcloudproviders.cpp ++++ b/src/gui/libcloudproviders/libcloudproviders.cpp +@@ -12,12 +12,10 @@ + * for more details. + */ + +-extern "C" { +- #include <cloudproviders/cloudprovidersaccountexporter.h> +- #include <cloudproviders/cloudprovidersproviderexporter.h> +- #include <gio/gio.h> +- #include <glib.h> +-} ++#include <cloudproviders/cloudprovidersaccountexporter.h> ++#include <cloudproviders/cloudprovidersproviderexporter.h> ++#include <gio/gio.h> ++#include <glib.h> + + #include "libcloudproviders.h" + #include "libcloudproviders_p.h"