rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)"

Browse Source 
This reverts commit 2fe8ba1706.

Not needed afterall, false alarm.  Move along, nothing to see here.
This commit is contained in:
Rex Dieter 2011-11-04 09:14:33 -05:00
parent 2fe8ba1706
commit 18fdbd1c4c
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.patch
View File

@ -1,10 +0,0 @@
diff -up qt-everywhere-opensource-src-4.7.4/src/declarative/qml/qml.pri.qml_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/declarative/qml/qml.pri
--- qt-everywhere-opensource-src-4.7.4/src/declarative/qml/qml.pri.qml_no_strict_aliasing 2011-09-12 01:49:29.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.4/src/declarative/qml/qml.pri 2011-11-03 13:04:50.377884962 -0500
@@ -1,3 +1,6 @@
+
+*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
+
INCLUDEPATH += $$PWD
SOURCES += \
$$PWD/qdeclarativeparser.cpp \

9
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.0 Version: 4.8.0
Release: 0.25.rc1%{?dist} Release: 0.24.rc1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # 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 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] # 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 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 # upstream patches
# Applications crash when using a visual with 24 bits per pixel # Applications crash when using a visual with 24 bits per pixel
# https://bugreports.qt.nokia.com/browse/QTBUG-21754 # https://bugreports.qt.nokia.com/browse/QTBUG-21754
@ -425,7 +422,6 @@ popd
%patch73 -p1 -b .qtwebkit-glib231 %patch73 -p1 -b .qtwebkit-glib231
%endif %endif
%patch74 -p1 -b .tds_no_strict_aliasing %patch74 -p1 -b .tds_no_strict_aliasing
%patch75 -p1 -b .qml_no_strict_aliasing
# upstream patches # upstream patches
%patch100 -p1 -b .QTBUG-21754 %patch100 -p1 -b .QTBUG-21754
@ -1059,9 +1055,6 @@ fi
%changelog %changelog
* Thu Nov 03 2011 Rex Dieter <rdieter@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@fedoraproject.org> 4.8.0-0.24.rc1 * Thu Nov 03 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.24.rc1
- build tds sql driver with -fno-strict-aliasing - build tds sql driver with -fno-strict-aliasing