[arch-commits] Commit in qt/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Wed Aug 12 09:51:52 UTC 2009
Date: Wednesday, August 12, 2009 @ 05:51:51
Author: pierre
Revision: 49552
Merged revisions 49549 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/qt/trunk
........
r49549 | pierre | 2009-08-12 11:02:14 +0200 (Mi, 12 Aug 2009) | 1 line
upgpkg: qt 4.5.2-6
........
Added:
qt/repos/extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch
(from rev 49549, qt/trunk/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch)
Modified:
qt/repos/extra-i686/ (properties)
qt/repos/extra-i686/PKGBUILD
------------------------------------------------+
9e5fa633913ef952ca4ef5312fe396bcfc885321.patch | 92 +++++++++++++++++++++++
PKGBUILD | 15 ++-
2 files changed, 102 insertions(+), 5 deletions(-)
Property changes on: qt/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /qt/trunk:1-47873
+ /qt/trunk:1-49551
Copied: qt/repos/extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch (from rev 49549, qt/trunk/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch)
===================================================================
--- extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch (rev 0)
+++ extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch 2009-08-12 09:51:51 UTC (rev 49552)
@@ -0,0 +1,92 @@
+From 9e5fa633913ef952ca4ef5312fe396bcfc885321 Mon Sep 17 00:00:00 2001
+From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
+Date: Wed, 22 Jul 2009 17:12:17 +0200
+Subject: [PATCH] Revert "Added a check that X11 timestamp goes forward only."
+
+In some cases we might get an invalid timestamp that is far away in
+the future, so remembering it will break all consequent X calls that
+require a timestamp because it just contains junk (for example
+clipboard will stop working). This happens with XIM+SCIM pair -
+whenever we start input method and type something to the widget, we
+get a XKeyPress event with a commited string, however the 'serial' and
+'time' members of the XEvent structure are not initialized (according
+to valgrind) and contain junk.
+
+This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb.
+
+Reviewed-By: Brad
+---
+ src/gui/kernel/qapplication_x11.cpp | 35 +++++++++++++++--------------------
+ 1 files changed, 15 insertions(+), 20 deletions(-)
+
+diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
+index 163ceb6..abedfd6 100644
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
+@@ -3142,48 +3142,43 @@ int QApplication::x11ProcessEvent(XEvent* event)
+ #ifdef ALIEN_DEBUG
+ //qDebug() << "QApplication::x11ProcessEvent:" << event->type;
+ #endif
+- Time time = 0, userTime = 0;
+ switch (event->type) {
+ case ButtonPress:
+ pressed_window = event->xbutton.window;
+- userTime = event->xbutton.time;
++ X11->userTime = event->xbutton.time;
+ // fallthrough intended
+ case ButtonRelease:
+- time = event->xbutton.time;
++ X11->time = event->xbutton.time;
+ break;
+ case MotionNotify:
+- time = event->xmotion.time;
++ X11->time = event->xmotion.time;
+ break;
+ case XKeyPress:
+- userTime = event->xkey.time;
++ X11->userTime = event->xkey.time;
+ // fallthrough intended
+ case XKeyRelease:
+- time = event->xkey.time;
++ X11->time = event->xkey.time;
+ break;
+ case PropertyNotify:
+- time = event->xproperty.time;
++ X11->time = event->xproperty.time;
+ break;
+ case EnterNotify:
+ case LeaveNotify:
+- time = event->xcrossing.time;
++ X11->time = event->xcrossing.time;
+ break;
+ case SelectionClear:
+- time = event->xselectionclear.time;
++ X11->time = event->xselectionclear.time;
+ break;
+ default:
+-#ifndef QT_NO_XFIXES
+- if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
+- XFixesSelectionNotifyEvent *req =
+- reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
+- time = req->selection_timestamp;
+- }
+-#endif
+ break;
+ }
+- if (time > X11->time)
+- X11->time = time;
+- if (userTime > X11->userTime)
+- X11->userTime = userTime;
++#ifndef QT_NO_XFIXES
++ if (X11->use_xfixes && event->type == (X11->xfixes_eventbase + XFixesSelectionNotify)) {
++ XFixesSelectionNotifyEvent *req =
++ reinterpret_cast<XFixesSelectionNotifyEvent *>(event);
++ X11->time = req->selection_timestamp;
++ }
++#endif
+
+ QETWidget *widget = (QETWidget*)QWidget::find((WId)event->xany.window);
+
+--
+1.6.1
+
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-08-12 09:06:41 UTC (rev 49551)
+++ extra-i686/PKGBUILD 2009-08-12 09:51:51 UTC (rev 49552)
@@ -3,8 +3,8 @@
pkgname=qt
pkgver=4.5.2
-pkgrel=5
-_kdeqtver=59aa03b350c4e91f5a3515f4de96c77b989c1690
+pkgrel=6
+_kdeqtver=5b7a2eb42acfdea07c6075556cb43e2c95852145
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://www.qtsoftware.com/'
@@ -23,9 +23,10 @@
"ftp://ftp.archlinux.org/other/kde-qt/kde-qt-patches-${_kdeqtver}.tar.bz2"
'gstreamer-logo.png'
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
- 'qdoc3.patch' 'phonon.patch' 'CVE-2009-1725.patch')
+ 'qdoc3.patch' 'phonon.patch' 'CVE-2009-1725.patch'
+ '9e5fa633913ef952ca4ef5312fe396bcfc885321.patch')
md5sums=('28a7e8ac9805a6f614d2a27ee1a6ac9d'
- '9b5f708cd7ae92460ea9b888cadf29c7'
+ '5024f809e76a3550ef91bec0971536c2'
'f0c26f76acf8b6a3297cfb31f872b0b7'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
@@ -33,7 +34,8 @@
'c29f2993d6a0f73d756d2fa36e130e1c'
'a7e450751f42bdff17e57fdc4af72a18'
'ca0debc49d3505423e3b5742fdbfd852'
- '428fa87aab0032df1ac97f4561c6b08c')
+ '428fa87aab0032df1ac97f4561c6b08c'
+ 'ca409a4aade97cd506df21a4f17842d8')
_create-kdeqt-patches() {
local codir=$(mktemp -d)
@@ -73,6 +75,9 @@
# patch from svn://svn.debian.org/pkg-kde/trunk/packages/qt4-x11/debian/patches/
patch -p1 -i $srcdir/CVE-2009-1725.patch || return 1
+ # fix clipboard issue; see http://bugs.archlinux.org/task/15291
+ patch -p1 -i $srcdir/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch || return 1
+
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
More information about the arch-commits
mailing list