* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/
@ 2017-05-20 9:25 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-05-20 9:25 UTC (permalink / raw
To: gentoo-commits
commit: fe52142ae965bc86fb8b1aeba3a45d31775b3493
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 09:24:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 20 09:25:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe52142a
net-libs/libmediawiki: Make tests optional
But since there are no tests executed, leave KDE_TEST unchanged.
Gentoo-bug: 619010
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../libmediawiki-5.0.0_pre20170128-tests-optional.patch | 15 +++++++++++++++
.../libmediawiki/libmediawiki-5.0.0_pre20170128.ebuild | 2 ++
2 files changed, 17 insertions(+)
diff --git a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
new file mode 100644
index 00000000000..7b910e028a4
--- /dev/null
+++ b/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt 2017-05-20 11:13:08.095098473 +0200
++++ b/CMakeLists.txt 2017-05-20 11:18:00.993712729 +0200
+@@ -45,8 +45,10 @@
+
+ # Subdirectories
+ add_subdirectory(src)
+-add_subdirectory(autotests)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(autotests)
++ add_subdirectory(tests)
++endif()
+
+ # Create a Config.cmake and a ConfigVersion.cmake file and install them
+ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5MediaWiki")
diff --git a/net-libs/libmediawiki/libmediawiki-5.0.0_pre20170128.ebuild b/net-libs/libmediawiki/libmediawiki-5.0.0_pre20170128.ebuild
index 11520c7636e..185af0d4ea9 100644
--- a/net-libs/libmediawiki/libmediawiki-5.0.0_pre20170128.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.0.0_pre20170128.ebuild
@@ -20,3 +20,5 @@ DEPEND="
RDEPEND="${DEPEND}
!net-libs/libmediawiki:4
"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/
@ 2019-03-03 21:49 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-03-03 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 795b02e8a26392a42ea72519e7176a1148d8f59a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 21:47:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 21:49:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795b02e8
net-libs/libmediawiki: Fix warnings, EAPI-7 bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libmediawiki-5.37.0-fix-warnings.patch | 192 +++++++++++++++++++++
...ch => libmediawiki-5.37.0-tests-optional.patch} | 0
...5.37.0.ebuild => libmediawiki-5.37.0-r1.ebuild} | 11 +-
3 files changed, 198 insertions(+), 5 deletions(-)
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
new file mode 100644
index 00000000000..c57041dca7c
--- /dev/null
+++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch
@@ -0,0 +1,192 @@
+From 8c11aeabf34985421cd229240a6fad3db8023156 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.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.0.0_pre20170128-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch
similarity index 100%
rename from net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch
rename to net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
similarity index 84%
rename from net-libs/libmediawiki/libmediawiki-5.37.0.ebuild
rename to net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
index d1f6aed6c25..421ab0d9640 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit kde5
@@ -17,11 +17,12 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_qt_dep qtnetwork)
"
-RDEPEND="${DEPEND}
- !net-libs/libmediawiki:4
-"
+RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-fix-warnings.patch"
+)
src_test() {
# bug 646808, 662592
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/
@ 2021-08-21 16:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-08-21 16:17 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/
@ 2022-08-29 15:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-08-29 15:15 UTC (permalink / raw
To: gentoo-commits
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@kde.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@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
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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-29 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-20 9:25 [gentoo-commits] repo/gentoo:master commit in: net-libs/libmediawiki/files/, net-libs/libmediawiki/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-03-03 21:49 Andreas Sturmlechner
2021-08-21 16:17 Andreas Sturmlechner
2022-08-29 15:15 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox