[gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/

[Andreas Sturmlechner]

commit:     38f99527bbdb7f55196c86058bbc12872eea8c8f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 11:49:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 15:15:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f99527

net-libs/libmediawiki: drop 5.37.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/libmediawiki/Manifest                     |   1 -
 .../files/libmediawiki-5.37.0-fix-warnings.patch   | 192 ---------------------
 .../files/libmediawiki-5.37.0-qt-5.15.patch        |  31 ----
 .../libmediawiki/libmediawiki-5.37.0-r1.ebuild     |  38 ----
 4 files changed, 262 deletions(-)

diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 8c08fa60b4df..1a4c8459ac39 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -1,2 +1 @@
-DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
 DIST libmediawiki-5.38.0.tar.xz 55264 BLAKE2B 74753a20ab84f1badcf7368be5617648e296f66832feafb26ea2122818921a924a7278ccfbe4779535365c679ef574139dc3214812a87b72cd90f6766671928a SHA512 4e8a3a656d324006a85cd6b2eeeaafd67a80806368125a9f0ce46984b58cfeed5ad8ac34c6cc305d00b3bd92bf5e1f8e60b41313ac6a86970c47572654784114

diff --git a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
deleted file mode 100644
index c57041dca7c9..000000000000
--- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@×××.org>
-Date: Sat, 9 Sep 2017 15:33:24 +0200
-Subject: use Q_DECL_OVERRIDE
-
----
- src/edit.h                          | 2 +-
- src/job.h                           | 2 +-
- src/login.h                         | 2 +-
- src/logout.h                        | 2 +-
- src/parse.h                         | 2 +-
- src/queryimageinfo.h                | 2 +-
- src/queryimages.h                   | 2 +-
- src/queryinfo.h                     | 2 +-
- src/queryrevision.h                 | 2 +-
- src/querysiteinfogeneral.h          | 2 +-
- src/querysiteinfousergroups.h       | 2 +-
- src/upload.h                        | 2 +-
- tests/libmediawikitest/fakeserver.h | 2 +-
- 13 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/edit.h b/src/edit.h
-index 85bd590..a3944c8 100644
---- a/src/edit.h
-+++ b/src/edit.h
-@@ -178,7 +178,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Specify how the watchlist is affected by this edit.
-diff --git a/src/job.h b/src/job.h
-index 180822b..feda262 100644
---- a/src/job.h
-+++ b/src/job.h
-@@ -73,7 +73,7 @@ public:
-     /**
-      * @brief Aborts this job quietly.
-      */
--    virtual bool doKill();
-+    bool doKill() Q_DECL_OVERRIDE;
- 
- protected:
- 
-diff --git a/src/login.h b/src/login.h
-index 196710a..4ea71f1 100644
---- a/src/login.h
-+++ b/src/login.h
-@@ -130,7 +130,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
- 
-diff --git a/src/logout.h b/src/logout.h
-index 03fb1f7..1b05323 100644
---- a/src/logout.h
-+++ b/src/logout.h
-@@ -65,7 +65,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
- 
-diff --git a/src/parse.h b/src/parse.h
-index 5732f69..e72f59f 100644
---- a/src/parse.h
-+++ b/src/parse.h
-@@ -85,7 +85,7 @@ public:
- 
-     void setUseLang(const QString& param);
- 
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     Q_SIGNALS:
- 
-diff --git a/src/queryimageinfo.h b/src/queryimageinfo.h
-index f8c21a6..039c4a5 100644
---- a/src/queryimageinfo.h
-+++ b/src/queryimageinfo.h
-@@ -148,7 +148,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/queryimages.h b/src/queryimages.h
-index 3211880..c8de5a0 100644
---- a/src/queryimages.h
-+++ b/src/queryimages.h
-@@ -103,7 +103,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/queryinfo.h b/src/queryinfo.h
-index e2ff3e6..e23f50e 100644
---- a/src/queryinfo.h
-+++ b/src/queryinfo.h
-@@ -75,7 +75,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the page name.
-diff --git a/src/queryrevision.h b/src/queryrevision.h
-index b1decfb..190d026 100644
---- a/src/queryrevision.h
-+++ b/src/queryrevision.h
-@@ -150,7 +150,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the page id.
-diff --git a/src/querysiteinfogeneral.h b/src/querysiteinfogeneral.h
-index 516f7ed..1b31f15 100644
---- a/src/querysiteinfogeneral.h
-+++ b/src/querysiteinfogeneral.h
-@@ -81,7 +81,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/querysiteinfousergroups.h b/src/querysiteinfousergroups.h
-index 74bc653..d6fb089 100644
---- a/src/querysiteinfousergroups.h
-+++ b/src/querysiteinfousergroups.h
-@@ -73,7 +73,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
- Q_SIGNALS:
- 
-diff --git a/src/upload.h b/src/upload.h
-index 817eb5b..7f745f4 100644
---- a/src/upload.h
-+++ b/src/upload.h
-@@ -143,7 +143,7 @@ public:
-     /**
-      * @brief Starts the job asynchronously.
-      */
--    virtual void start();
-+    void start() Q_DECL_OVERRIDE;
- 
-     /**
-      * @brief Set the target filename.
-diff --git a/tests/libmediawikitest/fakeserver.h b/tests/libmediawikitest/fakeserver.h
-index e847ac6..c6bb78c 100644
---- a/tests/libmediawikitest/fakeserver.h
-+++ b/tests/libmediawikitest/fakeserver.h
-@@ -61,7 +61,7 @@ public:
-     ~FakeServer();
- 
-     void startAndWait();
--    virtual void run();
-+    void run() Q_DECL_OVERRIDE;
- 
-     void setScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
-     void addScenario( const QString& scenario, const QString& cookie = QStringLiteral("empty"));
--- 
-cgit v1.1

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
deleted file mode 100644
index 5e7f9d49ce50..000000000000
--- a/net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7c79dae079d20b46d05462ed9f5b3cfae78f420a Mon Sep 17 00:00:00 2001
-From: David Faure <faure@×××.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
deleted file mode 100644
index 88b2d5e06537..000000000000
--- a/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org"
-HOMEPAGE="https://invent.kde.org/libraries/libmediawiki"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-DEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tests-optional.patch"
-	"${FILESDIR}/${P}-fix-warnings.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_test() {
-	# bug 646808, 662592
-	local myctestargs=(
-		-j1
-		-E "(libmediawiki-logintest|libmediawiki-logouttest|libmediawiki-queryimageinfotest|libmediawiki-queryimagestest|libmediawiki-queryinfotest|libmediawiki-querysiteinfousergroupstest)"
-	)
-	ecm_src_test
-}