diff options
author | Davide Pesavento <pesa@gentoo.org> | 2016-12-04 04:52:43 +0100 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2016-12-04 04:52:43 +0100 |
commit | 2ef83c43456d4812e8a94255cca1ff1bbf32fff6 (patch) | |
tree | 71f45e3576615dcd4832539430b540ed38a695cf /dev-qt/qtgui | |
parent | net-analyzer/nagios{,-core}: new version 4.2.3 to fix CVE-2016-8641. (diff) | |
download | gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.gz gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.tar.bz2 gentoo-2ef83c43456d4812e8a94255cca1ff1bbf32fff6.zip |
dev-qt: remove Qt 5.5.1
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r-- | dev-qt/qtgui/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtgui/files/qtgui-5.5.1-crash.patch | 34 | ||||
-rw-r--r-- | dev-qt/qtgui/qtgui-5.5.1-r1.ebuild | 171 |
3 files changed, 0 insertions, 206 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 4a84075bc63b..f47f586ab4bc 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,6 +1,5 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 -DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4 DIST qtbase-opensource-src-5.6.1-1.tar.xz 46788436 SHA256 329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39 SHA512 e9660bee2e0acd91c3232831e4f1a99ad30b82b8ff26850494efec89a525499b721adfb63f7ede586408489d3ebf727b842cd12eab665c58769001454e7f661d WHIRLPOOL e26cf72d9644dbcb08d1269bdaa633be2e24de813deb62a1c77e448b6578f6761769664fc95c4131c342f077c092a777af8fed62ea35e5fdb0f2576d82b3c499 DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a DIST qtbase-opensource-src-5.7.0.tar.xz 43993020 SHA256 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 SHA512 c082b835839ff23ce10463ccc364a0ee6255b4f48409c485181be8e039f5cdf00efa41ec220ddbd9b41e5c8a9fa29327af0e3450e10294b64bb729053eb7c63d WHIRLPOOL 2ba79ed2717ac7876228d9ab6455f97e0689f5d297dfc2fa7d089bde6b1c6bc38f30a467477482bb3af9e19afe95f5f5dbd76bcc835281ce473564cf45a77a92 diff --git a/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch b/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch deleted file mode 100644 index a2b8e62ac15b..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.5.1-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 79447068579ea93d616d840bb8cbbf8adb1ed6ec Mon Sep 17 00:00:00 2001 -From: Nicolas Capens <capn@google.com> -Date: Tue, 10 Nov 2015 00:03:34 -0500 -Subject: Fix potential division by zero. - -In a Chrome Remote Desktop session the htotal and/or vtotal timings -can be zero and lead to a SIGFPE exception. - -Task-number: QTBUG-49322 -Change-Id: Id530335cc760d1938ed888ad095427fcf32c651d -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> -Reviewed-by: Nicolas Capens <nicolas.capens@gmail.com> -Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com> ---- - src/plugins/platforms/xcb/qxcbscreen.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp -index 2a53b18..0e99d58 100644 ---- a/src/plugins/platforms/xcb/qxcbscreen.cpp -+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp -@@ -558,7 +558,8 @@ void QXcbScreen::updateRefreshRate(xcb_randr_mode_t mode) - for (; modesIter.rem; xcb_randr_mode_info_next(&modesIter)) { - xcb_randr_mode_info_t *modeInfo = modesIter.data; - if (modeInfo->id == mode) { -- m_refreshRate = modeInfo->dot_clock / (modeInfo->htotal * modeInfo->vtotal); -+ const uint32_t dotCount = modeInfo->htotal * modeInfo->vtotal; -+ m_refreshRate = (dotCount != 0) ? modeInfo->dot_clock / dotCount : 0; - m_mode = mode; - break; - } --- -cgit v0.11.0 - diff --git a/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild deleted file mode 100644 index 1a9070d4c919..000000000000 --- a/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86" -fi - -# TODO: directfb, linuxfb, kms integration in eglfs - -IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle - ibus jpeg libinput +png tslib tuio +udev +xcb" -REQUIRED_USE=" - || ( eglfs xcb ) - accessibility? ( dbus xcb ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - xcb? ( gles2? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - ~dev-qt/qtcore-${PV} - media-libs/fontconfig - >=media-libs/freetype-2.5.5:2 - >=media-libs/harfbuzz-0.9.40:= - >=sys-libs/zlib-1.2.5 - virtual/opengl - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) - evdev? ( sys-libs/mtdev ) - gtkstyle? ( - x11-libs/gtk+:2 - x11-libs/pango - !!x11-libs/cairo[qt4] - ) - gles2? ( media-libs/mesa[gles2] ) - jpeg? ( virtual/jpeg:0 ) - libinput? ( - dev-libs/libinput:= - x11-libs/libxkbcommon - ) - png? ( media-libs/libpng:0= ) - tslib? ( x11-libs/tslib ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) - udev? ( virtual/libudev:= ) - xcb? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXi-1.7.4 - x11-libs/libXrender - >=x11-libs/libxcb-1.10:=[xkb] - >=x11-libs/libxkbcommon-0.4.1[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) -" - -PATCHES=( - "${FILESDIR}/${P}-crash.patch" # bug 574636 -) - -QT5_TARGET_SUBDIRS=( - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts - src/plugins/platformthemes -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl - eglfs - evdev - evdev:mtdev: - :fontconfig - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2::OPENGL_ES - gles2:opengles2:OPENGL_ES_2 - gtkstyle:gtkstyle: - gtkstyle:gtk2:STYLE_GTK - !:no-gui: - :system-harfbuzz:HARFBUZZ - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon-evdev: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib - udev:libudev: - xcb:xcb: - xcb:xcb-glx: - xcb:xcb-plugin: - xcb:xcb-render: - xcb:xcb-sm: - xcb:xcb-xlib: - xcb:xinput2: - xcb::XKB -) - -src_prepare() { - # egl_x11 is activated when both egl and xcb are enabled - use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) - - # avoid automagic dep on qtdbus - use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ - src/platformsupport/platformsupport.pro || die - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - # avoid automagic dep on qtnetwork - use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ - src/plugins/generic/generic.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usex dbus -dbus-linked '') - $(qt_use egl) - $(qt_use eglfs) - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usex gif '' -no-gif) - $(qt_use gtkstyle) - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - $(qt_use libinput xkbcommon-evdev) - -opengl $(usex gles2 es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon-x11 system) - $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender) - ) - qt5-build_src_configure -} |