From 0f50975eed9994b2687c84abcbb12a70a3b78b89 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Mar 2009 17:01:19 +0000 Subject: [PATCH] - qt fails to build on ia64 (#492174) --- ...11-opensource-src-4.5.0-ia64_boilerplate.patch | 15 +++++++++++++++ qt.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch diff --git a/qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch b/qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch new file mode 100644 index 0000000..a076c92 --- /dev/null +++ b/qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch @@ -0,0 +1,15 @@ +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 + # include + ++#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@nokia.com)\n" diff --git a/qt.spec b/qt.spec index fe2b332..edd63aa 100644 --- a/qt.spec +++ b/qt.spec @@ -12,7 +12,7 @@ Epoch: 1 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 @@ Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 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 @@ test -x apply_patches && ./apply_patches %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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Mon Mar 30 2009 Rex Dieter - 4.5.0-11 +- qt fails to build on ia64 (#492174) + * Fri Mar 25 2009 Rex Dieter - 4.5.0-10 - qt-copy-patches-20090325