rpms/qt/F-10 qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch, NONE, 1.1 qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch, NONE, 1.1 qt.spec, 1.223, 1.224

Tue Apr 14 20:25:44 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11856/F-10

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch 
	qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch 
	qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch 
Log Message:
sync w/devel branch


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

--- NEW FILE qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch ---
diff -up qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp
--- qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp.disable_ft_lcdfilter	2009-04-14 13:56:07.000000000 -0500
+++ qt-x11-opensource-src-4.5.0/src/gui/text/qfontengine_ft.cpp	2009-04-14 13:59:00.000000000 -0500
@@ -72,9 +72,9 @@
 #include FT_CONFIG_OPTIONS_H
 #endif
 
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-#define QT_USE_FREETYPE_LCDFILTER
-#endif
+//#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+//#define QT_USE_FREETYPE_LCDFILTER
+//#endif
 
 #ifdef QT_LINUXBASE
 #include FT_ERRORS_H

qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch ---
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h	2009-04-01 17:54:21.000000000 +0200
@@ -115,8 +115,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -127,8 +127,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
--- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h	2009-02-25 22:09:21.000000000 +0100
+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h	2009-04-01 17:54:32.000000000 +0200
@@ -116,8 +116,8 @@
     asm volatile("lock\n"
                  "incl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }
@@ -128,8 +128,8 @@
     asm volatile("lock\n"
                  "decl %0\n"
                  "setne %1"
-                 : "=m" (_q_value), "=qm" (ret)
-                 : "m" (_q_value)
+                 : "+m" (_q_value), "=qm" (ret)
+                 :
                  : "memory");
     return ret != 0;
 }

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/F-10/qt.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- qt.spec	27 Mar 2009 16:59:11 -0000	1.223
+++ qt.spec	14 Apr 2009 20:25:14 -0000	1.224
@@ -2,7 +2,7 @@
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
-#define no_pch -no-pch
+%define no_pch -no-pch
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,12 +42,20 @@
 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
+# http://bugzilla.redhat.com/490377
+Patch15: qt-x11-opensource-src-4.5.0-disable_ft_lcdfilter.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
 Patch52: qt-4.5-sparc64.patch
+# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
+# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
+# crash with Qt 4.5
+Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
 ## qt-copy patches
 %define qt_copy 20090325
@@ -318,9 +326,12 @@
 %patch11 -p1 -b .linguist-crash
 %patch12 -p1 -b .lrelease
 %patch13 -p1 -b .gcc_hack
+%patch14 -p1 -b .ia64_boilerplate
+%patch15 -p1 -b .disable_ft_lcdfilter
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
+%patch53 -p1 -b .qatomic-inline-asm
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -511,8 +522,8 @@
 
 # qt4.(sh|csh), currently unused
 %if 0
-install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
+install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
+install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
 sed -i \
   -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
   -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
@@ -801,6 +812,18 @@
 
 
 %changelog
+* Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
+- fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
+
+* Fri Apr 10 2009 Than Ngo <than at redhat.com> - 4.5.0-13
+- unneeded executable permissions for profile.d scripts
+
+* Wed Apr 01 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-12
+- fix inline asm in qatomic (de)ref (i386/x86_64), should fix Kolourpaint crash
+
+* 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
 


