commit: 799016bc1b3cbed67c05f1c9c244fcca6e8aed57
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Oct 3 11:28:48 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 10:30:28 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=799016bc
net-misc/cernbox-client: Add compatibility patch with new Qt 5.
New Qt packages are based upon Qt5PatchCollection
and caused FTBFS with cernbox-client without the added patch.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild | 2 ++
.../owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
b/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
index 2eb01cf8e..61be5a734 100644
--- a/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.8.2.4246.ebuild
@@ -58,6 +58,8 @@ RESTRICT="!test? ( test )"
S=${WORKDIR}/${ORIGIN_PN}-${PV}
+PATCHES=( "${FILESDIR}"/owncloud-client-${PV}-qtcore-5.15.2-r10.patch )
+
src_unpack() {
rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die
"failed to extract branding RPM"
mv ${PN%-*}-${BRANDED_PV}.${BRANDED_REL}/branding "${S}" || die "failed
to extract branding"
diff --git
a/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
b/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
new file mode 100644
index 000000000..3cb002355
--- /dev/null
+++
b/net-misc/cernbox-client/files/owncloud-client-2.8.2.4246-qtcore-5.15.2-r10.patch
@@ -0,0 +1,13 @@
+diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
+index 820fed7fb..4a103a0f9 100644
+--- a/src/csync/csync_exclude.cpp
++++ b/src/csync/csync_exclude.cpp
+@@ -486,7 +486,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;
