summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-21 16:51:09 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-08-21 18:17:10 +0200
commitbd4320a4180c64e13fb8a4d84498c1239c8d1712 (patch)
tree54d6eee7f19fe1b4e34c26147d85157caa628789
parentnet-mail/fetchmail: 6.4.21 direct stable bump (diff)
downloadgentoo-bd4320a4180c64e13fb8a4d84498c1239c8d1712.tar.gz
gentoo-bd4320a4180c64e13fb8a4d84498c1239c8d1712.tar.bz2
gentoo-bd4320a4180c64e13fb8a4d84498c1239c8d1712.zip
net-libs/libmediawiki: Fix build with Qt 5.15.2++, fix HOMEPAGE
Upstream commit 7c79dae079d20b46d05462ed9f5b3cfae78f420a Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch31
-rw-r--r--net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild5
2 files changed, 34 insertions, 2 deletions
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch
new file mode 100644
index 00000000000..5e7f9d49ce5
--- /dev/null
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch
@@ -0,0 +1,31 @@
+From 7c79dae079d20b46d05462ed9f5b3cfae78f420a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 2 May 2021 12:39:39 +0200
+Subject: [PATCH] Fix compilation error with Qt 5.15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+error: use of deleted function ‘QCharRef& QCharRef::operator=(char)’
+---
+ src/queryrevision.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/queryrevision.cpp b/src/queryrevision.cpp
+index 59aac03..6ebfbc8 100644
+--- a/src/queryrevision.cpp
++++ b/src/queryrevision.cpp
+@@ -307,8 +307,8 @@ void QueryRevision::doWorkProcessReply()
+ while (count < 2)
+ {
+ if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++;
+- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255);
+- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254);
++ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QChar(255);
++ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QChar(254);
+ ++i;
+ }
+ }
+--
+GitLab
+
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
index f1cc05a6f42..aba0ba9a7f0 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ QTMIN=5.12.3
inherit ecm kde.org
DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="https://www.digikam.org/"
+HOMEPAGE="https://invent.kde.org/libraries/libmediawiki"
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
LICENSE="GPL-2+"
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-tests-optional.patch"
"${FILESDIR}/${P}-fix-warnings.patch"
+ "${FILESDIR}/${P}-qt-5.15.patch"
)
src_test() {