* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2014-06-18 14:14 Davide Pesavento
0 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2014-06-18 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 54d151352e8c117dfb251b174ae35699e7ad4236
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 18 14:13:35 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 18 14:13:35 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54d15135
[dev-qt/qtgui:4] Backport patch to fix FPE crash in cleanlooks style.
Thanks to Alexandre Rostovtsev in bug #507124.
Package-Manager: portage-2.2.10
---
...4.8.6-cleanlooks-floating-point-exception.patch | 38 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-4.8.6.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch b/dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch
new file mode 100644
index 0000000..a54efef
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch
@@ -0,0 +1,38 @@
+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/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index 9adb751..432fe08 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -70,6 +70,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
+ "${FILESDIR}/${PN}-4.8.6-cleanlooks-floating-point-exception.patch" # bug 507124
"${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2022-06-15 17:20 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-06-15 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 599928def81f1bdf6a832e72950244e14f84cc8a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 11:52:55 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 18:21:17 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=599928de
dev-qt/qtgui: Cleanup and make use of gentoo-patchset
Ends the which-hunt.
Bug: https://bugs.gentoo.org/828100
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtgui/Manifest | 1 +
dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 -------------
.../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ----------------------
dev-qt/qtgui/qtgui-5.15.4.9999.ebuild | 5 ---
4 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
new file mode 100644
index 00000000..1e41118d
--- /dev/null
+++ b/dev-qt/qtgui/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
deleted file mode 100644
index 41814c06..00000000
--- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 Mar 2019 21:37:52 -0500
-Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
-
-Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
-and the compiler is running on a CPU which does not support AVX2.
-
-Bug: https://bugs.gentoo.org/672946
----
- mkspecs/common/gcc-base.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index c2669e4833..44aa96af38 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
-
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
-
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
- QMAKE_AR_LTCG = gcc-ar cqs
---
-2.21.0.rc1
-
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc3..00000000
--- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
-
- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
-
-- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
-- IsDebugAndRelease)
-+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+ set(IsDebugAndRelease FALSE)
-+ set (list_var ${ARGN})
-+ list(LENGTH list_var num_extra_arg)
-+ if (${num_extra_arg} GREATER 0)
-+ list(GET list_var 0 IsDebugAndRelease)
-+ endif()
-+
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild
index e595b832..9efb7138 100644
--- a/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild
@@ -126,11 +126,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
-PATCHES=(
- "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2019-11-12 22:21 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-11-12 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 1c7312e8264050c2c4e4c4feb7522339e66f3743
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 17:13:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 19:20:26 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1c7312e8
dev-qt/qtgui: Fix build with -xcb and -no-libinput
Bug: https://bugs.gentoo.org/699110
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch | 34 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild | 2 ++
2 files changed, 36 insertions(+)
diff --git a/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
new file mode 100644
index 00000000..6f63a637
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.0_beta3-no-xcb-no-xkbcommon.patch
@@ -0,0 +1,34 @@
+From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 6 Nov 2019 00:54:57 +0200
+Subject: [PATCH] Fix build with -xcb and -no-libinput
+
+Since a34e81ab [1], 'xkbcommon_support' is under
+'src/platformsupport/input', and will not be defined when building
+with -no-libinput, and as such, 'xkbcommon_support-private' added in
+'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
+
+1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
+
+Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
+Gentoo-bug: https://bugs.gentoo.org/699110
+Suggested-by: Petr Zima <zima@matfyz.cz>
+---
+ src/platformsupport/platformsupport.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
+index 6d4f1b93bd1..877665ff06b 100644
+--- a/src/platformsupport/platformsupport.pro
++++ b/src/platformsupport/platformsupport.pro
+@@ -11,7 +11,7 @@ SUBDIRS = \
+ qtConfig(freetype)|darwin|win32: \
+ SUBDIRS += fontdatabases
+
+-qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
++qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
+ SUBDIRS += input
+ input.depends += devicediscovery
+ }
+--
+2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild b/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
index 480c023a..df4df879 100644
--- a/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.0_beta3.ebuild
@@ -124,6 +124,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
+PATCHES=( "${FILESDIR}/${P}-no-xcb-no-xkbcommon.patch" )
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2015-03-26 2:59 Davide Pesavento
0 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2015-03-26 2:59 UTC (permalink / raw
To: gentoo-commits
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 <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 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 <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-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" <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/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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2015-03-16 16:28 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2015-03-16 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 04813ef4c2153cb4e91af61b48561f15909527c8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 16:28:02 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 16:28:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=04813ef4
[dev-qt/qtgui] Backport patch from upstream to solve CVE-2015-0295 wrt bug #541972.
Package-Manager: portage-2.2.17
dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch | 43 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-5.4.9999.ebuild | 2 +
2 files changed, 45 insertions(+)
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
new file mode 100644
index 0000000..35c4538
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
@@ -0,0 +1,43 @@
+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/qtgui-5.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
index 2f62794..0618208 100644
--- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild
@@ -69,6 +69,8 @@ PDEPEND="
ibus? ( app-i18n/ibus )
"
+PATCHES=( "${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch" )
+
QT5_TARGET_SUBDIRS=(
src/gui
src/platformheaders
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2014-07-04 0:30 Davide Pesavento
0 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2014-07-04 0:30 UTC (permalink / raw
To: gentoo-commits
commit: 801f33f738161895b64a04d2c28fc5223d59e526
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 4 00:29:29 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 4 00:29:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=801f33f7
[dev-qt/qtgui:4] Sync with portage.
Package-Manager: portage-2.2.10
---
dev-qt/qtgui/Manifest | 1 +
....8.5-cleanlooks-floating-point-exception.patch} | 0
...h => qtgui-4.8.5-disable-gtk-theme-check.patch} | 0
.../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-4.8.6.ebuild | 7 +++--
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 4 ++-
6 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 471b49c..cf2b674 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,2 +1,3 @@
DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
DIST qtbase-opensource-src-5.3.1.tar.xz 46679724 SHA256 7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569 SHA512 b867d8c2f37007770d8105fea1820f8a2b1c2006474c28fbdc29fb7f7dcf9eee0960752805c833639eb7b0fd92c670f552bbc4a7064d0daf5bbac875d081500a WHIRLPOOL 997415bdae97c854916c055e2b5b8af47bc406a546aae24afa3e0fabcc53a3999efcfae7e17cf12dc1b87a79f29af5ae7069250fe6be6d9308f7e2df6001da27
+DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch b/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
similarity index 100%
rename from dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch
rename to dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
similarity index 100%
rename from dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
rename to dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
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
new file mode 100644
index 0000000..d46f8c5
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
@@ -0,0 +1,33 @@
+From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@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/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index 432fe08..2adb6dc 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -7,6 +7,7 @@ EAPI=5
inherit eutils qt4-build-multilib
DESCRIPTION="The GUI module for the Qt toolkit"
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
@@ -68,10 +69,12 @@ PDEPEND="
"
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.6-cleanlooks-floating-point-exception.patch" # bug 507124
- "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
+ "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
)
QT4_TARGET_DIRECTORIES="
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index a97b855..6a3641e 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -7,6 +7,7 @@ EAPI=5
inherit eutils qt4-build-multilib
DESCRIPTION="The GUI module for the Qt toolkit"
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
@@ -68,8 +69,9 @@ PDEPEND="
"
PATCHES=(
+ "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
- "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
+ "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
)
QT4_TARGET_DIRECTORIES="
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/
@ 2014-05-28 0:31 Davide Pesavento
0 siblings, 0 replies; 7+ messages in thread
From: Davide Pesavento @ 2014-05-28 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 19427e1b8a1f3dbe17adf54f4f555a98554816cf
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 23:52:29 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 23:52:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=19427e1b
[dev-qt/qtgui:4] Apply patch from Fedora to fix bug 491226.
Package-Manager: portage-2.2.10
---
.../qtgui-4.8.6-disable-gtk-theme-check.patch | 22 ++++++++++++++++++++++
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 18 ++++--------------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
new file mode 100644
index 0000000..9a9f773
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch
@@ -0,0 +1,22 @@
+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/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 044dc03..5dadd5d 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -67,6 +67,7 @@ PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
+ "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226
)
QT4_TARGET_DIRECTORIES="
@@ -128,7 +129,8 @@ src_prepare() {
}
src_configure() {
- myconf="$(qt_use accessibility)
+ myconf+="
+ $(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
$(qt_use mng libmng system)
@@ -139,9 +141,7 @@ src_configure() {
$(qt_use qt3support)
$(qt_use gtkstyle)
$(qt_use xinerama)
- $(qt_use xv xvideo)"
-
- myconf+="
+ $(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
@@ -171,16 +171,6 @@ src_install() {
newicon tools/qtconfig/images/appicon.png qtconfig.png
make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
fi
-
- # bug 388551
- if use gtkstyle; then
- local tempfile=${T}/${PN}4.sh
- cat <<-EOF > "${tempfile}"
- export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
- EOF
- insinto /etc/profile.d
- doins "${tempfile}"
- fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-06-15 17:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-18 14:14 [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2022-06-15 17:20 Andreas Sturmlechner
2019-11-12 22:21 Andreas Sturmlechner
2015-03-26 2:59 Davide Pesavento
2015-03-16 16:28 Michael Palimaka
2014-07-04 0:30 Davide Pesavento
2014-05-28 0:31 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox