| 1 |
commit: bd4320a4180c64e13fb8a4d84498c1239c8d1712 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 21 14:51:09 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 21 16:17:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4320a4 |
| 7 |
|
| 8 |
net-libs/libmediawiki: Fix build with Qt 5.15.2++, fix HOMEPAGE |
| 9 |
|
| 10 |
Upstream commit 7c79dae079d20b46d05462ed9f5b3cfae78f420a |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libmediawiki-5.37.0-qt-5.15.patch | 31 ++++++++++++++++++++++ |
| 16 |
.../libmediawiki/libmediawiki-5.37.0-r1.ebuild | 5 ++-- |
| 17 |
2 files changed, 34 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..5e7f9d49ce5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch |
| 24 |
@@ -0,0 +1,31 @@ |
| 25 |
+From 7c79dae079d20b46d05462ed9f5b3cfae78f420a Mon Sep 17 00:00:00 2001 |
| 26 |
+From: David Faure <faure@×××.org> |
| 27 |
+Date: Sun, 2 May 2021 12:39:39 +0200 |
| 28 |
+Subject: [PATCH] Fix compilation error with Qt 5.15 |
| 29 |
+MIME-Version: 1.0 |
| 30 |
+Content-Type: text/plain; charset=UTF-8 |
| 31 |
+Content-Transfer-Encoding: 8bit |
| 32 |
+ |
| 33 |
+error: use of deleted function ‘QCharRef& QCharRef::operator=(char)’ |
| 34 |
+--- |
| 35 |
+ src/queryrevision.cpp | 4 ++-- |
| 36 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/queryrevision.cpp b/src/queryrevision.cpp |
| 39 |
+index 59aac03..6ebfbc8 100644 |
| 40 |
+--- a/src/queryrevision.cpp |
| 41 |
++++ b/src/queryrevision.cpp |
| 42 |
+@@ -307,8 +307,8 @@ void QueryRevision::doWorkProcessReply() |
| 43 |
+ while (count < 2) |
| 44 |
+ { |
| 45 |
+ if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; |
| 46 |
+- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); |
| 47 |
+- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); |
| 48 |
++ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QChar(255); |
| 49 |
++ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QChar(254); |
| 50 |
+ ++i; |
| 51 |
+ } |
| 52 |
+ } |
| 53 |
+-- |
| 54 |
+GitLab |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
| 58 |
index f1cc05a6f42..aba0ba9a7f0 100644 |
| 59 |
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
| 60 |
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-# Copyright 1999-2020 Gentoo Authors |
| 63 |
+# Copyright 1999-2021 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
EAPI=7 |
| 67 |
@@ -9,7 +9,7 @@ QTMIN=5.12.3 |
| 68 |
inherit ecm kde.org |
| 69 |
|
| 70 |
DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org" |
| 71 |
-HOMEPAGE="https://www.digikam.org/" |
| 72 |
+HOMEPAGE="https://invent.kde.org/libraries/libmediawiki" |
| 73 |
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" |
| 74 |
|
| 75 |
LICENSE="GPL-2+" |
| 76 |
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}" |
| 77 |
PATCHES=( |
| 78 |
"${FILESDIR}/${P}-tests-optional.patch" |
| 79 |
"${FILESDIR}/${P}-fix-warnings.patch" |
| 80 |
+ "${FILESDIR}/${P}-qt-5.15.patch" |
| 81 |
) |
| 82 |
|
| 83 |
src_test() { |
Archives