- 4.7.0-beta2

.cvsignore

@@ -7,4 +7,4 @@ hi22-phonon-gstreamer.png
 hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
-qt-everywhere-opensource-src-4.7.0-beta1.tar.gz
+qt-everywhere-opensource-src-4.7.0-beta2.tar.gz

0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch

@@ -1,44 +0,0 @@
-From 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c Mon Sep 17 00:00:00 2001
-From: Bradley T. Hughes <bradley.hughes@nokia.com>
-Date: Tue, 4 May 2010 16:25:18 +0200
-Subject: [PATCH] Use qrand() instead of rand()
-
-This only affects X11 code, and are the only 2 places in Qt where rand() is
-used instead of qrand().
-
-Task-number: QTBUG-9793
-Reviewed-by: TrustMe
----
- src/gui/kernel/qwidget_x11.cpp        |    2 +-
- src/gui/painting/qpaintengine_x11.cpp |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
-index 37ac6bf..43f510c 100644
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -3000,7 +3000,7 @@ Picture QX11Data::getSolidFill(int screen, const QColor &c)
-             return X11->solid_fills[i].picture;
-     }
-     // none found, replace one
--    int i = rand() % 16;
-+    int i = qrand() % 16;
- 
-     if (X11->solid_fills[i].screen != screen && X11->solid_fills[i].picture) {
-         XRenderFreePicture (X11->display, X11->solid_fills[i].picture);
-diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
-index da48fcb..aef8b80 100644
---- a/src/gui/painting/qpaintengine_x11.cpp
-+++ b/src/gui/painting/qpaintengine_x11.cpp
-@@ -315,7 +315,7 @@ static Picture getPatternFill(int screen, const QBrush &b)
-             return X11->pattern_fills[i].picture;
-     }
-     // none found, replace one
--    int i = rand() % 16;
-+    int i = qrand() % 16;
- 
-     if (X11->pattern_fills[i].screen != screen && X11->pattern_fills[i].picture) {
- 	XRenderFreePicture (X11->display, X11->pattern_fills[i].picture);
--- 
-1.6.1
-

qt.spec

@@ -13,13 +13,13 @@
 # enable kde-qt integration/patches 
 %define kde_qt 1
 
-%define pre beta1 
+%define pre beta2
 
 Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.24.%{pre}%{?dist}
+Release: 0.25.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -87,8 +87,6 @@ Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 # based on http://qt.gitorious.org/+kde-developers/qt/kde-qt/commit/55ef01d93f8257b5927660290fc1ead0b2b74ec9.patch
 Patch217: qt-everywhere-opensource-src-4.7.0-beta1-QT_GRAPHICSSYSTEM.patch
-# QTBUG-9793
-Patch218: http://qt.gitorious.org/qt/qt/commit/0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c.patch
 
 Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
 Source11: hi16-phonon-gstreamer.png
@@ -451,7 +449,6 @@ Qt libraries used for drawing widgets and OpenGL items.
 %patch212 -p1 -b .kde-qt-0012
 %endif
 %patch217 -p1 -b .QT_GRAPHICSSYSTEM
-%patch218 -p1 -b .QTBUG-9793
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -1105,6 +1102,9 @@ fi
 
 
 %changelog
+* Thu Jul 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.7.0-0.25.beta1
+- 4.7.0-beta2
+
 * Tue Jul 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.7.0-0.24.beta1
 - X11Embed broken (rh#609757, QTBUG-10809)
 

sources

@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-128dae41b23bb427b735548c7864703a  qt-everywhere-opensource-src-4.7.0-beta1.tar.gz
+1449443c2d33ab9fefbd37b7104d0cdf  qt-everywhere-opensource-src-4.7.0-beta2.tar.gz