From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- net-libs/libmediawiki/Manifest | 5 +- ...ediawiki-5.0.0_pre20170128-tests-optional.patch | 15 -- .../files/libmediawiki-5.37.0-fix-warnings.patch | 192 +++++++++++++++++++++ .../files/libmediawiki-5.37.0-tests-optional.patch | 15 ++ .../libmediawiki/libmediawiki-5.37.0-r1.ebuild | 34 ++++ net-libs/libmediawiki/libmediawiki-5.37.0.ebuild | 33 ---- 6 files changed, 244 insertions(+), 50 deletions(-) delete mode 100644 net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch create mode 100644 net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch create mode 100644 net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch create mode 100644 net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild delete mode 100644 net-libs/libmediawiki/libmediawiki-5.37.0.ebuild (limited to 'net-libs/libmediawiki') diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest index 29dcb26f0cfc..ae92cb592730 100644 --- a/net-libs/libmediawiki/Manifest +++ b/net-libs/libmediawiki/Manifest @@ -1,4 +1,5 @@ -AUX libmediawiki-5.0.0_pre20170128-tests-optional.patch 470 BLAKE2B 856433e48d50f6046d1d994cafc081d1afe04a7d82fe30476e129716ede33ecd26ee721fb566de4fd094be4d897a204a34102790225b49f8a31f26f23cccc4d4 SHA512 91e483c2483e2d07ed2b4d974f37c19bcbcd2c69ff9841451d4aa182945469b83dcdbe5025807ba83438cfcfbf4218fe32f7f6d5f5232cca913285fe8b9bc33f +AUX libmediawiki-5.37.0-fix-warnings.patch 5020 BLAKE2B b00f572a413f09112cb9712efec8204b15ac5a77a6ca672ce5a4c0e53b2b4f7c329c6c792bc2d29a65afc131c8f17cf5b7ae14943296cad0b6e1e6275702a23f SHA512 2af979b26bdc224afaa9bd8259bc28085ff89ae0ec623620900b02e44467c13cc65d91c89789970f30048061b8fdfeff8b8be324b7e886f6700d12c3d1d6dcaa +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.ebuild 803 BLAKE2B a0eb444e6b06ff097169d65496c0aa2e1d839ae93a7b8abbdbc5a9fc4e73220549faf8928e26f7279bab664c75b553685f4302c0bc2416d3a0cb232211cf8578 SHA512 01b0f277ce9c54f8e4667354418a86472bb0084e2c430bb7fb7179d34a79cf8533e3c1f4253703345afec928445b84f8ae72471cab03ffe9bad015c9d4d0fb20 +EBUILD libmediawiki-5.37.0-r1.ebuild 797 BLAKE2B a7928c3f7a37ceeb68e95d3d62167836d0c5ef4089ec10efbd8cc839e3d312747ab8ad637d0ecfc9613b5c7dea79a92238e26167fec63c4aacc8ca7c6a5d5d3f SHA512 8629c5f3b0bbde78deabc12a0fe1bad0ef2206b23cdcf98afa7039dbb91b55a0df80e6e042f13685852b6711f341b7d00786a4a5a0167d972b08d83285c46f26 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 deleted file mode 100644 index 7b910e028a47..000000000000 --- a/net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/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 000000000000..c57041dca7c9 --- /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 +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-tests-optional.patch b/net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch new file mode 100644 index 000000000000..7b910e028a47 --- /dev/null +++ b/net-libs/libmediawiki/files/libmediawiki-5.37.0-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.37.0-r1.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild new file mode 100644 index 000000000000..421ab0d9640e --- /dev/null +++ b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kde5 + +DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org" +HOMEPAGE="https://www.digikam.org/" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_qt_dep qtnetwork) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-tests-optional.patch" + "${FILESDIR}/${P}-fix-warnings.patch" +) + +src_test() { + # bug 646808, 662592 + local myctestargs=( + -j1 + -E "(libmediawiki-logintest|libmediawiki-logouttest|libmediawiki-queryimageinfotest|libmediawiki-queryimagestest|libmediawiki-queryinfotest|libmediawiki-querysiteinfousergroupstest)" + ) + kde5_src_test +} diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild deleted file mode 100644 index d1f6aed6c258..000000000000 --- a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="C++ interface for MediaWiki based web service as wikipedia.org" -HOMEPAGE="https://www.digikam.org/" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_qt_dep qtnetwork) -" -RDEPEND="${DEPEND} - !net-libs/libmediawiki:4 -" - -PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" ) - -src_test() { - # bug 646808, 662592 - local myctestargs=( - -j1 - -E "(libmediawiki-logintest|libmediawiki-logouttest|libmediawiki-queryimageinfotest|libmediawiki-queryimagestest|libmediawiki-queryinfotest|libmediawiki-querysiteinfousergroupstest)" - ) - kde5_src_test -} -- cgit v1.2.3