[arch-commits] Commit in owncloud-client/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Sep 9 17:33:43 UTC 2021
Date: Thursday, September 9, 2021 @ 17:33:43
Author: arojas
Revision: 1013103
archrelease: copy trunk to community-x86_64
Added:
owncloud-client/repos/community-x86_64/PKGBUILD
(from rev 1013102, owncloud-client/trunk/PKGBUILD)
owncloud-client/repos/community-x86_64/fix-build-glib2.patch
(from rev 1013102, 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
owncloud-client/repos/community-x86_64/fix-build-qt.patch
-----------------------+
PKGBUILD | 70 +++++++++++++++++++++++-------------------------
fix-build-glib2.patch | 42 ++++++++++++++--------------
fix-build-qt.patch | 13 --------
3 files changed, 55 insertions(+), 70 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-09-09 17:33:31 UTC (rev 1013102)
+++ PKGBUILD 2021-09-09 17:33:43 UTC (rev 1013103)
@@ -1,36 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
-
-pkgname=owncloud-client
-pkgver=2.8.2.4246
-pkgrel=1
-pkgdesc='ownCloud client based on mirall'
-arch=(x86_64)
-url='http://owncloud.org/'
-license=(GPL2)
-depends=(qtkeychain libcloudproviders hicolor-icon-theme)
-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-qt.patch fix-build-glib2.patch)
-sha256sums=('0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43'
- 'SKIP'
- '1dd13fd494dae3f5639a42df2c55f76897457de82be0e7601d09efabbddd3be0'
- '091b40721869e0bb38fae7d4e0bb0baf2a4aaaa1c6cdceec52e6a44aa6065e98')
-validpgpkeys=(F05F7DD7953A07DF36579DAA498C45EBE94E7B37) # ownCloud Client Team (Signing Key) <info at owncloud.com>
-
-prepare() {
- patch -d ownCloud-$pkgver -p1 < fix-build-qt.patch # Fix build with recent Qt
- 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 1013102, owncloud-client/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-09-09 17:33:43 UTC (rev 1013103)
@@ -0,0 +1,34 @@
+# Maintainer: Antonio Rojas <arojas at 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) <info at 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
+}
Deleted: fix-build-glib2.patch
===================================================================
--- fix-build-glib2.patch 2021-09-09 17:33:31 UTC (rev 1013102)
+++ fix-build-glib2.patch 2021-09-09 17:33:43 UTC (rev 1013103)
@@ -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 1013102, owncloud-client/trunk/fix-build-glib2.patch)
===================================================================
--- fix-build-glib2.patch (rev 0)
+++ fix-build-glib2.patch 2021-09-09 17:33:43 UTC (rev 1013103)
@@ -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"
Deleted: fix-build-qt.patch
===================================================================
--- fix-build-qt.patch 2021-09-09 17:33:31 UTC (rev 1013102)
+++ fix-build-qt.patch 2021-09-09 17:33:43 UTC (rev 1013103)
@@ -1,13 +0,0 @@
-diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
-index 586035346..c5c7bbccf 100644
---- a/src/csync/csync_exclude.cpp
-+++ b/src/csync/csync_exclude.cpp
-@@ -488,7 +488,7 @@ QString ExcludedFiles::convertToRegexpSyntax(QString exclude, bool wildcardsMatc
- // Translate [! to [^
- QString bracketExpr = exclude.mid(i, j - i + 1);
- if (bracketExpr.startsWith(QLatin1String("[!")))
-- bracketExpr[1] = '^';
-+ bracketExpr[1] = QLatin1Char('^');
- regex.append(bracketExpr);
- i = j;
- break;
More information about the arch-commits
mailing list