commit: 67bb098696b2cc4c0c4b826cebc53aca9ae624df Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 1 17:14:40 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 7 17:37:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bb0986
dev-qt: Remove last-rited Qt4 Closes: https://bugs.gentoo.org/631788 app-eselect/eselect-qtgraphicssystem/Manifest | 1 - .../eselect-qtgraphicssystem-1.1.1.ebuild | 21 --- app-eselect/eselect-qtgraphicssystem/metadata.xml | 11 -- dev-qt/assistant/Manifest | 1 - 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 - dev-qt/designer/Manifest | 1 - dev-qt/designer/designer-4.8.7.ebuild | 56 ------- dev-qt/designer/metadata.xml | 4 - dev-qt/linguist/Manifest | 1 - dev-qt/linguist/linguist-4.8.7.ebuild | 39 ----- dev-qt/linguist/metadata.xml | 4 - dev-qt/pixeltool/Manifest | 1 - dev-qt/pixeltool/metadata.xml | 4 - dev-qt/pixeltool/pixeltool-4.8.7.ebuild | 32 ---- dev-qt/qdbusviewer/Manifest | 1 - dev-qt/qdbusviewer/metadata.xml | 4 - dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild | 39 ----- dev-qt/qt-meta/metadata.xml | 11 -- dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild | 37 ----- dev-qt/qt3support/Manifest | 1 - dev-qt/qt3support/metadata.xml | 16 -- dev-qt/qt3support/qt3support-4.8.7.ebuild | 33 ----- dev-qt/qtbearer/Manifest | 1 - dev-qt/qtbearer/metadata.xml | 16 -- dev-qt/qtbearer/qtbearer-4.8.7.ebuild | 43 ------ dev-qt/qtcore/Manifest | 1 - ...ExcludeSocketNotifiers-in-glib-event-loop.patch | 81 ----------- .../qtcore-4.8.5-qeventdispatcher-recursive.patch | 94 ------------ dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch | 52 ------- dev-qt/qtcore/files/qtcore-4.8.7-moc.patch | 17 --- dev-qt/qtcore/metadata.xml | 5 - dev-qt/qtcore/qtcore-4.8.7-r4.ebuild | 92 ------------ dev-qt/qtdbus/Manifest | 1 - .../qtdbus-4.7-qdbusintegrator-no-const.patch | 11 -- ...bus-4.8.4-qdbusconnection-silence-warning.patch | 14 -- dev-qt/qtdbus/metadata.xml | 4 - dev-qt/qtdbus/qtdbus-4.8.7.ebuild | 40 ----- dev-qt/qtdeclarative/Manifest | 1 - dev-qt/qtdeclarative/metadata.xml | 5 - dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild | 51 ------- dev-qt/qtdemo/Manifest | 1 - dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch | 13 -- dev-qt/qtdemo/metadata.xml | 23 --- dev-qt/qtdemo/qtdemo-4.8.7.ebuild | 88 ----------- dev-qt/qtgui/Manifest | 2 - dev-qt/qtgui/files/qtgui-4.7.3-cups.patch | 84 ----------- .../qtgui-4.8.5-disable-gtk-theme-check.patch | 22 --- .../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ----- dev-qt/qtgui/metadata.xml | 9 -- dev-qt/qtgui/qtgui-4.8.7.ebuild | 162 --------------------- dev-qt/qthelp/Manifest | 3 - .../qthelp/files/qthelp-4.8.6-compat-install.patch | 35 ----- .../qthelp/files/qthelp-4.8.6-compat-syncqt.patch | 25 ---- dev-qt/qthelp/metadata.xml | 6 - dev-qt/qthelp/qthelp-4.8.7.ebuild | 111 -------------- dev-qt/qtmultimedia/Manifest | 1 - .../files/qtmultimedia-4.8.0-alsa.patch | 25 ---- ...4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch | 155 -------------------- dev-qt/qtmultimedia/metadata.xml | 2 - dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild | 44 ------ dev-qt/qtopengl/Manifest | 1 - dev-qt/qtopengl/metadata.xml | 4 - dev-qt/qtopengl/qtopengl-4.8.7.ebuild | 45 ------ dev-qt/qtscript/Manifest | 1 - .../qtscript/files/4.8.6-javascriptcore-x32.patch | 53 ------- dev-qt/qtscript/metadata.xml | 2 - dev-qt/qtscript/qtscript-4.8.7.ebuild | 38 ----- dev-qt/qtsql/Manifest | 1 - dev-qt/qtsql/metadata.xml | 5 - dev-qt/qtsql/qtsql-4.8.7-r1.ebuild | 59 -------- dev-qt/qtsvg/Manifest | 1 - dev-qt/qtsvg/metadata.xml | 4 - dev-qt/qtsvg/qtsvg-4.8.7.ebuild | 42 ------ dev-qt/qttest/Manifest | 1 - dev-qt/qttest/metadata.xml | 4 - dev-qt/qttest/qttest-4.8.7.ebuild | 32 ---- dev-qt/qttranslations/Manifest | 1 - dev-qt/qttranslations/qttranslations-4.8.7.ebuild | 40 ----- dev-qt/qtxmlpatterns/Manifest | 1 - dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild | 33 ----- profiles/package.mask | 26 ---- 84 files changed, 2180 deletions(-) diff --git a/app-eselect/eselect-qtgraphicssystem/Manifest b/app-eselect/eselect-qtgraphicssystem/Manifest deleted file mode 100644 index c34b677449d..00000000000 --- a/app-eselect/eselect-qtgraphicssystem/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST eselect-qtgraphicssystem-1.1.1.tar.bz2 1621 BLAKE2B 1c58c8241e80d3897d059a1cf7aa1a1339d6d71255a8ff93df4517295f7f0d93aa5b90b9b15577b6e16e24d733cfa10285a5eab02e43b881f3c5ba54a802fc48 SHA512 9c8b5c1d40094b74401de2b0ae74ff2421f3fdd0bf51e5e4c06717064dfee9c03ed9a2ce913b7e8f54c6ad0b5ec11f392cb7fe7fa26822b1370b3e15d5389a66 diff --git a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild deleted file mode 100644 index b82a885ed5b..00000000000 --- a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="Utility to change the active Qt Graphics System" -HOMEPAGE="https://github.com/gentoo/eselect-qtgraphicssystem"; -SRC_URI="https://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND="" -RDEPEND=">=app-admin/eselect-1.2.4" - -src_install() { - insinto /usr/share/eselect/modules - doins qtgraphicssystem.eselect -} diff --git a/app-eselect/eselect-qtgraphicssystem/metadata.xml b/app-eselect/eselect-qtgraphicssystem/metadata.xml deleted file mode 100644 index ed30fbaf34d..00000000000 --- a/app-eselect/eselect-qtgraphicssystem/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <upstream> - <remote-id type="github">gentoo/eselect-qtgraphicssystem</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest index b24f9976769..1d657985d29 100644 --- a/dev-qt/assistant/Manifest +++ b/dev-qt/assistant/Manifest @@ -1,4 +1,3 @@ -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 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 41eb312612b..00000000000 --- 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 1cf70275f63..00000000000 --- 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 61bca05148e..00000000000 --- 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 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/assistant/metadata.xml +++ b/dev-qt/assistant/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest index b24f9976769..1d657985d29 100644 --- a/dev-qt/designer/Manifest +++ b/dev-qt/designer/Manifest @@ -1,4 +1,3 @@ -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 diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild deleted file mode 100644 index 7fbb1e9854c..00000000000 --- a/dev-qt/designer/designer-4.8.7.ebuild +++ /dev/null @@ -1,56 +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="WYSIWYG tool for designing and building Qt-based GUIs" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -DESIGNER_PLUGINS="declarative phonon qt3support webkit" -IUSE="${DESIGNER_PLUGINS}" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" -PDEPEND="phonon? ( media-libs/phonon[designer,qt4] )" - -QT4_TARGET_DIRECTORIES="tools/designer" - -src_prepare() { - qt4-build-multilib_src_prepare - - local plugin - for plugin in ${DESIGNER_PLUGINS}; do - if ! use ${plugin} || [[ ${plugin} == phonon ]]; then - sed -i -e "/\<${plugin}\>/d" \ - tools/designer/src/plugins/plugins.pro || die - fi - done -} - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - doicon tools/designer/src/designer/images/designer.png - make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' -} diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml index e72a70897a4..7f1774a4eb6 100644 --- a/dev-qt/designer/metadata.xml +++ b/dev-qt/designer/metadata.xml @@ -7,10 +7,6 @@ </maintainer> <use> <flag name="declarative">Build the qdeclarativeview plugin</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="phonon">Build the phononwidgets plugin</flag> - <flag name="qt3support">Build the qt3supportwidgets plugin</flag> <flag name="webkit">Build the qwebview plugin</flag> </use> <upstream> diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest index b24f9976769..1d657985d29 100644 --- a/dev-qt/linguist/Manifest +++ b/dev-qt/linguist/Manifest @@ -1,4 +1,3 @@ -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 diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild deleted file mode 100644 index 0c0cce6d0fb..00000000000 --- a/dev-qt/linguist/linguist-4.8.7.ebuild +++ /dev/null @@ -1,39 +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="Graphical tool for translating Qt applications" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/linguist/linguist" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png - make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' -} diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/linguist/metadata.xml +++ b/dev-qt/linguist/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest index b24f9976769..1d657985d29 100644 --- a/dev-qt/pixeltool/Manifest +++ b/dev-qt/pixeltool/Manifest @@ -1,4 +1,3 @@ -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 diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/pixeltool/metadata.xml +++ b/dev-qt/pixeltool/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild deleted file mode 100644 index 9cf60ffbfba..00000000000 --- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Qt screen magnifier" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - !<dev-qt/qthelp-4.8.5:4 -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/pixeltool" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest index b24f9976769..1d657985d29 100644 --- a/dev-qt/qdbusviewer/Manifest +++ b/dev-qt/qdbusviewer/Manifest @@ -1,4 +1,3 @@ -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 diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/qdbusviewer/metadata.xml +++ b/dev-qt/qdbusviewer/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild deleted file mode 100644 index bf0dafdd0b9..00000000000 --- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild +++ /dev/null @@ -1,39 +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="Graphical tool that lets you introspect D-Bus objects and messages" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer" - -multilib_src_configure() { - local myconf=( - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png - make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development' -} diff --git a/dev-qt/qt-meta/metadata.xml b/dev-qt/qt-meta/metadata.xml deleted file mode 100644 index 202b54f3e09..00000000000 --- a/dev-qt/qt-meta/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="qt3support">Enable the Qt3Support library for Qt4</flag> - </use> -</pkgmetadata> diff --git a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild b/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild deleted file mode 100644 index f3d4853b85f..00000000000 --- a/dev-qt/qt-meta/qt-meta-4.8.6-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Cross-platform application development framework (metapackage)" -HOMEPAGE="https://www.qt.io/"; - -LICENSE="metapackage" -SLOT="4" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+dbus examples +qt3support +webkit" - -DEPEND="" -RDEPEND=" - >=dev-qt/assistant-${PV}:4 - >=dev-qt/designer-${PV}:4 - >=dev-qt/linguist-${PV}:4 - >=dev-qt/pixeltool-${PV}:4 - dbus? ( >=dev-qt/qdbusviewer-${PV}:4 ) - qt3support? ( >=dev-qt/qt3support-${PV}:4 ) - >=dev-qt/qtbearer-${PV}:4 - >=dev-qt/qtcore-${PV}:4 - dbus? ( >=dev-qt/qtdbus-${PV}:4 ) - >=dev-qt/qtdeclarative-${PV}:4 - examples? ( >=dev-qt/qtdemo-${PV}:4 ) - >=dev-qt/qtgui-${PV}:4 - >=dev-qt/qthelp-${PV}:4 - >=dev-qt/qtmultimedia-${PV}:4 - >=dev-qt/qtopengl-${PV}:4 - >=dev-qt/qtscript-${PV}:4 - >=dev-qt/qtsql-${PV}:4 - >=dev-qt/qtsvg-${PV}:4 - >=dev-qt/qttest-${PV}:4 - webkit? ( >=dev-qt/qtwebkit-${PV}:4 ) - >=dev-qt/qtxmlpatterns-${PV}:4 -" diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest deleted file mode 100644 index ff3e112fa86..00000000000 --- a/dev-qt/qt3support/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml deleted file mode 100644 index b92d7448ee4..00000000000 --- a/dev-qt/qt3support/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild deleted file mode 100644 index d6794af6893..00000000000 --- a/dev-qt/qt3support/qt3support-4.8.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Qt3Support module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/qt3support - src/tools/uic3 - tools/porting" - -multilib_src_configure() { - local myconf=( - -qt3support - $(qt_use accessibility) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest deleted file mode 100644 index ff3e112fa86..00000000000 --- a/dev-qt/qtbearer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml deleted file mode 100644 index b92d7448ee4..00000000000 --- a/dev-qt/qtbearer/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild deleted file mode 100644 index 515b3ccc88c..00000000000 --- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The network bearer plugins for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="connman networkmanager" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/plugins/bearer/generic - $(use connman && echo src/plugins/bearer/connman) - $(use networkmanager && echo src/plugins/bearer/networkmanager)" -} - -multilib_src_configure() { - local myconf=( - $(use connman || use networkmanager || echo -no-dbus) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index eedf45b0bb8..cd4e56ed7f4 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch deleted file mode 100644 index 0fcc1fa6561..00000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski <glo...@fbihome.de> -Date: Thu, 6 Mar 2014 18:44:43 +0100 -Subject: Honor ExcludeSocketNotifiers in glib event loop - -Implements QEventLoop::ExcludeSocketNotifiers in the same way -QEventLoop::X11ExcludeTimers is already implemented for the glib -event loop. - -This prevents crashes when QClipboard checks for clipboard events -and - qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true ); -is set. - -Task-number: QTBUG-34614 -Task-number: QTBUG-37380 - -Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d ---- - src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp -index 0b0e308..ba522fa 100644 ---- a/src/corelib/kernel/qeventdispatcher_glib.cpp -+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp -@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier - struct GSocketNotifierSource - { - GSource source; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QList<GPollFDWithQSocketNotifier *> pollfds; - }; - -@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source) - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); - - bool pending = false; -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return pending; -+ - for (int i = 0; !pending && i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin - QEvent event(QEvent::SockAct); - - GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source); -+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers) -+ return true; -+ - for (int i = 0; i < src->pollfds.count(); ++i) { - GPollFDWithQSocketNotifier *p = src->pollfds.at(i); - -@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) - reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs, - sizeof(GSocketNotifierSource))); - (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>(); -+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents; - g_source_set_can_recurse(&socketNotifierSource->source, true); - g_source_attach(&socketNotifierSource->source, mainContext); - -@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; - d->timerSource->processEventsFlags = flags; -+ d->socketNotifierSource->processEventsFlags = flags; - - if (!(flags & QEventLoop::EventLoopExec)) { - // force timers to be sent at normal priority -@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) - result = g_main_context_iteration(d->mainContext, canWait); - - d->timerSource->processEventsFlags = savedFlags; -+ d->socketNotifierSource->processEventsFlags = savedFlags; - - if (canWait) - emit awake(); --- -2.0.0 - diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch deleted file mode 100644 index 6d3bf2f2cde..00000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100 -+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200 -@@ -255,22 +255,30 @@ struct GPostEventSource - GSource source; - QAtomicInt serialNumber; - int lastSerialNumber; -+ QEventLoop::ProcessEventsFlags processEventsFlags; - QEventDispatcherGlibPrivate *d; - }; - - static gboolean postEventSourcePrepare(GSource *s, gint *timeout) - { -+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - QThreadData *data = QThreadData::current(); - if (!data) - return false; - -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ - gint dummy; - if (!timeout) - timeout = &dummy; - const bool canWait = data->canWaitLocked(); - *timeout = canWait ? -1 : 0; - -- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - return (!canWait - || (source->serialNumber != source->lastSerialNumber)); - } -@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch( - { - GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - source->lastSerialNumber = source->serialNumber; -- QCoreApplication::sendPostedEvents(); -- source->d->runTimersOnceWithNormalPriority(); -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) { -+ QCoreApplication::sendPostedEvents(); -+ source->d->runTimersOnceWithNormalPriority(); -+ } - return true; // i dunno, george... - } - -@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa - postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, - sizeof(GPostEventSource))); - postEventSource->serialNumber = 1; -+ postEventSource->processEventsFlags = QEventLoop::AllEvents; - postEventSource->d = this; - g_source_set_can_recurse(&postEventSource->source, true); - g_source_attach(&postEventSource->source, mainContext); -@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents - - // tell postEventSourcePrepare() and timerSource about any new flags - QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; -+ d->postEventSource->processEventsFlags = flags; - d->timerSource->processEventsFlags = flags; - d->socketNotifierSource->processEventsFlags = flags; - -@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents - while (!result && canWait) - result = g_main_context_iteration(d->mainContext, canWait); - -+ d->postEventSource->processEventsFlags = savedFlags; - d->timerSource->processEventsFlags = savedFlags; - d->socketNotifierSource->processEventsFlags = savedFlags; - ---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200 -+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200 -@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents - - // we are awake, broadcast it - emit awake(); -- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); -+ -+ QEventLoop::ProcessEventsFlags excludeAllFlags -+ = QEventLoop::ExcludeUserInputEvents -+ | QEventLoop::ExcludeSocketNotifiers -+ | QEventLoop::X11ExcludeTimers; -+ if ((flags & excludeAllFlags) == excludeAllFlags) -+ return false; -+ if(( flags & excludeAllFlags ) != excludeAllFlags ) -+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); - - int nevents = 0; - const bool canWait = (d->threadData->canWaitLocked() diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch deleted file mode 100644 index b838c7a687b..00000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-11-25 01:38:42.103898399 -0500 -+++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-11-25 01:40:50.146247648 -0500 -@@ -224,13 +224,17 @@ - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) - #else -@@ -818,13 +822,17 @@ - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_client_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_client_method) -+#endif - RESOLVEFUNC(SSLv23_client_method) - RESOLVEFUNC(TLSv1_client_method) - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_server_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_server_method) -+#endif - RESOLVEFUNC(SSLv23_server_method) - RESOLVEFUNC(TLSv1_server_method) - RESOLVEFUNC(X509_NAME_entry_count) ---- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-11-25 01:44:55.235087906 -0500 -+++ src/network/ssl/qsslsocket_openssl.cpp 2015-11-25 01:45:45.194443818 -0500 -@@ -263,7 +263,11 @@ - #endif - break; - case QSsl::SslV3: -+#ifndef OPENSSL_NO_SSL3 - ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -+#else -+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error -+#endif - break; - case QSsl::SecureProtocols: // SslV2 will be disabled below - case QSsl::TlsV1SslV3: // SslV2 will be disabled below diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch deleted file mode 100644 index 7660dedc163..00000000000 --- a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 2015-05-07 09:14:44.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp 2016-03-16 13:20:43.145899869 -0500 -@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv) - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; - -- // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 -+ // Workaround a bug while parsing some boost headers. See QTBUG-22829 - pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; -+ pp.macros["BOOST_TYPE_TRAITS_HPP"]; -+ pp.macros["_SYS_SYSMACROS_H_OUTER"]; - - QByteArray filename; - QByteArray output; diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index 668f6ab4564..c612265c6f7 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -6,11 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> <flag name="systemd">Enable native journald logging support</flag> </use> <upstream> diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild deleted file mode 100644 index 86ae786cc2c..00000000000 --- a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+glib iconv icu libressl qt3support ssl" - -DEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] ) - icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND="${DEPEND}" -PDEPEND=" - ~dev-qt/qttranslations-${PV} - qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/qt4/Qt/qconfig.h - /usr/include/qt4/QtCore/qconfig.h -) - -PATCHES=( - "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 - "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796 - "${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394 -) - -QT4_TARGET_DIRECTORIES=" - src/tools/bootstrap - src/tools/moc - src/tools/rcc - src/tools/uic - src/corelib - src/network - src/xml - src/plugins/codecs/cn - src/plugins/codecs/jp - src/plugins/codecs/kr - src/plugins/codecs/tw - tools/linguist/lconvert - tools/linguist/lrelease - tools/linguist/lupdate" - -QCONFIG_DEFINE="QT_ZLIB" - -src_prepare() { - qt4-build-multilib_src_prepare - - # bug 172219 - sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ - -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ - qmake/Makefile.unix || die "sed qmake/Makefile.unix failed" - - # bug 427782 - sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ - qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix failed" - sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/' \ - -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/' \ - configure || die "sed configure setBootstrapVariable failed" -} - -multilib_src_configure() { - local myconf=( - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - $(qt_use glib) - $(qt_use iconv) - $(qt_use icu) - $(use ssl && echo -openssl-linked || echo -no-openssl) - $(qt_use qt3support) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index eedf45b0bb8..cd4e56ed7f4 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb diff --git a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch b/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch deleted file mode 100644 index 086eb47a071..00000000000 --- a/dev-qt/qtdbus/files/qtdbus-4.7-qdbusintegrator-no-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 -+++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 -@@ -71,7 +71,7 @@ - static bool isDebugging; - #define qDBusDebug if (!::isDebugging); else qDebug - --Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) -+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) - - static inline QString dbusServiceString() - { return *orgFreedesktopDBusString(); } diff --git a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch b/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch deleted file mode 100644 index dd3a5a02298..00000000000 --- a/dev-qt/qtdbus/files/qtdbus-4.8.4-qdbusconnection-silence-warning.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp ---- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch 2012-09-06 02:33:44.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp 2012-09-11 08:55:29.854026815 -0500 -@@ -1109,8 +1109,10 @@ public: - // make sure this connection is running on the main thread - QCoreApplication *instance = QCoreApplication::instance(); - if (!instance) { -+#ifndef QT_NO_DEBUG - qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", - type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); -+#endif - } else if (QDBusConnectionPrivate::d(*this)) { - QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); - } diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/qtdbus/metadata.xml +++ b/dev-qt/qtdbus/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild deleted file mode 100644 index 144c5dd6cad..00000000000 --- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The DBus module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" - "${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/dbus - tools/qdbus/qdbus - tools/qdbus/qdbusxml2cpp - tools/qdbus/qdbuscpp2xml" - -QCONFIG_ADD="dbus dbus-linked" -QCONFIG_DEFINE="QT_DBUS" - -multilib_src_configure() { - local myconf=( - -dbus-linked - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 10811577afb..89d63ce0cff 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 DIST qtdeclarative-opensource-src-5.9.4.tar.xz 21454140 BLAKE2B a7e792406c2eb42422aba1b779e2249f081840c8237a119cf4d9a001fa34d1f5e48e30216c08be431a89bca52dd56d4241d92cdfdb8b684b0912449bd0c9301e SHA512 e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39 diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 9afadffbfb1..6333b5897c5 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -6,13 +6,8 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - <flag name="webkit">Build the WebView QML component</flag> <flag name="widgets">Enable QtWidgets support</flag> <flag name="xml">Build the XmlListModel import for QtQuick (requires QtXmlPatterns)</flag> </use> diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild deleted file mode 100644 index 267b79b445b..00000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Declarative module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility qt3support webkit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/declarative - src/imports - src/plugins/qmltooling - tools/qml - tools/qmlplugindump" - -QCONFIG_ADD="declarative" -QCONFIG_DEFINE="QT_DECLARATIVE" - -pkg_setup() { - use webkit && QT4_TARGET_DIRECTORIES+=" - src/3rdparty/webkit/Source/WebKit/qt/declarative" -} - -multilib_src_configure() { - local myconf=( - -declarative -no-gtkstyle - $(qt_use accessibility) - $(qt_use qt3support) - $(qt_use webkit) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest deleted file mode 100644 index ff3e112fa86..00000000000 --- a/dev-qt/qtdemo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 diff --git a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch b/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch deleted file mode 100644 index 262996aa106..00000000000 --- a/dev-qt/qtdemo/files/qtdemo-4.6-plugandpaint.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro -index 9616eb8..e188bc1 100644 ---- a/examples/tools/plugandpaint/plugandpaint.pro -+++ b/examples/tools/plugandpaint/plugandpaint.pro -@@ -10,7 +10,7 @@ SOURCES = main.cpp \ - symbian { - LIBS = -lpnp_basictools.lib - } else { -- LIBS = -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools -+ LIBS += -L$${QT_BUILD_TREE}/examples/tools/plugandpaint/plugins -lpnp_basictools - } - - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml deleted file mode 100644 index 288f9a8bd33..00000000000 --- a/dev-qt/qtdemo/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>q...@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="dbus">Build QtDBus examples and demos</flag> - <flag name="declarative">Build QtDeclarative examples and demos</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="multimedia">Build QtMultimedia examples and demos</flag> - <flag name="opengl">Build QtOpenGL examples and demos</flag> - <flag name="phonon">Build Phonon examples and demos</flag> - <flag name="webkit">Build QtWebKit examples and demos</flag> - <flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild deleted file mode 100644 index e8c4d393d6e..00000000000 --- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Demonstration module and examples for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ppc ppc64 x86" -fi - -IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns" - -DEPEND=" - ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~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/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] ) - webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.6-plugandpaint.patch" -) - -QT4_TARGET_DIRECTORIES=" - demos - examples" - -src_prepare() { - qt4-build-multilib_src_prepare - - # Array mapping USE flags to subdirs - local flags_subdirs_map=( - 'dbus' - 'declarative:declarative' - 'multimedia:spectrum' - 'opengl:boxes|glhypnotizer' - 'phonon:mediaplayer' - 'webkit:browser' - 'xmlpatterns' - ) - - # Disable unwanted examples/demos - for flag in "${flags_subdirs_map[@]}"; do - if ! use ${flag%:*}; then - einfo "Disabling ${flag%:*} examples" - sed -i -e "/SUBDIRS += ${flag%:*}/d" \ - examples/examples.pro || die - - if [[ ${flag} == *:* ]]; then - einfo "Disabling ${flag%:*} demos" - sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ - demos/demos.pro || die - fi - fi - done - - # Remove bogus dependency on qt3support (bug 510042) - sed -i -e 's/contains(QT_CONFIG, qt3support)://' \ - examples/graphicsview/graphicsview.pro || die -} - -multilib_src_configure() { - local myconf=( - $(qt_use dbus) - $(qt_use declarative) - $(qt_use multimedia) -no-audio-backend - $(qt_use opengl) - -no-openvg - $(qt_use phonon) -no-phonon-backend - $(qt_use webkit) - $(qt_use xmlpatterns) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index aa7d326ffea..cd4e56ed7f4 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,5 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch deleted file mode 100644 index e0305e11b89..00000000000 --- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 -@@ -569,6 +569,32 @@ - void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) - { - options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); -+ -+ if (cups) { -+ const ppd_option_t* duplex = cups->ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ options.duplexShort->setChecked(true); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ options.duplexLong->setChecked(true); -+ else -+ options.noDuplex->setChecked(true); -+ } -+ -+ if (cups->currentPPD()) { -+ // set default color -+ if (cups->currentPPD()->color_device) -+ options.color->setChecked(true); -+ else -+ options.grayscale->setChecked(true); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups->ppdOption("Collate"); -+ if (collate) -+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); -+ } - } - #endif - -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 -@@ -627,6 +627,44 @@ - && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { - setOutputFormat(QPrinter::PdfFormat); - } -+ -+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -+ // fill in defaults from ppd file -+ QCUPSSupport cups; -+ -+ int printernum = -1; -+ for (int i = 0; i < cups.availablePrintersCount(); i++) { -+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) -+ printernum = i; -+ } -+ if (printernum >= 0) { -+ cups.setCurrentPrinter(printernum); -+ -+ const ppd_option_t* duplex = cups.ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ setDuplex(DuplexShortSide); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ setDuplex(DuplexLongSide); -+ else -+ setDuplex(DuplexNone); -+ } -+ -+ if (cups.currentPPD()) { -+ // set default color -+ if (cups.currentPPD()->color_device) -+ setColorMode(Color); -+ else -+ setColorMode(GrayScale); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups.ppdOption("Collate"); -+ if (collate) -+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); -+ } -+#endif - } - - /*! diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch deleted file mode 100644 index 9a9f773537e..00000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp ---- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500 -+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 -@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() - return; - } - -- static QString themeName; -- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { -- themeName = getThemeName(); -- -- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { -- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, -- // we cannot support the GTK_Qt Gtk engine -- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); -- return; -- } -- } -- - if (QGtkStylePrivate::gtk_init) { - // Gtk will set the Qt error handler so we have to reset it afterwards - x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch deleted file mode 100644 index d46f8c54187..00000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensing...@gentoo.org> -Date: Mon, 16 Jun 2014 23:52:24 +1000 -Subject: Fix delay with QClipboard and useEventLoop. - -This manifests when using LibreOffice with KDE integration. When KFileDialog is -open, the clipboard is repeatedly polled causing a visible delay since using -QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard -fetch. - -Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd -Task-number: QTBUG-38585 ---- - src/gui/kernel/qclipboard_x11.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp -index 14bf088..5f442b9 100644 ---- a/src/gui/kernel/qclipboard_x11.cpp -+++ b/src/gui/kernel/qclipboard_x11.cpp -@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti - return false; - - XSync(X11->display, false); -- usleep(50000); -+ if (!XPending(X11->display)) -+ usleep(5000); - - now.start(); - --- -2.0.0 - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index ef12478e668..bb8d780f9c2 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -9,18 +9,9 @@ <flag name="egl">Enable EGL integration</flag> <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> <flag name="evdev">Enable support for input devices via evdev</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> - <flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag> - <flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag> <flag name="ibus">Build the IBus input method plugin</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4.</flag> - <flag name="trace">Build the 'trace' graphicssystem engine which allows to record - all drawing operations into a trace buffer. The trace can be replayed - later with the qttracereplay tool.</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> <flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag> diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild deleted file mode 100644 index 79f95bf77ea..00000000000 --- a/dev-qt/qtgui/qtgui-4.8.7.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="The GUI module for the Qt toolkit" -SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"; - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -# cairo[-qt4] is needed because of bug 454066 -RDEPEND=" - app-eselect/eselect-qtgraphicssystem - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - !aqua? ( - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) - xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) - ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - gtkstyle? ( - >=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] - ) - mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) - nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) - nis? ( elibc_glibc? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] ) ) - tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) - !<dev-qt/qthelp-4.8.5:4 -" -DEPEND="${RDEPEND} - !aqua? ( x11-base/xorg-proto ) -" -PDEPEND=" - qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 - "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 - "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 - "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 -) - -QT4_TARGET_DIRECTORIES=" - src/gui - src/scripttools - src/plugins/imageformats/gif - src/plugins/imageformats/ico - src/plugins/imageformats/jpeg - src/plugins/imageformats/tga - src/plugins/inputmethods" - -pkg_setup() { - use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" - use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" - use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" - - [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig system-freetype gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG QT_FREETYPE - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" -} - -src_prepare() { - qt4-build-multilib_src_prepare - - # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die -} - -multilib_src_configure() { - local myconf=( - $(qt_use accessibility) - $(qt_use cups) - $(qt_use glib) - $(qt_use mng libmng system) - $(qt_use nas nas-sound system) - $(qt_use nis) - $(qt_use tiff libtiff system) - $(qt_use egl) - $(qt_use qt3support) - $(qt_use gtkstyle) - $(qt_use xinerama) - $(qt_use xv xvideo) - -system-libpng -system-libjpeg -system-zlib - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb - -fontconfig -no-svg -no-webkit -no-phonon -no-opengl - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - dodir /usr/share/qt4/graphicssystems - echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die - - if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then - newicon tools/qtconfig/images/appicon.png qtconfig.png - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' - fi -} - -pkg_postinst() { - qt4-build-multilib_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old -} diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest index d8ed996a32e..1d657985d29 100644 --- a/dev-qt/qthelp/Manifest +++ b/dev-qt/qthelp/Manifest @@ -1,6 +1,3 @@ -DIST qt-assistant-compat-headers-4.7.tar.gz 448 BLAKE2B ca3318ff64a4484faec0254d17f3831f75bc5d96ff6eef8dd57219076074c3b5cf23bdbc84266dc40c66231aba7342d9fb2cf9102c2bec05ce33d8854935a8e3 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb -DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 BLAKE2B b84c207a7633229a1b06aee1560f969bc5088ef65d1c6366ac817017a5713c6c50915df95109fa1a8fadef4bf8c2de22d16dc95e36325a92f419051c1dcfe5b3 SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 -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 diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch deleted file mode 100644 index e157381c8f0..00000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <p...@gentoo.org> -Date: Wed, 6 May 2015 23:21:54 +0200 -Subject: [PATCH] Install assistant_adp binary. - ---- - tools/assistant/compat/compat.pro | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro -index 171106a..a14e3f8 100755 ---- a/tools/assistant/compat/compat.pro -+++ b/tools/assistant/compat/compat.pro -@@ -14,6 +14,8 @@ QT += xml network - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ mac { - TARGET = Assistant_adp - } - -+target.path = $$[QT_INSTALL_BINS] -+INSTALLS += target -+ - TRANSLATIONS = translations/assistant_adp_de.ts \ - translations/assistant_adp_ja.ts \ - translations/assistant_adp_pl.ts \ --- -2.4.0 - diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch deleted file mode 100644 index 4ba6b6ff741..00000000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <p...@gentoo.org> -Date: Wed, 6 May 2015 22:44:57 +0200 -Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers. - -See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47 ---- - bin/syncqt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bin/syncqt b/bin/syncqt -index dd94d4d..cc5a7bf 100755 ---- a/bin/syncqt -+++ b/bin/syncqt -@@ -81,6 +81,7 @@ my %modules = ( # path to module name map - "ActiveQt" => "$basedir/src/activeqt", - "QtTest" => "$basedir/src/testlib", - "QtHelp" => "$basedir/tools/assistant/lib", -+ "QtAssistant" => "$basedir/tools/assistant/compat/lib", - "QtDesigner" => "$basedir/tools/designer/src/lib", - "QtUiTools" => "$basedir/tools/designer/src/uitools", - "QtDBus" => "$basedir/src/dbus", --- -2.4.0 - diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml index a1b56059494..32568f62fb8 100644 --- a/dev-qt/qthelp/metadata.xml +++ b/dev-qt/qthelp/metadata.xml @@ -5,12 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="compat">Build the extra compatibility layer required by a few packages, see - http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild deleted file mode 100644 index 0587f38e146..00000000000 --- a/dev-qt/qthelp/qthelp-4.8.7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Help module for the Qt toolkit" -SRC_URI+=" - compat? ( - http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz - https://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz - )" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86" -fi - -IUSE="compat doc" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}] - compat? ( - ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - tools/assistant/lib/fulltextsearch - tools/assistant/lib - tools/assistant/tools/qhelpgenerator - tools/assistant/tools/qcollectiongenerator - tools/assistant/tools/qhelpconverter - tools/qdoc3" - -pkg_setup() { - use compat && QT4_TARGET_DIRECTORIES+=" - tools/assistant/compat - tools/assistant/compat/lib" -} - -src_unpack() { - qt4-build-multilib_src_unpack - - # compat version - # http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ - if use compat; then - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die - mv "${WORKDIR}"/QtAssistant "${S}"/include || die - find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die - fi -} - -src_prepare() { - use compat && PATCHES+=( - "${FILESDIR}/${PN}-4.8.6-compat-install.patch" - "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch" - ) - - qt4-build-multilib_src_prepare - - # prevent rebuild of QtCore and QtXml (bug 348034) - sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die -} - -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 - -no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns - -no-nas-sound -no-cups -no-nis -fontconfig - ) - qt4_multilib_src_configure -} - -multilib_src_compile() { - qt4_multilib_src_compile - - # release tarballs are shipped with prebuilt docs - if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then - # qhelpgenerator needs libQtHelp.so.4 - export LD_LIBRARY_PATH=${BUILD_DIR}/lib - export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework - emake docs - fi -} - -multilib_src_install() { - qt4_multilib_src_install - - if multilib_is_native_abi; then - emake INSTALL_ROOT="${D}" install_qchdocs - use doc && emake INSTALL_ROOT="${D}" install_htmldocs - - # do not compress .qch files - docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch - fi -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - if use compat; then - insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features - doins tools/assistant/compat/features/assistant.prf - fi -} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 415d77fa11e..9b448347e70 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c DIST qtmultimedia-opensource-src-5.9.4.tar.xz 3608792 BLAKE2B ac377b3cf33d727fa129fe623cc9ba9ea75555b2af7f70cf07524598d4044a94617b3627f7fd3a915596e51ac53040b9d72a5fcaa2faf316150a2c1ead220def SHA512 7a60434736f655900d00e70a68e5781f336446938f4f2b617e1d93205b7319bf01be987c001a9e6838ba5fd9e3afe3f20137597b6c27f6f77ee55486e283d425 DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f81c9a99e75748dd68112ae4fd534e038d73d1f8fa33b76119824ade231e7b1c283ff109ee2473774d08c67bffa04383e7328437539aadbf SHA512 2d5f1341ef1f2d7e99ced28945f70b283630ce4ed9ac968c34ffc7d215c59a9b895681ee519aca64fe8a41ae574577ce834e486281db7e1f337245f9b6506207 diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch deleted file mode 100644 index 8bd40edb1e8..00000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.0-alsa.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.0.orig/configure 2012-03-13 00:45:02.502205702 +0100 -+++ qt-everywhere-opensource-src-4.8.0/configure 2012-03-13 00:47:40.386231881 +0100 -@@ -1049,7 +1049,7 @@ - VAL=no - ;; - #Qt style yes options -- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) -+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL=yes - ;; -@@ -2399,6 +2399,13 @@ - else - UNKNOWN_OPT=yes - fi -+ ;; -+ alsa) -+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then -+ CFG_ALSA="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi - ;; - *) - UNKNOWN_OPT=yes diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch deleted file mode 100644 index 6a040b2d88a..00000000000 --- a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001 -From: Davide Pesavento <p...@gentoo.org> -Date: Fri, 22 Jan 2016 23:17:16 +0100 -Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0 - -Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159 ---- - config.tests/unix/alsa/alsatest.cpp | 2 +- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16 ++++++++-------- - src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +- - src/multimedia/audio/qaudioinput_alsa_p.cpp | 4 ++-- - src/multimedia/audio/qaudiooutput_alsa_p.cpp | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp -index ac5f1e1..8d78f95 100644 ---- a/config.tests/unix/alsa/alsatest.cpp -+++ b/config.tests/unix/alsa/alsatest.cpp -@@ -40,7 +40,7 @@ - ****************************************************************************/ - - #include <alsa/asoundlib.h> --#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) -+#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) - #error "Alsa version found too old, require >= 1.0.10" - #endif - -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -index 973cbab..a09dcf6 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp -@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode - device = QLatin1String(dev); - this->mode = mode; - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - checkSurround(); - #endif - } -@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open() - QList<QByteArray> devices = availableDevices(mode); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first().constData()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = device; - #else - int idx = 0; -@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists() - } - channelz.append(1); - channelz.append(2); --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - if (surround40) channelz.append(4); - if (surround51) channelz.append(6); - if (surround71) channelz.append(8); -@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) - QList<QByteArray> devices; - QByteArray filter; - --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - // Create a list of all current audio devices that support mode - void **hints, **n; - char *name, *descr, *io; -@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice() - return devices.first(); - } - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void QAudioDeviceInfoInternal::checkSurround() - { - QList<QByteArray> devices; -diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -index 96febf4..714bf60 100644 ---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h -@@ -98,7 +98,7 @@ private: - bool open(); - void close(); - --#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - void checkSurround(); - bool surround40; - bool surround51; -diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp -index 339fd9f..202a5b2 100644 ---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp -@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; -diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -index bf85de5..fe4b010 100644 ---- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp -+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp -@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open() - QString dev = QString(QLatin1String(m_device.constData())); - QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput); - if(dev.compare(QLatin1String("default")) == 0) { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(devices.first()); - #else - dev = QLatin1String("hw:0,0"); - #endif - } else { --#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) -+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) - dev = QLatin1String(m_device); - #else - int idx = 0; --- -2.7.0 - diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index c6f5fc3b126..833d7be66b3 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -6,8 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild deleted file mode 100644 index eb03bb3922a..00000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The Multimedia module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86" -fi - -IUSE="alsa" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.0-alsa.patch" - "${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426 -) - -QT4_TARGET_DIRECTORIES="src/multimedia" - -QCONFIG_ADD="multimedia" -QCONFIG_DEFINE="QT_MULTIMEDIA" - -multilib_src_configure() { - local myconf=( - -multimedia -audio-backend - $(qt_use alsa) - -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend - -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index eedf45b0bb8..cd4e56ed7f4 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml index 3a2fbf1c8ab..17b1d11ac71 100644 --- a/dev-qt/qtopengl/metadata.xml +++ b/dev-qt/qtopengl/metadata.xml @@ -6,11 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild deleted file mode 100644 index fb17633c545..00000000000 --- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The OpenGL module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="egl qt3support" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/opengl - src/plugins/graphicssystems/opengl" - -QCONFIG_ADD="opengl" -QCONFIG_DEFINE="QT_OPENGL" - -multilib_src_configure() { - local myconf=( - -opengl - $(qt_use qt3support) - $(qt_use egl) - ) - qt4_multilib_src_configure -} - -multilib_src_install_all() { - qt4_multilib_src_install_all - - dodir /usr/share/qt4/graphicssystems - echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die -} diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest index 9c4aab9224b..2131e7a731e 100644 --- a/dev-qt/qtscript/Manifest +++ b/dev-qt/qtscript/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411 DIST qtscript-opensource-src-5.9.4.tar.xz 2612372 BLAKE2B 8213e2b70e23dfa6e42ffd0aaa1818a4794670de24fa5b30cdf4c7bd17f1a438d9d6a8bf9c03f2995a60b6e3ad6d57bf0273c6e1027ed3d0b77fc2987d285603 SHA512 e0c49e1286c4b1de6d197c42d8e4bcd82a5ea07e8c89f6f222fa62579b5d466336a5baa50372e5a9b514bd8be098e80f3793123cae09d7a923c4d1466b0e13c9 DIST qtscript-opensource-src-5.9.6.tar.xz 2607812 BLAKE2B 3f11ae2270b1bdc6ac195a4a398754df16d4599211ba291fd0a5793cc7e586f0034f1f5d63a185541e35c744de1d3c8facf12bef2cbbf98abd94b3c27e40b6ba SHA512 2ddecda376b79edc8cfe9215a531a8f0b1892f3e6b39c298a679903c2600a1df43bb59baeed3392e92fefb476ec2ebdd2ffd351d14918fea00025d2cbd48da46 diff --git a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch b/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch deleted file mode 100644 index cde4cfb93f5..00000000000 --- a/dev-qt/qtscript/files/4.8.6-javascriptcore-x32.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4e7126ea1488f3e1df0b76cacf83cb73f9d4b54c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jen...@digia.com> -Date: Tue, 4 Mar 2014 10:46:18 +0100 -Subject: Fix build on x32 - -Recognize x32 and disable JIT in this configuration. - -Task-number: QTBUG-35463 -Change-Id: Ie5bf64f22f3e58a9b3f12190cf790ad6c39f415e ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 0b95639..85ed8a7 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -202,6 +202,11 @@ - #if defined(__x86_64__) \ - || defined(_M_X64) - #define WTF_CPU_X86_64 1 -+ -+#if defined(__ILP32__) -+#define WTF_CPU_X32 1 -+#endif -+ - #endif - - /* 64-bit mode on AIX */ -@@ -906,7 +911,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) -+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 -@@ -923,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ - #define ENABLE_REPAINT_THROTTLING 0 - #endif - -+/* Disable JIT on x32 */ -+#if CPU(X32) -+#define ENABLE_JIT 0 -+#endif -+ - #if !defined(ENABLE_JIT) - - /* The JIT is tested & working on x86_64 Mac */ --- -cgit v0.11.0 - diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml index a559e634185..da283d207fe 100644 --- a/dev-qt/qtscript/metadata.xml +++ b/dev-qt/qtscript/metadata.xml @@ -6,8 +6,6 @@ <name>Gentoo Qt Project</name> </maintainer> <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> <flag name="scripttools">Build the QtScriptTools module (requires QtWidgets)</flag> </use> <upstream> diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild deleted file mode 100644 index ce3c8d0893c..00000000000 --- a/dev-qt/qtscript/qtscript-4.8.7.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The QtScript module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+jit" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/script" - -QCONFIG_ADD="script" -QCONFIG_DEFINE="QT_SCRIPT" - -PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) - -multilib_src_configure() { - local myconf=( - $(qt_use jit javascript-jit) - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama - -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif - -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg - -no-gtkstyle - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index eedf45b0bb8..cd4e56ed7f4 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml index bea102dd5ae..32568f62fb8 100644 --- a/dev-qt/qtsql/metadata.xml +++ b/dev-qt/qtsql/metadata.xml @@ -5,11 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild deleted file mode 100644 index 089d7a76c79..00000000000 --- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit multilib qt4-build-multilib - -DESCRIPTION="The SQL module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite" - -REQUIRED_USE=" - || ( freetds mysql oci8 odbc postgres sqlite ) -" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}] - freetds? ( dev-db/freetds ) - mysql? ( virtual/libmysqlclient:=[${MULTILIB_USEDEP}] ) - oci8? ( >=dev-db/oracle-instantclient-basic-11.2.0.4[${MULTILIB_USEDEP}] ) - odbc? ( || ( - >=dev-db/unixODBC-2.3.2-r2[${MULTILIB_USEDEP}] - >=dev-db/libiodbc-3.52.8-r2[${MULTILIB_USEDEP}] - ) ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/sql - src/plugins/sqldrivers" - -multilib_src_configure() { - local myconf=( - $(qt_native_use freetds sql-tds plugin) - $(qt_use mysql sql-mysql plugin) $(use mysql && echo -mysql_config "${EPREFIX}/usr/bin/${CHOST}-mysql_config") - $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") - $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") - $(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") - $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) - -no-sql-db2 - -no-sql-ibase - -no-sql-sqlite2 - -no-sql-symsql - $(qt_use qt3support) - -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon - -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative - -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl - -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-nis -no-opengl - -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes - -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb - -no-glib - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 7a2fc02414b..c77926a1833 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39 DIST qtsvg-opensource-src-5.9.4.tar.xz 1778072 BLAKE2B 077ca02c7a43cc5cc6170e0c24ee155e3d190033837494c58804934881361f738709f0aed9d876dada19c48b194624b90a759cf509c9e1fb9c566514a4f5c430 SHA512 242a471ba8b1b3fe45d53e0dbdd2bcba0ffe129f7658fa3608fb0f8ee72bf56244522861c12315eabc401f389031bea2027eb106eec67688f141ea8550b6b2b5 DIST qtsvg-opensource-src-5.9.6.tar.xz 1778688 BLAKE2B 30084cdeaefef6c15f07fbdb9373b9cecb87fdd9676c2d89061a371439ec0c02ace2fe65b0061e518de6a1b75df9edf314adcdb6ffdc03c7be29424c92784d25 SHA512 6e86f050c07621d628f6e9440541be1fd80b3e05b034ba17bb5068afd4775d9ee08d7bf11d2ffdf03da2cb8ca66bfaf2f59b7e5e76acdb1a1e2ec25af25c65b4 diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/qtsvg/metadata.xml +++ b/dev-qt/qtsvg/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild deleted file mode 100644 index e93289484ea..00000000000 --- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The SVG module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/svg - src/plugins/imageformats/svg - src/plugins/iconengines/svgiconengine" - -QCONFIG_ADD="svg" -QCONFIG_DEFINE="QT_SVG" - -multilib_src_configure() { - local myconf=( - -svg - $(qt_use accessibility) - -no-xkb -no-xrender - -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm - -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-fontconfig -no-glib -no-gtkstyle - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index eedf45b0bb8..cd4e56ed7f4 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml index 22d751f51bd..32568f62fb8 100644 --- a/dev-qt/qttest/metadata.xml +++ b/dev-qt/qttest/metadata.xml @@ -5,10 +5,6 @@ <email>q...@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> <doc>https://doc.qt.io/</doc> diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild deleted file mode 100644 index c9adac525eb..00000000000 --- a/dev-qt/qttest/qttest-4.8.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The QtTest module for unit testing Qt applications and libraries" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES="src/testlib" - -multilib_src_configure() { - local myconf=( - -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor - -no-xinerama -no-xshape -no-sm -no-opengl - -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng - -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon - -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff - -no-accessibility -no-fontconfig -no-glib -no-svg - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index a6b065f7128..f6b02c73b94 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0 DIST qttranslations-opensource-src-5.9.4.tar.xz 1451972 BLAKE2B f859c764d63673866bc8be88d4e5f9e2956b3bd08a883268a0c9cbca45a7132578a87b98eadf592944864da2d70cbbff0b46a75665faaa72c4f6a723f203cdb6 SHA512 74375ee78e40e8de2349e575306c729d90d80de089f44d4ff57506085c748d5eb5d0699a769d4379f7dd23c48ab88b7e5a8227044ce07d6ae12b0d3ac19450f0 DIST qttranslations-opensource-src-5.9.6.tar.xz 1376088 BLAKE2B f85611a787fbbc5820bf0b68773ab9be1edc2f659c7861c6d8bc8158c0ca495f882dd2201406315a1f5c3caf7b4dd87b2178362e4ee9d5523112c55f590a6fd8 SHA512 caafa6fb865c73c1c43ca5d78aab21925d5cf836b3e9d8c10ac699a96e7b583e85f12101a79a55102f8d404305764acadac599cf84b97d03582684f3b9bc4ec7 diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild deleted file mode 100644 index 11907196f69..00000000000 --- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="Translation files for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} -" -RDEPEND="" - -QT4_TARGET_DIRECTORIES="translations" - -multilib_src_configure() { - if multilib_is_native_abi; then - qt4_prepare_env - qt4_symlink_tools_to_build_dir - qt4_foreach_target_subdir qt4_qmake - fi -} - -multilib_src_compile() { - multilib_is_native_abi && qt4_multilib_src_compile -} - -multilib_src_test() { - : -} - -multilib_src_install() { - multilib_is_native_abi && qt4_multilib_src_install -} diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest index a00770b1961..a3b4f14c370 100644 --- a/dev-qt/qtxmlpatterns/Manifest +++ b/dev-qt/qtxmlpatterns/Manifest @@ -1,4 +1,3 @@ -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066 DIST qtxmlpatterns-opensource-src-5.9.4.tar.xz 1361036 BLAKE2B 74fae07ff780bb44eaffc56822585c5dd2dc36c13237ae23666f8286488a837cafccf01c14d9efe4d151435235965b923bad1889ed604ebb2781237d8674db26 SHA512 c2789e7ca32f29f025b72704be49d9cfd3c02bfa61bf3df4145ea03b5df4fc60b2498bcf7e45090b36141aace91c645b0648b99c54e1b3fe6aec486e7fbe0dad DIST qtxmlpatterns-opensource-src-5.9.6.tar.xz 1344204 BLAKE2B 08478bdc81f49fb2e24a57a105f537000b945537b172392b56751614473bc63c8b2cc4d3c279a91b7ef0e68490d01655b6dac7f5771754baf73335fe3117a12a SHA512 c1b7983725cd208b207e366f3fcaedf073768cbe11d6c54c4569b8155e2c97e4af889792600d86769b7e6828409e0333ad7c66b8459d07c5c1a06268d28d6788 diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild deleted file mode 100644 index c5ab5f0e709..00000000000 --- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The XmlPatterns module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] -" -RDEPEND="${DEPEND}" - -QT4_TARGET_DIRECTORIES=" - src/xmlpatterns - tools/xmlpatterns - tools/xmlpatternsvalidator" - -QCONFIG_ADD="xmlpatterns" -QCONFIG_DEFINE="QT_XMLPATTERNS" - -multilib_src_configure() { - local myconf=( - -xmlpatterns - ) - qt4_multilib_src_configure -} diff --git a/profiles/package.mask b/profiles/package.mask index b7e19fb5874..4c9ba49597b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -178,32 +178,6 @@ dev-python/jaraco-utils # for generating new keys and doing key maintenance. Removal in a month app-crypt/gkeys-gen -# Andreas Sturmlechner <ast...@gentoo.org> (26 Jun 2018) -# Mask Qt4 for removal. Bug #631788 -=dev-qt/assistant-4.8.7 -=dev-qt/designer-4.8.7 -=dev-qt/linguist-4.8.7 -=dev-qt/pixeltool-4.8.7 -=dev-qt/qdbusviewer-4.8.7 -=dev-qt/qt3support-4.8.7 -=dev-qt/qtbearer-4.8.7 -=dev-qt/qtcore-4.8.7-r4 -=dev-qt/qtdbus-4.8.7 -=dev-qt/qtdeclarative-4.8.7 -=dev-qt/qtdemo-4.8.7 -=dev-qt/qtgui-4.8.7 -=dev-qt/qthelp-4.8.7 -=dev-qt/qt-meta-4.8.6-r1 -=dev-qt/qtmultimedia-4.8.7 -=dev-qt/qtopengl-4.8.7 -=dev-qt/qtscript-4.8.7 -=dev-qt/qtsql-4.8.7-r1 -=dev-qt/qtsvg-4.8.7 -=dev-qt/qttest-4.8.7 -=dev-qt/qttranslations-4.8.7 -=dev-qt/qtxmlpatterns-4.8.7 -app-eselect/eselect-qtgraphicssystem - # Thomas Deutschmann <whi...@gentoo.org> (23 Jun 2018) # Doesn't pass QA full boot test =sys-kernel/ck-sources-4.16.17
