public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/
Date: Sat, 21 Aug 2021 16:17:26 +0000 (UTC)	[thread overview]
Message-ID: <1629562630.bd4320a4180c64e13fb8a4d84498c1239c8d1712.asturm@gentoo> (raw)

commit:     bd4320a4180c64e13fb8a4d84498c1239c8d1712
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 21 14:51:09 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 21 16:17:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4320a4

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 <AT> gentoo.org>

 .../files/libmediawiki-5.37.0-qt-5.15.patch        | 31 ++++++++++++++++++++++
 .../libmediawiki/libmediawiki-5.37.0-r1.ebuild     |  5 ++--
 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() {


             reply	other threads:[~2021-08-21 16:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-21 16:17 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-08-29 15:15 [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/ Andreas Sturmlechner
2019-03-03 21:49 Andreas Sturmlechner
2017-05-20  9:25 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1629562630.bd4320a4180c64e13fb8a4d84498c1239c8d1712.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox