Author: randy
Date: 2005-08-17 16:44:52 -0600 (Wed, 17 Aug 2005)
New Revision: 1068
Added:
trunk/qt/qt-x11-free-3.3.4-gcc4-1.patch
Log:
Added Qt-3.3.4 GCC-4 patch
Added: trunk/qt/qt-x11-free-3.3.4-gcc4-1.patch
===================================================================
--- trunk/qt/qt-x11-free-3.3.4-gcc4-1.patch 2005-08-16 16:56:03 UTC (rev
1067)
+++ trunk/qt/qt-x11-free-3.3.4-gcc4-1.patch 2005-08-17 22:44:52 UTC (rev
1068)
@@ -0,0 +1,43 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-08-17
+Initial Package Version: 3.3.4
+Upstream Status: N/A (package is obsolete)
+Origin: RedHat Development CVS
+Description: Fixes for GCC-4
+
+
+diff -Naur qt-x11-free-3.3.4-orig/configure qt-x11-free-3.3.4/configure
+--- qt-x11-free-3.3.4-orig/configure 2004-10-18 17:17:00.000000000 +0000
++++ qt-x11-free-3.3.4/configure 2005-08-17 21:59:02.000000000 +0000
+@@ -3030,6 +3030,9 @@
+ *3.*)
+ COMPILER_VERSION="3.*"
+ ;;
++ *4.*)
++ COMPILER_VERSION="4.*"
++ ;;
+ *)
+ ;;
+ esac
+
+diff -Naur qt-x11-free-3.3.4-orig/src/kernel/qsizepolicy.h
qt-x11-free-3.3.4/src/kernel/qsizepolicy.h
+--- qt-x11-free-3.3.4-orig/src/kernel/qsizepolicy.h 2005-01-21
17:16:12.000000000 +0000
++++ qt-x11-free-3.3.4/src/kernel/qsizepolicy.h 2005-08-17 22:00:33.000000000
+0000
+@@ -47,7 +47,7 @@
+ class Q_EXPORT QSizePolicy
+ {
+ private:
+- enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
++ enum SizeMask { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
+ MayGrow = 1, ExpMask = 2, MayShrink = 4 };
+ public:
+ enum SizeType { Fixed = 0,
+@@ -88,7 +88,7 @@
+ }
+
+ void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
+- void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask <<
HSize)) |
++ void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
+ (d << HSize); }
+
+ void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 <<
2*HSize ) )
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
