rpms/qt/devel qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch, NONE, 1.1 qt.spec, 1.257, 1.258

[Rex Dieter]

Author: rdieter

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

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch 
Log Message:
* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-11
- qt fails to build on ia64 (#492174)


qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp
--- qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken	2009-03-25 13:42:23.000000000 -0400
+++ qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp	2009-03-25 13:58:04.000000000 -0400
@@ -488,7 +488,11 @@ QT_END_NAMESPACE
 #  include <sys/syscall.h>
 #  include <unistd.h>
 
+#if defined(QT_ARCH_IA64)
+char boilerplate[] =
+#else
 static const char boilerplate[] =
+#endif
     "This is the QtCore library version " QT_VERSION_STR "\n"
     "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
     "Contact: Qt Software Information (qt-info at nokia.com)\n"


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- qt.spec	27 Mar 2009 19:25:27 -0000	1.257
+++ qt.spec	30 Mar 2009 17:01:19 -0000	1.258
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,6 +42,8 @@
 Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 # hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
 Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
+# qt fails to build on ia64: http://bugzilla.redhat.com/492174
+Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -318,6 +320,7 @@
 %patch11 -p1 -b .linguist-crash
 %patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
+%patch14 -p1 -b .ia64_boilerplate
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
@@ -801,6 +804,9 @@
 
 
 %changelog
+* Mon Mar 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-11
+- qt fails to build on ia64 (#492174)
+
 * Fri Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-10
 - qt-copy-patches-20090325