[qt/f15] build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736) build tds sql driver with -fn

[Rex Dieter]

commit 01392e94e479e689b22fc904b29e48ba25a14668
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 3 13:10:19 2011 -0500

    build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)
    build tds sql driver with -fno-strict-aliasing

 ...ensource-src-4.7.4-qml_no_strict_aliasing.patch |   10 ++++++++++
 ...ensource-src-4.7.4-tds_no_strict_aliasing.patch |   12 ++++++++++++
 qt.spec                                            |   15 ++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.patch b/qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.patch
new file mode 100644
index 0000000..9dfbdce
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.patch
@@ -0,0 +1,10 @@
+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 \
diff --git a/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch b/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
new file mode 100644
index 0000000..b675929
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri
+--- qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing	2011-09-12 01:49:28.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri	2011-11-03 13:04:34.271086323 -0500
+@@ -1,6 +1,8 @@
+ HEADERS += $$PWD/qsql_tds.h
+ SOURCES += $$PWD/qsql_tds.cpp
+ 
++*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
++
+ unix|win32-g++*: {
+     LIBS *= $$QT_LFLAGS_TDS
+     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
diff --git a/qt.spec b/qt.spec
index d1ac44d..51f09ae 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.4
-Release: 5%{?dist}
+Release: 6%{?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
@@ -88,6 +88,13 @@ Patch64: qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch
 # Qt doesn't close orphaned file descriptors after printing (#746601, QTBUG-14724)
 Patch70: qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch
 
+# workaround aliasing issues in declarative/qml (#748936, QTBUG-19736) 
+Patch73: qt-everywhere-opensource-src-4.7.4-qml_no_strict_aliasing.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
+
 # upstream patches
 # Applications crash when using a visual with 24 bits per pixel 
 # https://bugreports.qt.nokia.com/browse/QTBUG-21754
@@ -531,6 +538,8 @@ Qt libraries used for drawing widgets and OpenGL items.
 %patch62 -p1 -b .indic-rendering-bz636399
 %patch64 -p1 -b .QTBUG-14467
 %patch70 -p1 -b .QTBUG-14724
+%patch73 -p1 -b .qml_no_strict_aliasing
+%patch74 -p1 -b .tds_no_strict_aliasing
 
 ## upstream patches
 %patch100 -p1 -b .QTBUG-21754
@@ -1294,6 +1303,10 @@ fi
 
 
 %changelog
+* Thu Nov 03 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.4-6
+- build declarative/qml with -fno-strict-aliasing (#748936, QTBUG-19736)
+- build tds sql driver with -fno-strict-aliasing
+
 * Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.4-5
 - crash when using a visual with 24 bits per pixel (QTBUG-21754)