diff options
Diffstat (limited to 'dev-qt/qtgui')
| -rw-r--r-- | dev-qt/qtgui/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-qt/qtgui/Manifest | 31 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch | 62 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch | 30 | ||||
| -rw-r--r-- | dev-qt/qtgui/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.4.2.ebuild (renamed from dev-qt/qtgui/qtgui-5.4.1-r2.ebuild) | 50 |
7 files changed, 47 insertions, 183 deletions
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog index 6c4ca0980f9c..d865657c8e81 100644 --- a/dev-qt/qtgui/ChangeLog +++ b/dev-qt/qtgui/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-qt/qtgui # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.89 2015/05/30 10:52:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.90 2015/06/17 15:21:03 pesa Exp $ + +*qtgui-5.4.2 (17 Jun 2015) + + 17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtgui-5.4.2.ebuild, + -files/qtgui-5.4.1-CVE-2015-0295.patch, + -files/qtgui-5.4.1-CVE-2015-1858-1859.patch, + -files/qtgui-5.4.1-CVE-2015-1860.patch, -qtgui-5.4.1-r2.ebuild, metadata.xml: + Version bump. 30 May 2015; Markus Meier <maekke@gentoo.org> qtgui-4.8.6-r4.ebuild: arm stable, bug #530238 diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 775c50bbe02a..9838304aa7d9 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -11,24 +11,33 @@ AUX qtgui-4.8.5-libjpeg-9.patch 2852 SHA256 4b692de233f1cd9bf13a48166610af9f7b12 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.4.1-CVE-2015-0295.patch 1828 SHA256 fba8ea41b0252174c42e4403f9be8b6e275a6a312228b5b37e336242be618e15 SHA512 6101c81d9931af24d48ef0b49ee38c2c912fc28401096b981438eab1d9e16f4bc04ed4153e5a5b9cc10187b3d230ba99c0452b08e90592487d8c7c13b2459119 WHIRLPOOL 3b0e66184e83dcda0711703af500ea8cd6437e5d668a559fc7524d006e1d50d02cb9955123f8ce1da6b2306ca448e614d364c50cbe5d8b771b2aaa4daccbb509 -AUX qtgui-5.4.1-CVE-2015-1858-1859.patch 2782 SHA256 0eebcb1bacb5de3bf249feb77ce95453066a3a958e1673fe3bb1e7c9fb6d862a SHA512 580d53eeaf489d51cc09d26a2bb5596562e1da4a1064909613adb4091d22fdd9814be6bbb860098be1ddac651e827283a59605c0d668d352ba0052cab7f48bd4 WHIRLPOOL dc3c76da488fdd7efc396126b5cbad0f4e63c2a3ba6144e3d11fd770ee8d6b887b2ba388dfe1b82b8fa2f1568ea5a3854b50c49da2f0439f141d7d622be4560c -AUX qtgui-5.4.1-CVE-2015-1860.patch 940 SHA256 a0664c41b847cb00eb3f87feb89a105b70f65eb1719c58cb72c98e0459b89dcd SHA512 2731430202fad4ff6b117cc0188e5c448ce8cc6f8305b81209a8171fe1f2a3b1c96c935ebc50adaef4a815ead9498cfa4eaaf05083a2271619eb77c0e8aaa35a WHIRLPOOL 4d1cb5a92b33b82d4d03cf31492cdeaa80f5899d5e15cc36bc406ab96971c6e54ce1599807d974ab0d3f5848566073b03e059820bba2bf4ee703d5906f6435ca DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357 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.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340 +DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58 EBUILD qtgui-4.8.5-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256 EBUILD qtgui-4.8.6-r4.ebuild 6264 SHA256 697da660cf27666eeb2b77c9f979751dd7282ee7edcc24dd37ed27259a4aa6d7 SHA512 1c7e5d9a2614ad716989ff8917e216d2ebd7b76a0e717d8f066c826f7b69388d8b5124c7cf279154eb8131b2ef02ad9ad43f065cc334e9de374c5d15c5c64874 WHIRLPOOL cec58713c816734e625e1be0d97dfdcf09cc8c825a8c96f346e43d81e3aa9b3a534d9b57b665d5070d301c11f54e0db475246a456084e0329c42c35fe4ae8d66 EBUILD qtgui-4.8.7.ebuild 5863 SHA256 9206283348fefbf5539959d2920a31a4d248780c194c86f4f5c8dbeea3b7a3d6 SHA512 8ad343509819f41d4dccf45c3bee06c4b9796f148756b77afeaa5f7aa6403e8ff5c193dce2960f8d5c3d95a1f467b27fbd3e99b74211f3701a2652790752a4f0 WHIRLPOOL 4b77a12dbe556cd78d2d23be411b14fd2ee200bbc2109a3f968b10c3d2f749030a005786d3901929941ace373db2904565c14e890dc37bc5aa7d63c7e9e1b217 -EBUILD qtgui-5.4.1-r2.ebuild 3778 SHA256 41a5e4258e21ab636ad606536139f147dd09b096100add130be726d1e0a0b9ab SHA512 3dee01ac29eb3e7ab3a29629ff1c0b6eb442aba126e070af8c3ec2f6cad98603dace5a12e3e5d0f307090be9075909a8588612db942d2a90765f41a463ae64b6 WHIRLPOOL 168c9f7d1bbb12be82d2a3a6131f9ac2a3f71fe3ee9449c130fc83d043331d54959271914f87eccb8ce85c6c123b4b59e51823c0757fe8488af590452880b371 -MISC ChangeLog 45028 SHA256 ab5cf464b3f21e8049728dfc0c2f46e1b03f2e9c8eea4e004f02e32cd2ecd6d1 SHA512 e4313c903aab263f6c3621afe80ec0ac7e09f74943efc948abbb24ba79e6eb5e4099b903816a76c9ade15f3235f0667f8b121f51cce1b16f411bf727a81e8cd1 WHIRLPOOL abcd9cffca37f8a5deb4b1efb5a88bebb9a6cdcc9b10726ccdd94d594363b7c71310785d2b86896d174ff5493fe8a1353210e8327e6d76328dc8ebe1d7510850 -MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149 +EBUILD qtgui-5.4.2.ebuild 3383 SHA256 0b9b890e1b341c0f459676aff2f262f804e7dcaa680543e7943dd71a43063909 SHA512 5edae517ba6a83d4141196212e173c7d3a933e1f0ee52f10aa56e2667676451a19d938026b2f3c1d5c4b0f69f0fb2b7fae03c82743be419cc6604dc9d3ea53b5 WHIRLPOOL 4e2428b4813c883581e969836f21b4f9797302e413b5cdd311b0fc6c7c3f34d0ce7d9e51cea9476cc980c34683654ba5256972f9edb06de8dca0a19f9a254a27 +MISC ChangeLog 45311 SHA256 f67c793ca61e2d0c6292e021080cc61de7c7340c84fb73b5101c98d4423ff9f1 SHA512 6c5eac753ddd7e01fba27cbd595bf2b7e9707e6252f99b578a557a13b6cf9c265e8c25d733dd3e866b85732b6ab4642f2344f5121414326f611ffb99914ae309 WHIRLPOOL ecf7ac62a0bb3e1c2e2bf66ed2269b530ae68f060b8272c905901b668f9c7dd837e01b95540e0ca1448dd465f14c8104620d30661423741fc461b4e594c29d44 +MISC metadata.xml 1423 SHA256 e4b1b2dd0f615c80e227a4c0d85cc633006264906ec24ede10d4580644029acc SHA512 e86a3f92c6df0d0de971ba70cd84a8751ec7b5df07eaaa46ac87b87f0292c334712e2263b06a5daaddfebb4bb07aabf7b85661ec5a6ed17c07ade5d424dc5181 WHIRLPOOL af2a48984b17c492b6c7cfe1d1021064457a80ba787a2942d207654ad73cb24c20f0164df184aec2852e9b58bfbb030d9380567f196f59061d1dbbedf98dc432 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iEYEAREIAAYFAlVplmAACgkQkKaRLQcq0GINRgCcC1UMtvPiFcXQyTbfNMsGTLxW -WfoAn3P1M7Poj0wrfs9wke2Ahs/gHc5+ -=noKt +iQJ8BAEBCABmBQJVgZBgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9w5YQAKFF6dnHq+0ySiFm2u3oAU8c +ABXmhcEAt7gcl3s5a5/6xL1HbSuW0dLeK5cgr3ETvx74QomV9fXyV1sSHgcgb2yt +CixWyrE29v96o+AZUfcMCVIO3jWbJmHW/BB0HVrw9ESeq5NRIEkzyt74WcKfntKq +IjoLA7ILcv7vJxVsGxRbm8Fc/+IZGw1LNWuAI9YCVtN0xxBquIZUrkOMMYqAMO2U +dYSjkbPw/uSzbIB3YBxvgf5KT5tZUwXIsUtHQsbc/WEKobpDduZXGQDAr/uZ95C0 +DwMTf+hneoCXcG7yRXDDS2srF3i0C6IuGy8K/E1aBMJGn74rElS+XjsXCs9fCucN +7SC4t2afvJmPx/vY8ueU3naWQuMPzN/bvnr6Cr1tFGFVirusd2wsOp8E9LDpLFZB +ckjP0WXgrUSkbS74dMBj6Ft6EPxoUjSP8kyOVzWsjwur6AdIxcDqrAJjmi33W38g +audSwkiM5S8U7lvIF7ujYn3tQ4jqKAq1lTWZpvlllcOUMZw0CSYBEqYk8FWCCXXE +A3CqnarwNjBRrJgglX4c4ML8NEJsxUQ1yOM+iAWhMxeOoP6By6wEVEBuxCsl7edT +etgy8fhnpF/BiUxolZjtdQtv1xNzwiN7uum5GfG1z7x84N1+HMmGRNr+no+xY/wM +0or307wd9l5ceYuMPInJ +=Py3N -----END PGP SIGNATURE----- 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 35c453873d6a..000000000000 --- 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" <rich@kde.org> -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 <thiago.macieira@intel.com> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> ---- - 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/files/qtgui-5.4.1-CVE-2015-1858-1859.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch deleted file mode 100644 index c0ea6c2ee76f..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe 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 -Reviewed-by: Lars Knoll <lars.knoll@digia.com> ---- - 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 df66499..8acc593 100644 ---- a/src/gui/image/qbmphandler.cpp -+++ b/src/gui/image/qbmphandler.cpp -@@ -484,12 +484,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); -@@ -497,6 +491,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 00de0c8..ec1654e 100644 ---- a/src/plugins/imageformats/ico/qicohandler.cpp -+++ b/src/plugins/imageformats/ico/qicohandler.cpp -@@ -567,7 +567,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-5.4.1-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch deleted file mode 100644 index 3b9daa56b66b..000000000000 --- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d3048a29797ee2d80d84bbda26bb3c954584f332 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 -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 03e46ab..8d8c4ae 100644 ---- a/src/gui/image/qgifhandler.cpp -+++ b/src/gui/image/qgifhandler.cpp -@@ -936,6 +936,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/metadata.xml b/dev-qt/qtgui/metadata.xml index 2800cc4a9dd8..ce6b0b5326d1 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -8,7 +8,7 @@ <flag name="evdev">Enable evdev input support</flag> <flag name="exceptions">Add support for exceptions - like catching them inside the event loop (recommended by upstream)</flag> - <flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag> + <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active GTK+ theme</flag> @@ -24,6 +24,6 @@ </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>http://qt-project.org/doc/</doc> + <doc>http://doc.qt.io/</doc> </upstream> </pkgmetadata> diff --git a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.4.2.ebuild index e6ea648c50cc..bc349afba193 100644 --- a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild +++ b/dev-qt/qtgui/qtgui-5.4.2.ebuild @@ -1,37 +1,33 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild,v 1.1 2015/05/16 18:51:53 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.2.ebuild,v 1.1 2015/06/17 15:21:03 pesa Exp $ EAPI=5 - QT5_MODULE="qtbase" - inherit qt5-build DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -if [[ ${QT5_BUILD_TYPE} == live ]]; then - KEYWORDS="~ppc64" -else +if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi # TODO: directfb, linuxfb, offscreen (auto-depends on X11) -IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" +IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb" REQUIRED_USE=" - egl? ( evdev opengl ) + egl? ( evdev ) eglfs? ( egl ) - gles2? ( opengl ) kms? ( egl gles2 ) " RDEPEND=" dev-libs/glib:2 - ~dev-qt/qtcore-${PV}[debug=] + ~dev-qt/qtcore-${PV} media-libs/fontconfig media-libs/freetype:2 - sys-libs/zlib + >=sys-libs/zlib-1.2.5 + virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( @@ -41,14 +37,13 @@ RDEPEND=" ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) - ibus? ( ~dev-qt/qtdbus-${PV}[debug=] ) + ibus? ( ~dev-qt/qtdbus-${PV} ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] virtual/libudev:= x11-libs/libdrm ) - opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( @@ -63,25 +58,20 @@ RDEPEND=" x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm - accessibility? ( ~dev-qt/qtdbus-${PV}[debug=] ) + accessibility? ( ~dev-qt/qtdbus-${PV} ) ) " DEPEND="${RDEPEND} evdev? ( sys-kernel/linux-headers ) - test? ( ~dev-qt/qtnetwork-${PV}[debug=] ) + test? ( ~dev-qt/qtnetwork-${PV} ) " PDEPEND=" ibus? ( app-i18n/ibus ) " -PATCHES=( - "${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch" - "${FILESDIR}/${PN}-5.4.1-CVE-2015-1858-1859.patch" - "${FILESDIR}/${PN}-5.4.1-CVE-2015-1860.patch" -) - QT5_TARGET_SUBDIRS=( src/gui + src/openglextensions src/platformheaders src/platformsupport src/plugins/generic @@ -109,7 +99,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: kms:kms: - opengl + :opengl png:png: png:system-png:IMAGEFORMAT_PNG !png:no-png: @@ -125,7 +115,6 @@ QT5_GENTOO_CONFIG=( ) pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) @@ -135,28 +124,21 @@ pkg_setup() { } src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - $(use accessibility && use xcb && echo -dbus-linked) - $(use ibus && echo -dbus-linked) + $(use accessibility && usex xcb -dbus-linked '') + $(usex ibus -dbus-linked '') $(qt_use egl) $(qt_use eglfs) $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(use gif || echo -no-gif) - ${gl} + $(usex gif '' -no-gif) $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use udev libudev) $(qt_use xcb xcb system) |