r5031 - in trunk: BOOK/introduction/welcome BOOK/x/lib patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 9 17:39:08 PDT 2005


Author: randy
Date: 2005-09-09 18:39:07 -0600 (Fri, 09 Sep 2005)
New Revision: 5031

Added:
   trunk/patches/qt-x11-free-3.3.4-gcc4-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Added a GCC-4 patch to the Qt instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 00:23:21 UTC (rev 5030)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 00:39:07 UTC (rev 5031)
@@ -45,6 +45,9 @@
       <para>September 9th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a GCC-4 patch to the Qt instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added a GCC-4 patch and documentation installation
           commands to the NAS instructions.</para>
         </listitem>

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2005-09-10 00:23:21 UTC (rev 5030)
+++ trunk/BOOK/x/lib/qt.xml	2005-09-10 00:39:07 UTC (rev 5031)
@@ -58,6 +58,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/qt-x11-free-&qt-version;-gcc4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -141,6 +149,7 @@
 bash
 export PATH=$PWD/bin:$PATH &&
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &&
+patch -Np1 -i ../qt-x11-free-&qt-version;-gcc4-1.patch &&
 ./configure -prefix /usr -docdir /usr/share/doc/qt \
     -headerdir /usr/include/qt -plugindir /usr/lib/qt/plugins \
     -datadir /usr/share/qt -translationdir /usr/share/qt/translations \
@@ -181,6 +190,7 @@
 export QTDIR=$PWD &&
 export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &&
 export PATH=$PWD/bin:$PATH &&
+patch -Np1 -i ../qt-x11-free-&qt-version;-gcc4-1.patch &&
 ./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
     -system-libmng -system-zlib -system-libjpeg -no-exceptions \
     -thread -plugin-imgfmt-png &&

Added: trunk/patches/qt-x11-free-3.3.4-gcc4-1.patch
===================================================================
--- trunk/patches/qt-x11-free-3.3.4-gcc4-1.patch	2005-09-10 00:23:21 UTC (rev 5030)
+++ trunk/patches/qt-x11-free-3.3.4-gcc4-1.patch	2005-09-10 00:39:07 UTC (rev 5031)
@@ -0,0 +1,46 @@
+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
+
+$LastChangedBy$
+$Date$
+
+
+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 ) )


Property changes on: trunk/patches/qt-x11-free-3.3.4-gcc4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list