From 8993ea73a9714d22178ba6ada8c04be83cd71ec7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Aug 2022 22:47:16 +0100 Subject: gentoo auto-resync : 29:08:2022 - 22:47:16 --- net-libs/libmediawiki/Manifest | 6 +- .../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 ---- net-libs/libmediawiki/libmediawiki-5.38.0.ebuild | 33 ++++ 5 files changed, 35 insertions(+), 265 deletions(-) delete mode 100644 net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch delete mode 100644 net-libs/libmediawiki/files/libmediawiki-5.37.0-qt-5.15.patch delete mode 100644 net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild create mode 100644 net-libs/libmediawiki/libmediawiki-5.38.0.ebuild (limited to 'net-libs/libmediawiki') diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest index 6abc443e31c7..60b095c7e53f 100644 --- a/net-libs/libmediawiki/Manifest +++ b/net-libs/libmediawiki/Manifest @@ -1,6 +1,4 @@ -AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa -AUX libmediawiki-5.37.0-qt-5.15.patch 1315 BLAKE2B 9d4d437c84a8a118c9d70f086af410d48dd0904a3525d565ae19bdc81aab73e3d7762094394a3688db7dc40744f6e47defd50a853133df4bc5d2a3a2e39d828d SHA512 0b211203270415547c1ef25a8f52e6c00bfe7ad68f8456fb9a47453147dbce2508743891c2053413a830ecb4e14e90feb40c7736a7b968797e1e814f7fc4b1a1 AUX libmediawiki-5.37.0-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f -DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993 -EBUILD libmediawiki-5.37.0-r1.ebuild 927 BLAKE2B b62522c26b7813a1e9fb8808b8567b9de37f94140da8892ae9b365472299aef966b7237a74c8d958085752331761ae153b84c98aeabce5a6f76ff31a175c8cf6 SHA512 37508746c3d8679817f1c55d6302d61201c7f7a54dd3e961515be8a50334cfbfe596240f2bc181f773459848ea166a355f8f56d0c3f52b88a2af2d38653cab28 +DIST libmediawiki-5.38.0.tar.xz 55264 BLAKE2B 74753a20ab84f1badcf7368be5617648e296f66832feafb26ea2122818921a924a7278ccfbe4779535365c679ef574139dc3214812a87b72cd90f6766671928a SHA512 4e8a3a656d324006a85cd6b2eeeaafd67a80806368125a9f0ce46984b58cfeed5ad8ac34c6cc305d00b3bd92bf5e1f8e60b41313ac6a86970c47572654784114 +EBUILD libmediawiki-5.38.0.ebuild 845 BLAKE2B 4300be8a0349b1346627178b59c9fac75c4fbfaa77c9b402b0d3551665d383fa76260af281f7f925f31f58888cff36dd82dfdb955077109d953835c74181a36a SHA512 4bb939c147ef1f39ee9d2b8876f3e6aa731ec8acac00eb3a619d5cad8ac1c2fe25fa81ad5fc25d281c8a6707c8aef5bd65cf1332ce3f2463d278f7d48c882369 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 -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 -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 -} diff --git a/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild new file mode 100644 index 000000000000..eb2f3d9d6115 --- /dev/null +++ b/net-libs/libmediawiki/libmediawiki-5.38.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.96.0 +QTMIN=5.15.5 +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}/${PN}-5.37.0-tests-optional.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 +} -- cgit v1.2.3