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

cleaner tds patch

This commit is contained in:
Rex Dieter 2011-11-03 13:09:05 -05:00
parent 651f62b07b
commit 81789f851c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch Normal file
View File

@ -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

12
qt-everywhere-opensource-src-4.8.0-tds_no_strict_aliasing.patch
View File

@ -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 {

2
qt.spec
View File

@ -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