diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-03-03 22:47:01 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-03-03 22:49:42 +0100 |
commit | 795b02e8a26392a42ea72519e7176a1148d8f59a (patch) | |
tree | b89ee79cf2e979d6835f0539c9a01538c7368a71 /net-libs | |
parent | kde-misc/kimtoy: Drop 1.91 (diff) | |
download | gentoo-795b02e8a26392a42ea72519e7176a1148d8f59a.tar.gz gentoo-795b02e8a26392a42ea72519e7176a1148d8f59a.tar.bz2 gentoo-795b02e8a26392a42ea72519e7176a1148d8f59a.zip |
net-libs/libmediawiki: Fix warnings, EAPI-7 bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/libmediawiki/files/libmediawiki-5.37.0-fix-warnings.patch | 192 | ||||
-rw-r--r-- | net-libs/libmediawiki/files/libmediawiki-5.37.0-tests-optional.patch (renamed from net-libs/libmediawiki/files/libmediawiki-5.0.0_pre20170128-tests-optional.patch) | 0 | ||||
-rw-r--r-- | net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild (renamed from net-libs/libmediawiki/libmediawiki-5.37.0.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 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 <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 index 7b910e028a47..7b910e028a47 100644 --- 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 diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild index d1f6aed6c258..421ab0d9640e 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 |