diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-02-21 19:27:13 -0500 |
| commit | 5d7b5e6defb05f81691d286d40f67260c4733d00 (patch) | |
| tree | b2bfcca86b05179cad334dc61c5609e54ac7674d /redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch | |
| parent | 580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff) | |
| parent | a14ac9de2f5843036c9f452f1188979fef17ae6d (diff) | |
| download | tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch')
| -rw-r--r-- | redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch new file mode 100644 index 000000000..0c93c416a --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1,25 @@ +--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 +@@ -315,9 +315,9 @@ + QString bloat. However, gcc 3.4 doesn't allow us to create references to + members of a packed struct. (Pointers are OK, because then you + supposedly know what you are doing.) */ +-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) ++# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) + # define Q_PACKED __attribute__ ((packed)) +-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 ++# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + # define Q_NO_PACKED_REFERENCE + # endif + # endif +--- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 ++++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 +@@ -194,7 +194,7 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort *)&ucs); } + #else + ushort &unicode() { return ucs; } + #endif |