Changeset 14c0f145

Timestamp:

04/04/2012 08:58:11 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

002bf11

Parents:

15dce9d

Message:

Qt 4.8.1 and added gcc4.7/glib2.32 patches.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9852 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• x/lib/qt4.xml (modified) (10 diffs)

general.ent

@@ -602 +602 @@
 <!-- Chapter 24 -->
 <!ENTITY qt-version                   "3.3.8d">
-<!ENTITY qt4-version                  "4.8.0">
+<!ENTITY qt4-version                  "4.8.1">
 <!ENTITY cairo-version                "1.12.0">
 <!ENTITY cairomm-version              "1.9.2">

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - Upgrade to Qt 4.8.1 and add two patches. Fixes #3320.</para>
+        </listitem>     
+        <listitem>
           <para>[dj] - Xorg Applicatons require MesaLib. Fixes #3218.</para>
         </listitem>
@@ -84 +87 @@
       <itemizedlist>
         <listitem>
-          <para>[dj] - Fix libproxy build failure with recent xulrunnr.</para>
+          <para>[dj] - Fix libproxy build failure with recent xulrunner.</para>
         </listitem>
       </itemizedlist>

x/lib/qt4.xml

@@ -7 +7 @@
   <!ENTITY qt4-download-http "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
   <!ENTITY qt4-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-md5sum        "e8a5fdbeba2927c948d9f477a6abe904">
+  <!ENTITY qt4-md5sum        "7960ba8e18ca31f0c6e4895a312f92ff">
   <!ENTITY qt4-size          "228 MB">
   <!ENTITY qt4-buildsize     "1.8 GB (full), 619 (essential)">
@@ -30 +30 @@
     <title>Introduction to Qt4</title>
 
-    <para>The <application>Qt4</application> package contains several
-    <application>C++</application> libraries with both GUI and non-GUI
-    components.  One of the major users of <application>Qt4</application> is
-    <application>KDE4</application>.</para>
-
+    <para><application>Qt</application> is a cross-platform application 
+    framework that is widely used for developing application software 
+    with a graphical user interface (GUI) (in which cases Qt is classified 
+    as a widget toolkit), and also used for developing non-GUI programs such 
+    as command-line tools and consoles for servers. One of the major users 
+    of <application>Qt4</application> is <application>KDE</application>.</para>
+
+    &lfs71_checked;    
+    
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -57 +61 @@
     </itemizedlist>
 
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>GCC 4.7 patch: <ulink
+        url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>GLib 2.32 patch: <ulink
+        url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch"/>
+        </para>
+       </listitem>
+    </itemizedlist>
+
+    
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -81 +101 @@
       <xref linkend="mysql"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="unixodbc"/>, and
+      <xref linkend="unixodbc"/> and
       <xref linkend="sqlite"/>
     </para>
@@ -115 +135 @@
     <filename class='directory'>/usr</filename> hierarchy.
     This is the method that most commercial distributions use.</para>
-
+<!--
     <note>
       <para>There is no conflict between the <application>Qt3</application>
@@ -139 +159 @@
       other Qt bin directory.  </para>
     </note>
-
+-->
     <caution>
       <para>If <application>Qt4</application> is being reinstalled and the
@@ -168 +188 @@
     class='directory'>/opt/qt-&qt4-version;/</filename>
     and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
-
-    <para>Install <application>Qt4</application> by running the
+    
+    <para>Configure <application>Qt4</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure -prefix /opt/qt-&qt4-version;  \
-            -release                 \
-            -nomake examples         \
-            -nomake demos            \
-            -system-sqlite           \
-            -no-nis                  \
-            &amp;&amp;
-make</userinput></screen>
-
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch &amp;&amp;
+patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &amp;&amp;
+./configure -prefix /opt/qt-&qt4-version;  \
+            -release               \
+            -nomake examples       \
+            -nomake demos          \
+            -system-sqlite         \
+            -no-nis                \
+            -opensource            \
+            -confirm-license</userinput></screen>
+    
     <note><title>Phonon</title>
     <para>If <application>KDE4</application> is intended to be installed, add
@@ -187 +209 @@
     <application>Phonon</application> libraries will be installed which better
     matches the needs of the <application>KDE4</application> desktop.</para></note>
+       
+    <para>If you are compiling with <application>GCC</application> 4.7 you need
+    to suppress some warnings that would otherwise cause the build to fail. This 
+    can be achieved by modifying some Makefiles:</para>
+    
+    <screen><userinput>find src/3rdparty/webkit/Source/{WebCore,WebKit} -name 'Makefile*' -exec sed -i 's@-Werror @@' {} \;</userinput></screen>
+
+    <para>Now, build the package:</para>
+    
+    <screen><userinput>make</userinput></screen>
     
     <para>This package does not come with a test suite.</para>
@@ -205 +237 @@
     <title>Command Explanations</title>
 
+    <para><command>patch -Np1 -i qt-everywhere-...</command>:
+    The two patches fix compiling with <application>GCC</application>
+    4.7 and <application>GLib</application> 2.32.</para>
+    
     <para><parameter>-nomake examples, -nomake demos</parameter>:
     These switches disable building programs that are only of interest
@@ -245 +281 @@
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin qt addition to /etc/ld.so.conf
+<literal># Begin qt addition
 
 /opt/qt/lib