[qt] Revert "build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)"
Rex Dieter
rdieter at fedoraproject.org
Fri Nov 4 14:07:22 UTC 2011
commit 18fdbd1c4c53479e3a0de1e316f1573c67981c48
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Nov 4 09:14:33 2011 -0500
Revert "build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)"
This reverts commit 2fe8ba17066d7517bdd3bf46472b4f58c8730986.
Not needed afterall, false alarm. Move along, nothing to see here.
...ensource-src-4.7.4-qml_no_strict_aliasing.patch | 10 ----------
qt.spec | 9 +--------
2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/qt.spec b/qt.spec
index d9d590e..4872778 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.0
-Release: 0.25.rc1%{?dist}
+Release: 0.24.rc1%{?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
@@ -94,9 +94,6 @@ Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
# 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
-# workaround aliasing issues in declarative/qml (#748936, QTBUG-19736)
-Patch75: qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.patch
-
# upstream patches
# Applications crash when using a visual with 24 bits per pixel
# https://bugreports.qt.nokia.com/browse/QTBUG-21754
@@ -425,7 +422,6 @@ popd
%patch73 -p1 -b .qtwebkit-glib231
%endif
%patch74 -p1 -b .tds_no_strict_aliasing
-%patch75 -p1 -b .qml_no_strict_aliasing
# upstream patches
%patch100 -p1 -b .QTBUG-21754
@@ -1059,9 +1055,6 @@ fi
%changelog
-* Thu Nov 03 2011 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-0.25.rc1
-- build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)
-
* Thu Nov 03 2011 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-0.24.rc1
- build tds sql driver with -fno-strict-aliasing
More information about the scm-commits
mailing list