pesa 14/07/03 23:20:26
Added: qtgui-4.8.5-disable-gtk-theme-check.patch
qtgui-4.8.5-qclipboard-delay.patch
qtgui-4.8.5-cleanlooks-floating-point-exception.patch
Log:
Apply various patches wrt bugs #491226, #503880, #507124, and #514968.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.1
dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch?rev=1.1&content-type=text/plain
Index: qtgui-4.8.5-disable-gtk-theme-check.patch
===================================================================
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);
1.1 dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch?rev=1.1&content-type=text/plain
Index: qtgui-4.8.5-qclipboard-delay.patch
===================================================================
>From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <[email protected]>
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
1.1
dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch?rev=1.1&content-type=text/plain
Index: qtgui-4.8.5-cleanlooks-floating-point-exception.patch
===================================================================
>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
