summaryrefslogtreecommitdiff
path: root/dev-qt/qtgui
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtgui')
-rw-r--r--dev-qt/qtgui/Manifest11
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch40
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch38
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch43
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch63
-rw-r--r--dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch31
-rw-r--r--dev-qt/qtgui/qtgui-4.8.6-r4.ebuild174
-rw-r--r--dev-qt/qtgui/qtgui-4.8.7.ebuild2
-rw-r--r--dev-qt/qtgui/qtgui-5.6.2.ebuild174
9 files changed, 2 insertions, 574 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 1962ec6e0cc9..3a2eae524af2 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,22 +1,13 @@
AUX qtgui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
-AUX qtgui-4.8.5-CVE-2015-0295.patch 1619 SHA256 07bbb715bcb6d0a75f9b77c95b536ac8c8b8a3c3fcbe59470a19e56f0a193424 SHA512 42fca5fade432dabe987dced28147aa46104bb89fd8e05b365ce2f7178e8788f7fbbcd05b12eebed2b63c7ce694a125150d5598f9d1dedf1531376a492864ebc WHIRLPOOL d2c56391b598bfc93e7f01f63a7e24246acc0adfb79f1bcbfeb7f82628be7ce1753376c0c43c8ecd73e37569eced4286834406c2bd65dc9db621c2b70158b197
-AUX qtgui-4.8.5-cleanlooks-floating-point-exception.patch 1699 SHA256 739e0eb48e1797c7b2b67705378d1a1abe993b0930b1c1ca4092bb49165a73f5 SHA512 e404e0f6203bfe53859fb3f3043f11103e5fa4c99b16c5c1cd5310e61c2cf15d3ae1ae5425013e686eaaf5991bfe6db32701155afbcd26691fe88d82813e7b21 WHIRLPOOL 2843c7b3cd7c3d586044455545211f289d71fe66b556ac3189cf67356ac43b761f173e91093c422f24397d31d6725e6aef3c43c7cb3a4076312f6844d4377081
AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 SHA256 9c0f263d4ebfefa1ee892badaed5a3640449863f0113884c9e1b19ba9ec5f324 SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14 WHIRLPOOL 0fb982a19e7a0acc5110aea534f8bab3509aaabe8a74ffa58f6b2d8f35a0eceb4ec9224d2acdcf03fc5291f065c89c860d10a6371c3022b7740f7416b9c5befa
-AUX qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch 1440 SHA256 f76ec92367e32cbff23b7fd5064ca7da4fa1146f458630b8897862072cbca554 SHA512 ce1a06dbb52f200b21621a4b7febbd2938d9fb2fa9117c7e1fd2e24283784d645b36bb79ebf411f07ecff774f8c4cde1fa5d27956e4f95f28e0181e5953817b3 WHIRLPOOL a4ee9986ab5df6a6c85282b7367afb2f1708b1a1f8b52e940fe09669bf2e9c6db0fd2cb1fe0b98df9a95a22ad2a6f35f7901d1521ea7acb798327716f53a3817
AUX qtgui-4.8.5-qclipboard-delay.patch 1135 SHA256 7119cdc3450e1e36e01ce3273c5131b89c6e4a03f08652f5fa4eb0919d3b4bd0 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 WHIRLPOOL a45f6cfda0fd6f137c091eb82039900ac6f39d2b277ab9125b74e0828e2bb809561f1ef11328af1c5c1c20f5ca06e39e66881219c6101b1134126ca482d2aac9
-AUX qtgui-4.8.6-CVE-2015-1858.patch 2849 SHA256 bf7b77a1b311d2b0f647c4efb72cf42edb66f3085750784388fc7ffaf6a73fb0 SHA512 b7be8cf6bc9706df4f491fb5134a76ade03e1fd1d127d5d9bf228a787ee0f32496da04c937a1d44adcb698eadfe969f0026d626e9c5d9ec623e24541184b8246 WHIRLPOOL 01da12595a31eb323d5c96d85b8d3315a17929f916661eda209f5e2d13b9f7c187423d2620fedac33856ca132a5ac66d22ffb52bc437490ebe55c6d8a4366cb1
-AUX qtgui-4.8.6-CVE-2015-1860.patch 1009 SHA256 4afd0b1ef272774dfa845c2dc1340ce7d468f159646e92d6669e9d8f38f14171 SHA512 e2da2a04ab4d1180f855571aa39356ed74d173e95e7c0561021709256c7cfc85d2b99fd485d724357a2947379de52fad4c9ac7d52c61dd04373b00494de58e15 WHIRLPOOL 821a7552963412cba0294bbe3a7c3d7604c09f466d3cb9b22c7eb10a359359fa32748ad5ae45f86972de7edb1cb676197e082bb715e08c9c0391bbc6ec8f78f0
AUX qtgui-5.7.1-qclipboard.patch 1791 SHA256 328342cbeb29fa245054765f9e9c51cbf51b0dccba3c9f6330bdc202ac55f008 SHA512 c765e7f1cf2e10b4fa90b2c4e3a4a39c9001996d4837eb86c1d298531dd30fc1f6a215addfd1bec88526451d7b2ff3ba8a53a330776c94851e79b1964336759c WHIRLPOOL 7b977885bc5fcfe2ba0b1f66531a016fec839c2e9f622ac5f63583c4576229cbaa64ef9b97397362e4d1fedb722d8fa7c87363cba533e523b3ef91058c0ba54b
AUX qtgui-5.7.1-x32.patch 1161 SHA256 2d15bef6ec2aedb36a952778fb9266c74a269cc5cfcf4b982004c2ca8590d4e6 SHA512 61f6cc40c2897e17c0a71cb1d79bf8e6c69cbacf6409ae0d96f485584bd6a930484ecff709c208ca78335418e022c68151d096505f5db2179cb6c4c8b065c116 WHIRLPOOL 12e09f5ad61375ac58cb579b436ba194d109e7a567860ecd15e92ecf4efbae75a72e01b67264b77533444ba34421f44335812014497cf57c1e9570b0766c867a
-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.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
-EBUILD qtgui-4.8.6-r4.ebuild 6074 SHA256 b5e2b8e1b50bc04d6eb7fbae4ce01dab4da4834ecd59a4027da68b61eba07db1 SHA512 7d1784458f63e2a0f38b80745d62af185049771d3e19e5dc4cb432882dd9ed3252326feb866dd75adf2756ce704d5b977f7f5cd9ca8d408eca227611556cad0a WHIRLPOOL 8f46a3f53fc53863537971eed920516b77a93c3ff94d6840c745c6aae0f95c26503bfd5f2f924a8ef11b9eecea9954ffbb5aa6e0212bebe3f8a56a6018d9885a
-EBUILD qtgui-4.8.7.ebuild 5655 SHA256 64741789904b335973a3bfe8db7091d0f977f5146dc33f28a36cb0dff677d56b SHA512 8d642f38263bb2902a183f78142919226f9cf3cc8009f1c4166f7c194adee4b1db2b7ee6e212f97f16aa8696f046cbb5c1c4b4c17638e7311e57cff636327427 WHIRLPOOL d8e504e12a6c3a39e4ffad26836dedeb2c9172def488063f6098b1a06b2b685587f0856f9cb32231cc47a2e10004ed8218231f6f3248599e7dbbd942a8d33342
-EBUILD qtgui-5.6.2.ebuild 3698 SHA256 3da8026e05b1053832d8ae562ecdb133a4dc7eb2d2291152e10838c139ab92a7 SHA512 7e89c312327ec880b1e080cc4e5a983faeb789c7625cc7ae3f16204b7309eb4386aa21b8d5c8710edd057b9ea290a4d8642d1551ae9e297dc7fdef7997e43fdc WHIRLPOOL 671896eb07c8f549ef765e5d51850deef8db1ebb18239c43fec13285a9e4d40ad34ba4164ce63db079e1a1e179a6d8495390018f6ae5b05add6decb8ad4a48f0
+EBUILD qtgui-4.8.7.ebuild 5656 SHA256 9653058a9f8f51c35d7c9960dfa9d03054e8f516302610d9f5b3b03707a380bf SHA512 2298d7ef9176166dd21f24ce690c61d7ae4c0d5016908a9c4119f1c8f66a51d143cddf8f6b5bb4232815f5e2bf842abe0de72432bd487629b3cb6ca938d7cee7 WHIRLPOOL 713db58d89aea0422b82e8ec1bc15f858e087c31d663ae69eacdcf411811692180bbec3adc8be2f110f2b2643f29e13854d359752d353b989ac0025b2f95f5ba
EBUILD qtgui-5.7.1-r1.ebuild 3792 SHA256 861ddc0cc5ce6c32f3e22c116caed60d9844062d1709af38eb3f4b89320afcf5 SHA512 f8d57932f30b17ea72cdebe7aa268e022df15a29bc3c3e2789f8c68b54a29e89d8c9b9a489cd6d5492e88dbc6f35cd9872d02ce920ef7b8d17878bfbfee10a7e WHIRLPOOL 06b4afc767fe25998e201ebf0042834b03c4d2cb3f652b70123829a5a32e9e6efaf0959bee251d0e69c8dcf0f48f75c18a91900a37f0c49c4c36183d36deb788
EBUILD qtgui-5.9.2.ebuild 3501 SHA256 ff7bd94743b73637445e074862560f7ed4684a0f17df5ee8b2bf09274749fe5d SHA512 9c770692dab57be3a295ef287885928ae337ddc4aa0976147be3b808e9b2b8ff1700de8a2f2250eb503e51d4f0aafed64073e7cb035540fae0a836e3294b2b8f WHIRLPOOL f64f079c973da6ec35e24974ab273b389b08174a22e8463c2636333294773dd524eefd3e6cefd11c010269435d8627017d06dc066e118d75aca269424266e2d8
MISC ChangeLog 8734 SHA256 849ee0697b95cbd927ac9e868d036e89f630a5715eafe47449f2582f5cf762f7 SHA512 53d70cf59fd8c58726d6dd0f8386167b45712c4a5ccc04464789734f2f825c2bf3a7f1f6b4a87141edf9f05224a58a5d5a79a4884bbcca8470da304a3c78740d WHIRLPOOL ee681261ad745adfd0e81575683d405af66b17a773d583c65d568b6c1fb797d69615aa28f97c96ff94587df663903861556bc74ab0829b4d6a870653ca86a950
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
deleted file mode 100644
index 3ac87d8dc369..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-CVE-2015-0295.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e50aa2252cdd5cb53eef7d8c4503c7edff634f68 Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore" <rich@kde.org>
-Date: Tue, 24 Feb 2015 19:02:35 +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.
-
-Backport of 661f6bfd032dacc62841037732816a583640e187
-
-Task-number: QTBUG-44547
-Change-Id: I43f06e752b11cb50669101460902a82b885ae618
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/gui/image/qbmphandler.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index b22e842..30fa9e0 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -319,10 +319,16 @@ 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);
- } 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/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 a54efef0d78b..000000000000
--- 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 <tetromino@gentoo.org>
-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 <giuseppe.dangelo@kdab.com>
----
- 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 d800caf97421..000000000000
--- 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 <lars.knoll@digia.com>
-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 <rich@kde.org>
----
- 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-4.8.6-CVE-2015-1858.patch b/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch
deleted file mode 100644
index c1aac444a644..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1858.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3e55cd6dc467303a3c35312e9fcb255c2c048b32 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 13:34:01 +0100
-Subject: Fixes crash in bmp and ico image decoding
-
-Fuzzing test revealed that for certain malformed bmp and ico files,
-the handler would segfault.
-
-Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
-(cherry picked from qtbase/2adbbae5432aa9d8cc41c6fcf55c2e310d2d4078)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/gui/image/qbmphandler.cpp | 13 +++++++------
- src/plugins/imageformats/ico/qicohandler.cpp | 2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index 30fa9e0..17a880b 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -478,12 +478,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
- p = data + (h-y-1)*bpl;
- break;
- case 2: // delta (jump)
-- // Protection
-- if ((uint)x >= (uint)w)
-- x = w-1;
-- if ((uint)y >= (uint)h)
-- y = h-1;
--
- {
- quint8 tmp;
- d->getChar((char *)&tmp);
-@@ -491,6 +485,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
- d->getChar((char *)&tmp);
- y += tmp;
- }
-+
-+ // Protection
-+ if ((uint)x >= (uint)w)
-+ x = w-1;
-+ if ((uint)y >= (uint)h)
-+ y = h-1;
-+
- p = data + (h-y-1)*bpl + x;
- break;
- default: // absolute mode
-diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
-index 1a88605..3c34765 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -571,7 +571,7 @@ QImage ICOReader::iconAt(int index)
- QImage::Format format = QImage::Format_ARGB32;
- if (icoAttrib.nbits == 24)
- format = QImage::Format_RGB32;
-- else if (icoAttrib.ncolors == 2)
-+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
- format = QImage::Format_Mono;
- else if (icoAttrib.ncolors > 0)
- format = QImage::Format_Indexed8;
---
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch
deleted file mode 100644
index d881db8d5b86..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.6-CVE-2015-1860.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a1cf194c54be57d6ab55dfd26b9562a60532208e Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 09:00:41 +0100
-Subject: Fixes crash in gif image decoder
-
-Fuzzing test revealed that for certain malformed gif files,
-qgifhandler would segfault.
-
-Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
-(cherry picked from qtbase/ea2c5417fcd374302f5019e67f72af5facbd29f6)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/gui/image/qgifhandler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 5199dd3..49aa2a6 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -944,6 +944,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
-
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+ if (out_of_bounds)
-+ return;
- int my;
- switch (interlace) {
- case 0: // Non-interlaced
---
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
deleted file mode 100644
index 2eccb9dcdeb4..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 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} == live ]]; then
- KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
- 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}] )
- tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] )
- !<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
- !aqua? (
- >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
- xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] )
- )
-"
-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-cleanlooks-floating-point-exception.patch" # bug 507124
- "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
- "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
- "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
- "${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
- "${FILESDIR}/${PN}-4.8.6-CVE-2015-1858.patch" # bug 546174 - also covers CVE-2015-1859
- "${FILESDIR}/${PN}-4.8.6-CVE-2015-1860.patch" # bug 546174
-)
-
-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/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index dda69ac8593d..cb2eede7312f 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -8,7 +8,7 @@ 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"
+ 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"
diff --git a/dev-qt/qtgui/qtgui-5.6.2.ebuild b/dev-qt/qtgui/qtgui-5.6.2.ebuild
deleted file mode 100644
index da1e04dd3df2..000000000000
--- a/dev-qt/qtgui/qtgui-5.6.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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: linuxfb
-
-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.6.1:2
- >=media-libs/harfbuzz-1.0.6:=
- >=sys-libs/zlib-1.2.5
- virtual/opengl
- dbus? ( ~dev-qt/qtdbus-${PV} )
- egl? ( media-libs/mesa[egl] )
- eglfs? (
- media-libs/mesa[gbm]
- x11-libs/libdrm
- )
- 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 )
-"
-
-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
- eglfs:eglfs_egldevice:
- eglfs:eglfs_gbm:
- 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
- xcb:xrender
-)
-
-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)
- $(usex eglfs '-gbm -kms' '')
- $(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)
- $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
- )
- qt5-build_src_configure
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 19:57:48 +0000