[qt] 4.8-tp
Jaroslav Reznik
jreznik at fedoraproject.org
Wed Jun 1 13:40:48 UTC 2011
commit 34e2c25f86b4305b5d54ee561d850c06cb9d83ef
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Wed Jun 1 15:40:35 2011 +0200
4.8-tp
.gitignore | 2 +-
4d3b9aa83cf7f6d9f9b88d9936e5980629daac2a.patch | 57 --------------------
qt-4.6.3-bn-rendering-bz562049.patch | 15 -----
qt-4.6.3-bn-rendering-bz562058.patch | 12 ----
qt-4.6.3-indic-rendering-bz631732.patch | 14 -----
qt-4.6.3-indic-rendering-bz636399.patch | 30 ----------
...rce-src-4.7.1-qtreeview-kpackagekit-crash.patch | 13 -----
...opensource-src-4.8.0-tp-multilib-optflags.patch | 36 ++++++++++++
...-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch | 12 ++++
...11-opensource-src-4.2.2-multilib-optflags.patch | 33 -----------
qt.spec | 29 +++-------
sources | 11 +----
12 files changed, 59 insertions(+), 205 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 67c284d..0a53280 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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.3.tar.gz
+/qt-everywhere-opensource-src-4.8.0-tp.tar.gz
diff --git a/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch b/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
new file mode 100644
index 0000000..5c8b5a1
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
@@ -0,0 +1,36 @@
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf 2011-05-25 13:39:38.789054074 +0200
+@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+ QMAKE_CFLAGS = -m32
+ QMAKE_LFLAGS = -m32
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf 2011-05-25 13:39:47.460747770 +0200
+@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+ QMAKE_CFLAGS = -m64
+ QMAKE_LFLAGS = -m64
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf 2011-05-25 13:39:26.630088814 +0200
+@@ -9,6 +9,8 @@ CONFIG += qt warn_on release increment
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
++QMAKE_CFLAGS_RELEASE += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
diff --git a/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch b/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
new file mode 100644
index 0000000..947f758
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp
+--- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash 2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp 2011-05-25 13:24:33.137315194 +0200
+@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite
+ return defaultItemHeight;
+ if (viewItems.isEmpty())
+ return 0;
+- const QModelIndex &index = viewItems.at(item).index;
++ QModelIndex index = viewItems.at(item).index;
+ if (!index.isValid())
+ return 0;
+ int height = viewItems.at(item).height;
diff --git a/qt.spec b/qt.spec
index e8ff5d9..eddadaa 100644
--- a/qt.spec
+++ b/qt.spec
@@ -17,14 +17,14 @@
Summary: Qt toolkit
Name: qt
Epoch: 1
-Version: 4.7.3
-Release: 3%{?dist}
+Version: 4.8.0
+Release: 0.1.tp%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
Group: System Environment/Libraries
Url: http://www.qtsoftware.com/
-Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}-tp.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: qt4 < %{version}-%{release}
Provides: qt4 = %{version}-%{release}
@@ -37,7 +37,7 @@ Source4: Trolltech.conf
Source5: qconfig-multilib.h
# set default QMAKE_CFLAGS_RELEASE
-Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
+Patch2: qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
# get rid of timestamp which causes multilib problem
Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
@@ -76,12 +76,6 @@ Patch56: qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
# qtwebkit to search nspluginwrapper paths too
Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
-# indic incorrect rendering
-Patch59: qt-4.6.3-bn-rendering-bz562049.patch
-Patch60: qt-4.6.3-bn-rendering-bz562058.patch
-Patch61: qt-4.6.3-indic-rendering-bz631732.patch
-Patch62: qt-4.6.3-indic-rendering-bz636399.patch
-
# fix 24bit color issue
Patch63: qt-everywhere-opensource-src-4.7.0-bpp24.patch
@@ -89,14 +83,12 @@ Patch63: qt-everywhere-opensource-src-4.7.0-bpp24.patch
Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch
# fix QTreeView crash triggered by KPackageKit (patch by David Faure)
-Patch65: qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
+Patch65: qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
# upstream patches
# adds debug support to webkit/JavaScriptCore
# UPSTREAM ME
Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch
-# Fix QNetworkConfigurationManager crash due to null private pointer. (QTBUG-17305, rhbz#682656)
-Patch106: http://qt.gitorious.org/qt/qt/commit/4d3b9aa83cf7f6d9f9b88d9936e5980629daac2a.patch
# kde-qt git patches
Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
@@ -488,7 +480,7 @@ Qt libraries used for drawing widgets and OpenGL items.
%prep
-%setup -q -n qt-everywhere-opensource-src-%{version}
+%setup -q -n qt-everywhere-opensource-src-%{version}-tp
%patch15 -p1 -b .enable_ft_lcdfilter
#patch16 -p1 -b .kde4_plugins
@@ -503,17 +495,12 @@ Qt libraries used for drawing widgets and OpenGL items.
%patch55 -p1 -b .cups-1
%patch56 -p1 -b .s390x
%patch58 -p1 -b .qtwebkit_pluginpath
-%patch59 -p1 -b .bn-rendering-bz562049
-%patch60 -p1 -b .bn-rendering-bz562058
-%patch61 -p1 -b .indic-rendering-bz631732
-%patch62 -p1 -b .indic-rendering-bz636399
%patch63 -p1 -b .bpp24
%patch64 -p1 -b .QTBUG-14467
%patch65 -p1 -b .qtreeview-kpackagekit-crash
# upstream patches
%patch105 -p1 -b .webkit_debug_javascriptcore
-%patch106 -p1 -b .QNetworkConfigurationManager-null-pointer
# kde-qt branch
%if 0%{?kde_qt}
@@ -601,7 +588,6 @@ done
-fontconfig \
-largefile \
-gtkstyle \
- -qt-gif \
-no-rpath \
-reduce-relocations \
-no-separate-debug-info \
@@ -1242,6 +1228,9 @@ fi
%changelog
+* Wed May 25 2011 Jaroslav Reznik <jreznik at redhat.com> 1:4.8.0-0.1.tp
+- 4.8.0-tp
+
* Thu May 19 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.3-3
- omit %%{_qt4_plugindir}/designer/libqwebview.so too
diff --git a/sources b/sources
index 9644818..22a626a 100644
--- a/sources
+++ b/sources
@@ -1,10 +1 @@
-d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
-6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-8e3924f417fea67f72b2105faed2119c gstreamer-logo.svg
-60de9d7e1cddd019f09fd036f0e5413a hi128-phonon-gstreamer.png
-7ca265e0cf75b3b4c81e1490d3dba3be hi16-phonon-gstreamer.png
-0a9f69d901aded140d4fed969c22e14f hi22-phonon-gstreamer.png
-12db12c009b722a6dc141f78feb7e330 hi32-phonon-gstreamer.png
-86c34a1b81d44980b1381f94ed6b7a23 hi48-phonon-gstreamer.png
-153505c71ec021b0a3bd4b74f2492e93 hi64-phonon-gstreamer.png
-49b96eefb1224cc529af6fe5608654fe qt-everywhere-opensource-src-4.7.3.tar.gz
+3f5d0553c9b741eecd5116e1ac7384ff qt-everywhere-opensource-src-4.8.0-tp.tar.gz
More information about the scm-commits
mailing list