rpms/qt3/devel qt-x11-free-3.3.7-arm.patch, NONE, 1.1 qt3.spec, 1.16, 1.17

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17023/devel

Modified Files:
	qt3.spec 
Added Files:
	qt-x11-free-3.3.7-arm.patch 
Log Message:
* Fri May 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-26
- arm patch


qt-x11-free-3.3.7-arm.patch:

--- NEW FILE qt-x11-free-3.3.7-arm.patch ---
>From 587c3ab16750be27b461299257406ffacde676ee Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars at marvell.com>
Date: Mon, 5 Jan 2009 10:55:52 +0530
Subject: [PATCH] Fix build problem on QT3

Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Kedar Sovani <kedars at marvell.com>
---
 qt-x11-free-3.3.7-arm.patch |   25 +++++++++++++++++++++++++
 qt3.spec                    |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 qt-x11-free-3.3.7-arm.patch

diff --git a/qt-x11-free-3.3.7-arm.patch b/qt-x11-free-3.3.7-arm.patch
new file mode 100644
index 0000000..0c93c41
--- /dev/null
+++ b/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


Index: qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- qt3.spec	16 Apr 2009 13:40:36 -0000	1.16
+++ qt3.spec	15 May 2009 16:21:39 -0000	1.17
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 25%{?dist}
+Release: 26%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -48,6 +48,7 @@ Patch34: qt-3.3.6-fontrendering-ml_IN-20
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
 Patch38: qt-x11-free-3.3.8-odbc.patch
+Patch39: qt-x11-free-3.3.7-arm.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -347,6 +348,7 @@ for the Qt 3 toolkit.
 %patch35 -p1 -b .fontrendering-ml_IN-217657
 %patch37 -p1 -b .fontrendering-gu-228452
 %patch38 -p1 -b .odbc
+%patch39 -p1 -b .arm
 
 # immodule patches
 %if %{immodule}
@@ -643,6 +645,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-26
+- arm patch
+
 * Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.3.8b-25
 - move designer plugins to runtime (#487622)