From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- dev-qt/assistant/Manifest | 6 +-- dev-qt/assistant/assistant-4.8.7.ebuild | 53 ---------------------- .../assistant/files/assistant-4.8.2+gcc-4.7.patch | 12 ----- dev-qt/assistant/files/disable-webkit.patch | 26 ----------- dev-qt/assistant/metadata.xml | 4 -- 5 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 dev-qt/assistant/assistant-4.8.7.ebuild delete mode 100644 dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch delete mode 100644 dev-qt/assistant/files/disable-webkit.patch (limited to 'dev-qt/assistant') diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index 1a42123fce2f..081410bd1e47 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1,11 +1,7 @@ -AUX assistant-4.8.2+gcc-4.7.patch 500 BLAKE2B 359cb062c9406b9afd8e4a427c5da36952ab7a1d821e127e74667d7752d3393cfce95fe9cd7a7134533eb4a1d6916b8b0f96da7fa0fd3efdee63f98ceaa18c4a SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18 -AUX disable-webkit.patch 872 BLAKE2B 3856945120fbc7c27a32acc0663e74ec8302012c2c646cadb3467505797ee0a2233d3556646d532cfe1a2d3cb1b8b1fda53ff7a94ad302fba952202baa7927ca SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.6.tar.xz 9575188 BLAKE2B 117f9ad299ccf0a3ec0afe0c654731325bd6f39219bc9b473b43f02508f0b653a1ea3c202b9ecda187e0c25f4d02d22cb57f66c8aa812635823250b8f52d35f9 SHA512 2e72e88a6691491ff24b791254f2bb1e98bfc22b01a3ae3d5b8312ca75d4dea983e7949a1d445d9fd9b18c86ba9236489ba59e5562c6db60ec43dbd452b6b8d8 -EBUILD assistant-4.8.7.ebuild 1477 BLAKE2B c722e0a293112ba58f292566de3d3730e5a12430e107f9fe95ed45841e55731340a298b23dda9bbdbfcd29e3b51342077e7fc3f632755ee54fefab72f72dcb05 SHA512 2f01f97502f9990a048b3dc974e6295cdb8f97f2804f0a20a9f515e7a8a04611718d680778ce35ddac45b6406dfb4fcf05a60a7f24acdcbfd3787c3e2961eb6b EBUILD assistant-5.11.1.ebuild 1198 BLAKE2B f2b40ee9a585e0a0fcb98b6999728b633a3c9cf3c9bfc767ba2f5d6948156684596bf02aa9e006008f50474def97051562faa6baad271662c33c78095e1c7f39 SHA512 cca326bf91461ef72f110f6c0c23ef13c65eb0fa51eebdce468797e89f5969846dff93ce75a93ed1d1f699044e7dc3a32b0659e922f26531b71702390f6f318c EBUILD assistant-5.9.4.ebuild 1195 BLAKE2B 9fd15cfd04a7544046cccdc503169417f53ee3a808aeb58a745063e62acb3deed5d761275c1c9a812c92a38427c447f542a77feb312517556c15b4da7681a2b3 SHA512 9139269fee4450c028b112203655a5917beefe83ef07544c8c129c4efee9815448af5cb59312b53821d0c2fa53214e439f02343b84952207a1f8cb57c3e09ee6 EBUILD assistant-5.9.6.ebuild 1196 BLAKE2B 277fdd312eeadf0ec2b9a80344a27c02e3afda54c98e461980336548a27754031de6cefd1cd6b68b982e01b1328c59709c76f644a55097388873503159ef444d SHA512 593c31f11c78108adec6a63d1e47369746b48a4a15f4ad8a18930004f4c5f188b314f069fc43431f51415416109b84ce2994b0a4b59cdef710fcd1f1cb69eeec -MISC metadata.xml 628 BLAKE2B 4bd345030bffba038b79cd782e8ee638e989b8808a439a74b82d712b514004890fb437b7787980d377c679b4aed78ac94bce8db06ef4030a8448a4a16a33cb4d SHA512 571c94a9d9713de46619fa60fab6c0627066481be86b08a258408eab1f2ee6cc9ceb28f57361c4657c20d54b2d0647ded9fc900e419752ec35ebb8da88659360 +MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild deleted file mode 100644 index 41eb312612bc..000000000000 --- a/dev-qt/assistant/assistant-4.8.7.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="Tool for viewing on-line documentation in Qt help file format" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -fi - -IUSE="webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}] - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" -) - -QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant" - -src_prepare() { - # bug 401173 - use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch") - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns - $(qt_use webkit) - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - doicon tools/assistant/tools/assistant/images/assistant.png - make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation' -} diff --git a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch b/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch deleted file mode 100644 index 1cf70275f634..000000000000 --- a/dev-qt/assistant/files/assistant-4.8.2+gcc-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200 -+++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200 -@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont() - if (helpEngine.usesAppFont()) - font = helpEngine.appFont(); - -- const QWidgetList &widgets = qApp->allWidgets(); -- foreach (QWidget* widget, widgets) -+ foreach (QWidget* widget, QApplication::allWidgets()) - widget->setFont(font); - } - diff --git a/dev-qt/assistant/files/disable-webkit.patch b/dev-qt/assistant/files/disable-webkit.patch deleted file mode 100644 index 61bca05148e5..000000000000 --- a/dev-qt/assistant/files/disable-webkit.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -=================================================================== ---- qt-everywhere-opensource-src-4.8.9999.orig/tools/assistant/tools/assistant/assistant.pro -+++ qt-everywhere-opensource-src-4.8.9999/tools/assistant/tools/assistant/assistant.pro -@@ -2,7 +2,6 @@ include(../../../shared/fontpanel/fontpa - TEMPLATE = app - LANGUAGE = C++ - TARGET = assistant --contains(QT_CONFIG, webkit):QT += webkit - CONFIG += qt \ - warn_on \ - help -@@ -81,11 +80,8 @@ SOURCES += aboutdialog.cpp \ - openpageswidget.cpp \ - openpagesmanager.cpp \ - openpagesswitcher.cpp --contains(QT_CONFIG, webkit) { -- SOURCES += helpviewer_qwv.cpp --} else { -- SOURCES += helpviewer_qtb.cpp --} -+ -+SOURCES += helpviewer_qtb.cpp - - FORMS += bookmarkdialog.ui \ - bookmarkmanagerwidget.ui \ \ No newline at end of file diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml index 22d751f51bd7..32568f62fb8e 100644 --- a/dev-qt/assistant/metadata.xml +++ b/dev-qt/assistant/metadata.xml @@ -5,10 +5,6 @@ qt@gentoo.org Gentoo Qt Project - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ https://doc.qt.io/ -- cgit v1.2.3