diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
tree | cee0a97398040001220ece3cd48c3d568bcddb4a /kde-apps/akregator | |
parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) |
gentoo resync : 10.02.2019
Diffstat (limited to 'kde-apps/akregator')
-rw-r--r-- | kde-apps/akregator/Manifest | 5 | ||||
-rw-r--r-- | kde-apps/akregator/akregator-18.12.2.ebuild (renamed from kde-apps/akregator/akregator-18.12.1.ebuild) | 2 | ||||
-rw-r--r-- | kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch | 81 |
3 files changed, 3 insertions, 85 deletions
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest index c20aedd04286..ac8be945292d 100644 --- a/kde-apps/akregator/Manifest +++ b/kde-apps/akregator/Manifest @@ -1,7 +1,6 @@ AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1 -AUX akregator-18.12.0-qt-5.11-crashfix.patch 2918 BLAKE2B c2fac1204d75b46cd4eeda1cbce77c3f167fb06ce0406817ba5c41a173c5d1fd0440755a51903793598c1324b00951f139ffcf8b37dc5edf8fed37de97fa93d9 SHA512 135b67de7c97aa31537553aea2c90aafb02d48427c784e74de1d01513c4e584e94f26923b9950f4bb537fa3468904978f7e334a5a9375d314abdaa5e0239d932 DIST akregator-18.08.3.tar.xz 2254188 BLAKE2B 42215f5d43490d6cf95808d970ee66d14acdd29b62fb8c575587741ffbaf970b18f1bc67937385d469e39da78a86a1d22b8adb383d7ccb509873d5b0b61b969b SHA512 1033356de9ad97892efe875dd79501d9588f06b24c1ebf86e235851b522878bf46b93dfe02c9d5c08fbd4934bbe65dec9bc20201826fdcc3ed9e1f9b3ea4cdd4 -DIST akregator-18.12.1.tar.xz 2189848 BLAKE2B 99ccd3e7ec7b834e4186eef2be0af65a9a430f013741c8c1a9a14cdd9c760378c8fa736a63b71fae840bcad9d62b407bca39f25f628ba2b63e82c1b36a9581f2 SHA512 c64d492490c2e2c57b6aeabc67a29cfae54b8804ad236c38aecc05fe0578f9dcb53c7411c2c1cbded556f836b70b1dad99dee86d09e96e87de21eee1d019367f +DIST akregator-18.12.2.tar.xz 2190100 BLAKE2B cf7ae7b3a720b60fe06b0382ebf43104e48e2f221a25cfc28a4b3ece9086ed3e1856ca67c362ab4dfcc3f50c8a0da1bffb9ed9099a3ef91baa6a59c097bf34cd SHA512 604d0e0ac866a9cbe450cb3229d1fd456b6495ba1a7e2e7c5ade618d29bf161b4b2f1fa2ad772ece1a5d3d5ffaedf42af7dd7e520c71ec0b8c9c4c6484489d3f EBUILD akregator-18.08.3.ebuild 1494 BLAKE2B bcf2cbd9ad2f7814d17293f44e8e2d6de049844a2360178e46bbd6d861913b163915e574caa6059ddcff29ae81e87fcf127c8fa68f39f7a1c1885d07d74c08f1 SHA512 c37f3316b460efb72a1ba1135c5aea30b4d36beb4d3431e2315ee4e66e908aa5d482b075089abc010e330a847c1d69959acf1d76c64a6a2a4d617bf2fb302b6c -EBUILD akregator-18.12.1.ebuild 1463 BLAKE2B 5256d23f17441dd35eed033e9bd5e23fe9cede6ad0c13871b4ae12052f3262ad9e1e873d585451d3ff2c58449711281f289c4d851c5fad13baf1f068db83f296 SHA512 1422e8c5d949aec3c2a2d8de8de7d9f48d94574f93cfbc10fa38dfad6724bd24773f37c746575f927583c20df194004d544bda0f88c4159790760b8a4427ab79 +EBUILD akregator-18.12.2.ebuild 1463 BLAKE2B fc705603c56b48cb2ef33d7f331e3acebfaafe12002a522e2cc83d2b6d9d99e5fa2f0f63dac8aae18207249309474bd6f091d6c4b7134660b85c53d0abebed7b SHA512 3436ce546d727ee5a03bc6c77443a922304e59df3b6ba949b6fcdfde42b77dc24f5782b7757ba9394d474f638bb8ab7fb9ddf593c47646d639c88825a846333e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/akregator/akregator-18.12.1.ebuild b/kde-apps/akregator/akregator-18.12.2.ebuild index 2eaee653eef6..e28a7edbf00a 100644 --- a/kde-apps/akregator/akregator-18.12.1.ebuild +++ b/kde-apps/akregator/akregator-18.12.2.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 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" diff --git a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch deleted file mode 100644 index f13512117a90..000000000000 --- a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 91a4ab57a82970bd75eee4a7aee61a7e1c1321ef Mon Sep 17 00:00:00 2001 -From: Andras Mantia <andras@kdab.com> -Date: Thu, 13 Dec 2018 17:32:52 +0200 -Subject: Don't crash with Qt 5.11+ - -Summary: -Based on the patch from https://bugs.kde.org/show_bug.cgi?id=371511 -See also https://bugreports.qt.io/browse/QTBUG-72260 - -BUG: 371511 - -Reviewers: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent - -Reviewed By: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent - -Subscribers: marten, asturmlechner, kfunk, kde-pim - -Tags: #kde_pim - -Differential Revision: https://phabricator.kde.org/D17563 ---- - .../webengine/articleviewerwebengine.cpp | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp -index 2463fdf..174c09a 100644 ---- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp -+++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp -@@ -46,6 +46,7 @@ - #include <QMenu> - #include <viewerplugintoolmanager.h> - #include <QWebEngineProfile> -+#include <QWebEngineUrlRequestInterceptor> - - #include <WebEngineViewer/WebHitTestResult> - #include <WebEngineViewer/WebHitTest> -@@ -57,6 +58,19 @@ - - using namespace Akregator; - -+class AkregatorRequestInterceptor : public QWebEngineUrlRequestInterceptor -+{ -+ Q_OBJECT -+ -+public: -+ explicit AkregatorRequestInterceptor(QObject *parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) { -+ } -+ -+ void interceptRequest(QWebEngineUrlRequestInfo &info) override { -+ Q_UNUSED(info); -+ } -+}; -+ - ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent) - : WebEngineViewer::WebEngineView(parent) - , mActionCollection(ac) -@@ -64,10 +78,16 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p - , mViewerPluginToolManager(nullptr) - { - mNetworkAccessManager = new WebEngineViewer::InterceptorManager(this, ac, this); -+ - QWebEngineProfile *profile = QWebEngineProfile::defaultProfile(); - mPageEngine = new ArticleViewerWebEnginePage(profile, this); - profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies); - -+ // Needed to workaround crash in webengine, see https://bugreports.qt.io/browse/QTBUG-72260 -+ auto webEngineUrlInterceptor = new AkregatorRequestInterceptor(); -+ profile->setRequestInterceptor(webEngineUrlInterceptor); -+ connect(profile, &QObject::destroyed, webEngineUrlInterceptor, &AkregatorRequestInterceptor::deleteLater); -+ - setPage(mPageEngine); - - connect(this, &ArticleViewerWebEngine::showContextMenu, this, &ArticleViewerWebEngine::slotShowContextMenu); -@@ -494,3 +514,5 @@ void ArticleViewerWebEngine::slotActivatePlugin(MessageViewer::ViewerPluginInter - interface->setUrl(mCurrentUrl); - interface->execute(); - } -+ -+#include "articleviewerwebengine.moc" --- -cgit v1.1 |