From 81789f851c41d69ee334e2aaa32e3ab6bc191039 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Nov 03 2011 18:09:05 +0000
Subject: cleaner tds patch


---

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-everywhere-opensource-src-4.8.0-tds_no_strict_aliasing.patch b/qt-everywhere-opensource-src-4.8.0-tds_no_strict_aliasing.patch
deleted file mode 100644
index 685b88b..0000000
--- a/qt-everywhere-opensource-src-4.8.0-tds_no_strict_aliasing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.8.0/src/sql/drivers/tds/qsql_tds.pri
---- qt-everywhere-opensource-src-4.8.0/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing	2011-10-03 22:44:31.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/sql/drivers/tds/qsql_tds.pri	2011-11-03 12:06:16.333816559 -0500
-@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_tds.cpp
- unix|win32-g++*: {
-     LIBS *= $$QT_LFLAGS_TDS
-     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
--    QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS
-+    QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS -fno-strict-aliasing
- } else:win32-borland {
-     LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
- } else {
diff --git a/qt.spec b/qt.spec
index 20e3b01..4872778 100644
--- a/qt.spec
+++ b/qt.spec
@@ -92,7 +92,7 @@ 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.8.0-tds_no_strict_aliasing.patch
+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