rpms/qt3/devel qt-x11-free-3.3.7-arm.patch, 1.1, 1.2 qt3.spec, 1.17, 1.18
Rex Dieter
rdieter at fedoraproject.org
Fri May 15 16:53:59 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25317/devel
Modified Files:
qt-x11-free-3.3.7-arm.patch qt3.spec
Log Message:
make usable arm patch, applied only on armv5tel (for now)
qt-x11-free-3.3.7-arm.patch:
Index: qt-x11-free-3.3.7-arm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt3/devel/qt-x11-free-3.3.7-arm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-free-3.3.7-arm.patch 15 May 2009 16:21:39 -0000 1.1
+++ qt-x11-free-3.3.7-arm.patch 15 May 2009 16:53:28 -0000 1.2
@@ -1,44 +1,25 @@
-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
+--- 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.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- qt3.spec 15 May 2009 16:21:39 -0000 1.17
+++ qt3.spec 15 May 2009 16:53:28 -0000 1.18
@@ -348,7 +348,10 @@ for the Qt 3 toolkit.
%patch35 -p1 -b .fontrendering-ml_IN-217657
%patch37 -p1 -b .fontrendering-gu-228452
%patch38 -p1 -b .odbc
+# it's not 100% clear to me if this is safe for all archs -- Rex
+%ifarch armv5tel
%patch39 -p1 -b .arm
+%endif
# immodule patches
%if %{immodule}
More information about the scm-commits
mailing list