[arch-commits] Commit in qt/repos (4 files)
Pierre Schmitz
pierre at archlinux.org
Fri Oct 2 14:39:01 UTC 2009
Date: Friday, October 2, 2009 @ 10:39:00
Author: pierre
Revision: 53549
Merged revisions 53547 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qt/trunk
........
r53547 | pierre | 2009-10-02 15:11:39 +0200 (Fr, 02 Okt 2009) | 1 line
update to Qt 4.5.3
........
Modified:
qt/repos/extra-i686/ (properties)
qt/repos/extra-i686/PKGBUILD
Deleted:
qt/repos/extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch
qt/repos/extra-i686/CVE-2009-1725.patch
------------------------------------------------+
9e5fa633913ef952ca4ef5312fe396bcfc885321.patch | 92 -----------------------
CVE-2009-1725.patch | 26 ------
PKGBUILD | 43 +++-------
3 files changed, 13 insertions(+), 148 deletions(-)
Property changes on: qt/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /qt/trunk:1-52187
+ /qt/trunk:1-53548
Deleted: extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch
===================================================================
--- extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch 2009-10-02 13:45:20 UTC (rev 53548)
+++ extra-i686/9e5fa633913ef952ca4ef5312fe396bcfc885321.patch 2009-10-02 14:39:00 UTC (rev 53549)
@@ -1,92 +0,0 @@
-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
-
Deleted: extra-i686/CVE-2009-1725.patch
===================================================================
--- extra-i686/CVE-2009-1725.patch 2009-10-02 13:45:20 UTC (rev 53548)
+++ extra-i686/CVE-2009-1725.patch 2009-10-02 14:39:00 UTC (rev 53549)
@@ -1,26 +0,0 @@
-Fixed upstream and included in Qt 4.5.3
-
---- a/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
-+++ b/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
-@@ -867,7 +867,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
- }
- } else {
- // FIXME: We should eventually colorize entities by sending them as a special token.
-- checkBuffer(11);
-+ // 12 bytes required: up to 10 bytes in m_cBuffer plus the
-+ // leading '&' and trailing ';'
-+ checkBuffer(12);
- *dest++ = '&';
- for (unsigned i = 0; i < cBufferPos; i++)
- dest[i] = m_cBuffer[i];
-@@ -878,7 +880,9 @@ HTMLTokenizer::State HTMLTokenizer::pars
- }
- }
- } else {
-- checkBuffer(10);
-+ // 11 bytes required: up to 10 bytes in m_cBuffer plus the
-+ // leading '&'
-+ checkBuffer(11);
- // ignore the sequence, add it to the buffer as plaintext
- *dest++ = '&';
- for (unsigned i = 0; i < cBufferPos; i++)
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-10-02 13:45:20 UTC (rev 53548)
+++ extra-i686/PKGBUILD 2009-10-02 14:39:00 UTC (rev 53549)
@@ -2,9 +2,9 @@
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=qt
-pkgver=4.5.2
-pkgrel=7
-_kdeqtver=5b7a2eb42acfdea07c6075556cb43e2c95852145
+pkgver=4.5.3
+pkgrel=1
+_kdeqtver=8d1fe78bf12d9c21dfdf00ef24c3d6ce9cc89f0b
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://www.qtsoftware.com/'
@@ -19,37 +19,30 @@
conflicts=('qt4' 'phonon')
options=('!libtool')
_pkgfqn="qt-x11-opensource-src-${pkgver}"
-source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
- "ftp://ftp.archlinux.org/other/kde-qt/kde-qt-patches-${_kdeqtver}.tar.bz2"
+source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz"
+ "ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz"
'gstreamer-logo.png'
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
- 'qdoc3.patch' 'phonon.patch' 'CVE-2009-1725.patch'
- '9e5fa633913ef952ca4ef5312fe396bcfc885321.patch')
-md5sums=('28a7e8ac9805a6f614d2a27ee1a6ac9d'
- '5024f809e76a3550ef91bec0971536c2'
+ 'qdoc3.patch' 'phonon.patch')
+md5sums=('3988cf9af68be2df8a8000ede231de9b'
+ 'b38b9bc91b4e5451cad7a922e246bd14'
'f0c26f76acf8b6a3297cfb31f872b0b7'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
'c29f2993d6a0f73d756d2fa36e130e1c'
'a7e450751f42bdff17e57fdc4af72a18'
- 'ca0debc49d3505423e3b5742fdbfd852'
- '428fa87aab0032df1ac97f4561c6b08c'
- 'ca409a4aade97cd506df21a4f17842d8')
+ 'ca0debc49d3505423e3b5742fdbfd852')
-_create-kdeqt-patches() {
+_create-kdeqt-patch() {
local codir=$(mktemp -d)
mkdir -p "${codir}/kde-qt"
git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
pushd "${codir}/kde-qt"
local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
- mkdir "../kde-qt-patches-${kdeqtver}"
- git format-patch -k "v${pkgver}..${pkgver}-patched" -o "../kde-qt-patches-${kdeqtver}"
+ git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
popd
- pushd "${codir}"
- bsdtar -cjf "kde-qt-patches-${kdeqtver}.tar.bz2" kde-qt-patches-${kdeqtver}
- popd
- mv "${codir}/kde-qt-patches-${kdeqtver}.tar.bz2" .
+ mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
rm -rf "${codir}"
}
@@ -60,10 +53,7 @@
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
cd $srcdir/$_pkgfqn
- for i in $srcdir/kde-qt-patches-${_kdeqtver}/*; do
- echo "applying $i"
- patch -p1 -i $i || return 1
- done
+ patch -p1 -i $srcdir/kde-qt-${_kdeqtver}.patch || return 1
# see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
# enable qdoc3
@@ -71,13 +61,6 @@
# install service files needed by KDE
patch -p1 -i $srcdir/phonon.patch || return 1
- # fix security issue FS#15706
- # 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