commit: dea72564ede66a45dd653a392a9f73f9fb637388 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Thu Mar 26 02:53:02 2015 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Thu Mar 26 02:53:02 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dea72564
[dev-qt/qtgui] Remove patches already applied upstream. Package-Manager: portage-2.2.18 ...4.8.5-cleanlooks-floating-point-exception.patch | 38 ------------------- ...gui-4.8.5-dont-crash-on-broken-GIF-images.patch | 43 ---------------------- dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 ---------------------- dev-qt/qtgui/qtgui-5.4.9999.ebuild | 2 - 4 files changed, 126 deletions(-) diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch b/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch deleted file mode 100644 index a54efef..0000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0db65e148dcb4d5e5b98475f207d41a287c401a1 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Wed, 28 May 2014 00:22:55 -0400 -Subject: [PATCH] Cleanlooks style: Fix floating point exception - -In QCleanlooksStyle::drawControl, if indeterminate == true and -rect.width() == 4, we will end up with slideWidth of zero, and -take a mod by zero when calculating the value of step. - -This causes a crash in Quassel 0.10; see -https://bugs.gentoo.org/show_bug.cgi?id=507124 - -Instead, calculate slideWidth based on max(width, minWidth) where -minWidth was already set as 4, ensuring that slideWidth >= 2. - -Change-Id: I6678789105e359fa26c99409f449cad0ba3bd0ae -(cherry picked from qtstyleplugins/8ff2ac6035fb1d01f5c0054ba14afb949410e3a7) -Reviewed-by: Giuseppe D'Angelo <[email protected]> ---- - src/gui/styles/qcleanlooksstyle.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp -index 504734a..3f665ca 100644 ---- a/src/gui/styles/qcleanlooksstyle.cpp -+++ b/src/gui/styles/qcleanlooksstyle.cpp -@@ -1773,7 +1773,7 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o - } - } else { - Q_D(const QCleanlooksStyle); -- int slideWidth = ((rect.width() - 4) * 2) / 3; -+ int slideWidth = (qMax(rect.width() - 4, minWidth) * 2) / 3; - int step = ((d->animateStep * slideWidth) / d->animationFps) % slideWidth; - if ((((d->animateStep * slideWidth) / d->animationFps) % (2 * slideWidth)) >= slideWidth) - step = slideWidth - step; --- -2.0.0 - diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch b/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch deleted file mode 100644 index d800caf..0000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001 -From: Lars Knoll <[email protected]> -Date: Thu, 24 Apr 2014 15:33:27 +0200 -Subject: Don't crash on broken GIF images - -Broken GIF images could set invalid width and height -values inside the image, leading to Qt creating a null -QImage for it. In that case we need to abort decoding -the image and return an error. - -Initial patch by Rich Moore. - -Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 - -Task-number: QTBUG-38367 -Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a -Security-advisory: CVE-2014-0190 -Reviewed-by: Richard J. Moore <[email protected]> ---- - src/gui/image/qgifhandler.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp -index 3324f04..5199dd3 100644 ---- a/src/gui/image/qgifhandler.cpp -+++ b/src/gui/image/qgifhandler.cpp -@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, - memset(bits, 0, image->byteCount()); - } - -+ // Check if the previous attempt to create the image failed. If it -+ // did then the image is broken and we should give up. -+ if (image->isNull()) { -+ state = Error; -+ return -1; -+ } -+ - disposePrevious(image); - disposed = false; - --- -1.9.3 - diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch deleted file mode 100644 index 35c4538..0000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001 -From: "Richard J. Moore" <[email protected]> -Date: Sat, 21 Feb 2015 17:43:21 +0000 -Subject: [PATCH] Fix a division by zero when processing malformed BMP files. - -This fixes a division by 0 when processing a maliciously crafted BMP -file. No impact beyond DoS. - -Task-number: QTBUG-44547 -Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 -Reviewed-by: Thiago Macieira <[email protected]> -Reviewed-by: Oswald Buddenhagen <[email protected]> ---- - src/gui/image/qbmphandler.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp -index 21c1a2f..df66499 100644 ---- a/src/gui/image/qbmphandler.cpp -+++ b/src/gui/image/qbmphandler.cpp -@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - alpha_shift = calc_shift(alpha_mask); -+ if (((alpha_mask >> alpha_shift) + 1) == 0) -+ return false; - alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; --- -2.0.5 \ No newline at end of file diff --git a/dev-qt/qtgui/qtgui-5.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.4.9999.ebuild index 9184e84..3b2ba21 100644 --- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild @@ -69,8 +69,6 @@ PDEPEND=" ibus? ( app-i18n/ibus ) " -PATCHES=( "${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch" ) - QT5_TARGET_SUBDIRS=( src/gui src/platformheaders
