[qt] 1:4.8.3-1
Rex Dieter
rdieter at fedoraproject.org
Fri Sep 14 17:19:11 UTC 2012
commit 087ab1fb17a30d3d196f5bd179a14bf6ad6081f4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Sep 14 12:06:38 2012 -0500
1:4.8.3-1
- qt-4.8.3 final
- revert QtScript-JIT commit
.gitignore | 11 +-----
qt-4.8.1-webkit-no_Werror.patch | 12 ------
...-cursor-truncate-to-include-line-position.patch | 32 -----------------
...ere-opensource-src-4.8.0-qtwebkit-glib231.patch | 12 ------
...rywhere-opensource-src-4.8.1-icu_no_debug.patch | 23 ------------
qt-everywhere-opensource-src-4.8.1-type.patch | 26 --------------
...rywhere-opensource-src-4.8.3-icu_no_debug.patch | 23 ++++++++++++
qt-everywhere-opensource-src-4.8.3-no_Werror.patch | 12 ++++++
...source-src-4.8.3-qdbusconnection_no_debug.patch | 8 ++--
qt.spec | 37 +++++++-------------
sources | 2 +-
11 files changed, 54 insertions(+), 144 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5a0a79..3c3b9cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,4 @@
/hi128-app-qt4-logo.png
/hi48-app-qt4-logo.png
-/gstreamer-logo.svg
-/hi128-phonon-gstreamer.png
-/hi16-phonon-gstreamer.png
-/hi22-phonon-gstreamer.png
-/hi32-phonon-gstreamer.png
-/hi48-phonon-gstreamer.png
-/hi64-phonon-gstreamer.png
-/qt-everywhere-opensource-src-4.7.4.tar.gz
-/qt-everywhere-opensource-src-4.8.0.tar.gz
-/qt-everywhere-opensource-src-4.8.1.tar.gz
/qt-everywhere-opensource-src-4.8.2.tar.gz
+/qt-everywhere-opensource-src-4.8.3.tar.gz
diff --git a/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch b/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
new file mode 100644
index 0000000..9c53f3c
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
@@ -0,0 +1,23 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug 2012-09-06 02:33:45.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp 2012-09-11 09:04:21.542379795 -0500
+@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
+ QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+ lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+ if (!lib.load()) {
++#ifndef QT_NO_DEBUG
+ qWarning() << "Unable to load library icui18n" << lib.errorString();
++#endif
+ status = ErrorLoading;
+ return false;
+ }
+@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
+ QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+ ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+ if (!ucLib.load()) {
++#ifndef QT_NO_DEBUG
+ qWarning() << "Unable to load library icuuc" << ucLib.errorString();
++#endif
+ status = ErrorLoading;
+ return false;
+ }
diff --git a/qt-everywhere-opensource-src-4.8.3-no_Werror.patch b/qt-everywhere-opensource-src-4.8.3-no_Werror.patch
new file mode 100644
index 0000000..86dcc28
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-no_Werror.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri
+--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-09-06 02:33:50.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri 2012-09-11 09:03:19.152159783 -0500
+@@ -102,7 +102,7 @@ CONFIG -= warn_on
+
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+- !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
++ #!CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
+
+ greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
+ if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
diff --git a/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch b/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
similarity index 53%
rename from qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
rename to qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
index 8d60dab..dd3a5a0 100644
--- a/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
+++ b/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
@@ -1,6 +1,6 @@
-diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp
---- qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug 2012-04-17 07:18:51.536629078 -0500
-+++ qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp 2012-04-17 07:18:56.910561895 -0500
+diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch 2012-09-06 02:33:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp 2012-09-11 08:55:29.854026815 -0500
@@ -1109,8 +1109,10 @@ public:
// make sure this connection is running on the main thread
QCoreApplication *instance = QCoreApplication::instance();
@@ -9,6 +9,6 @@ diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusco
qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
+#endif
- } else {
+ } else if (QDBusConnectionPrivate::d(*this)) {
QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
}
diff --git a/qt.spec b/qt.spec
index ff1a672..6394cbb 100644
--- a/qt.spec
+++ b/qt.spec
@@ -15,14 +15,14 @@
Summary: Qt toolkit
Name: qt
Epoch: 1
-Version: 4.8.2
-Release: 6%{?dist}
+Version: 4.8.3
+Release: 1%{?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://qt.nokia.com/
-Source0: http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
+Source0: http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: qt4 < %{version}-%{release}
@@ -53,7 +53,7 @@ Patch24: qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
# hack out largely useless (to users) warnings about qdbusconnection
# (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
-Patch25: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
+Patch25: qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
# lrelease-qt4 tries to run qmake not qmake-qt4 (http://bugzilla.redhat.com/820767)
Patch26: qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
@@ -83,7 +83,7 @@ Patch67: qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
# https://bugs.webkit.org/show_bug.cgi?id=63941
# -Wall + -Werror = fail
-Patch68: qt-4.8.1-webkit-no_Werror.patch
+Patch68: qt-everywhere-opensource-src-4.8.3-no_Werror.patch
# revert qlist.h commit that seems to induce crashes in qDeleteAll<QList (QTBUG-22037)
Patch69: qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
@@ -94,10 +94,6 @@ Patch70: qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch
# Buttons in Qt applications not clickable when run under gnome-shell (#742658, QTBUG-21900)
Patch71: qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch
-# QtWebKit wtf library: GMutex is a union rather than a struct in GLib >= 2.31
-# fixes FTBFS: https://bugs.webkit.org/show_bug.cgi?id=69840
-Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
-
# workaround
# sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
@@ -106,7 +102,7 @@ Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
# don't spam in release/no_debug mode if libicu is not present at runtime
-Patch77: qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch
+Patch77: qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
# gcc doesn't support flag -fuse-ld=gold
Patch80: qt-everywhere-opensource-src-4.8.0-ld-gold.patch
@@ -117,11 +113,6 @@ Patch81: ./qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
# upstream patches
# http://codereview.qt-project.org/#change,22006
Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
-# text cursor blinks not in the current cell (kde#296490)
-Patch101: qt-Fix-cursor-truncate-to-include-line-position.patch
-# fix crash on big endian machines
-# https://bugreports.qt-project.org/browse/QTBUG-22960
-Patch102: qt-everywhere-opensource-src-4.8.1-type.patch
# fix JIT crash
# https://bugreports.qt-project.org/browse/QTBUG-23871
# https://bugs.kde.org/show_bug.cgi?id=297661
@@ -440,7 +431,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch15 -p1 -b .enable_ft_lcdfilter
%patch23 -p1 -b .glib_eventloop_nullcheck
%patch24 -p1 -b .moc-boost148
-%patch25 -p1 -b .qdbusconnection_no_debug.patch
+%patch25 -p1 -b .qdbusconnection_no_debug
%patch26 -p1 -b .linguist_qtmake-qt4
%patch27 -p1 -b .qt3support_debuginfo
## TODO: still worth carrying? if so, upstream it.
@@ -455,11 +446,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch69 -p1 -b .QTBUG-22037
%patch70 -p1 -b .QTBUG-14724
%patch71 -p1 -b .QTBUG-21900
-%if 0%{?fedora} > 16 || 0%{?rhel} > 6
-# This quick fix works ONLY with GLib >= 2.31. It's harder to fix this portably.
-# See https://bugs.webkit.org/show_bug.cgi?id=69840 for the gory details.
-%patch73 -p1 -b .qtwebkit-glib231
-%endif
%patch74 -p1 -b .tds_no_strict_aliasing
%patch76 -p1 -b .s390-atomic
%patch77 -p1 -b .icu_no_debug
@@ -468,9 +454,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
# upstream patches
%patch100 -p1 -b .QTgaHandler
-%patch101 -p1 -b .fix_cursor_blink
-%patch102 -p1 -b .bigendian
-#patch103 -p1 -b .QtScript_JIT
+## 4.8.3 includes this patch, revert it to avoid regressions for now -- rex
+%patch103 -p1 -R -b .QtScript_JIT
# security fixes
%patch200 -p1 -b .CVE-2011-3922
@@ -1102,6 +1087,10 @@ fi
%changelog
+* Thu Sep 13 2012 Rex Dieter <rdieter at fedoraproject.org> - 1:4.8.3-1
+- qt-4.8.3 final
+- revert QtScript-JIT commit
+
* Tue Sep 04 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.2-6
- revert "fix QtScript JIT crash" patch, causes frequent segmentation faults (#853587)
diff --git a/sources b/sources
index 0169428..391554e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-3c1146ddf56247e16782f96910a8423b qt-everywhere-opensource-src-4.8.2.tar.gz
+a663b6c875f8d7caa8ac9c30e4a4ec3b qt-everywhere-opensource-src-4.8.3.tar.gz
More information about the scm-commits
mailing list