Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package owncloud-client for openSUSE:Factory
checked in at 2021-07-09 23:58:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old)
and /work/SRC/openSUSE:Factory/.owncloud-client.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client"
Fri Jul 9 23:58:32 2021 rev:29 rq:905215 version:2.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes
2021-06-01 10:38:46.828947757 +0200
+++
/work/SRC/openSUSE:Factory/.owncloud-client.new.2625/owncloud-client.changes
2021-07-09 23:59:51.716280663 +0200
@@ -1,0 +2,11 @@
+Fri Jul 9 07:39:48 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Add upstream patch to fix build:
+ * fix-use-of-deleted-function.patch
+
+-------------------------------------------------------------------
+Mon Jun 28 06:27:48 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Remove the unneeded QtWebKit build dependency.
+
+-------------------------------------------------------------------
New:
----
fix-use-of-deleted-function.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ owncloud-client.spec ++++++
--- /var/tmp/diff_new_pack.78p3kY/_old 2021-07-09 23:59:52.376275530 +0200
+++ /var/tmp/diff_new_pack.78p3kY/_new 2021-07-09 23:59:52.380275499 +0200
@@ -33,6 +33,8 @@
# PATCH-FIX-UPSTREAM fix position of systray menu
https://github.com/owncloud/client/issues/5968
# for all except tumbleweed and ongoing, as the Qt bug is fixed in there.
Patch0: fix-systray-menu-pos.patch
+# PATCH-FIX-UPSTREAM fix build error caused by implicit cast to QCar
+Patch1: fix-use-of-deleted-function.patch
%define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir}
@@ -63,7 +65,7 @@
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(zlib)
@@ -209,6 +211,8 @@
%patch0 -p1
%endif
+%patch1 -p1
+
%build
echo suse_version 0%{?suse_version}
++++++ fix-use-of-deleted-function.patch ++++++
>From ff43c9394b45dd78106069ba89ae92f25abba158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <[email protected]>
Date: Sat, 5 Jun 2021 13:27:13 -0300
Subject: [PATCH] Fix use of deleted function
Compilation fails due to implicit cast to QChar
Compilation on void linux (qt 5.15.3+20210429) fails with
csync_exclude.cpp:489:34: error: use of deleted function 'QCharRef&
QCharRef::operator=(char)'
---
src/csync/csync_exclude.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
index 586035346b..c5c7bbccf5 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;
