Changeset a6c6923

Timestamp:

08/23/2013 08:05:56 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

7bb72e0

Parents:

6c7866b4

Message:

qt4 fixes

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

Location:

x/lib

Files:

• qt4.xml (modified) (7 diffs)
• qt5.xml (modified) (1 diff)

x/lib/qt4.xml

@@ -6 +6 @@
 
   <!ENTITY qt4-download-http
-  "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
+           "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
   <!ENTITY qt4-download-ftp  " ">
   <!ENTITY qt4-md5sum        "1864987bdbb2f58f8ae8b350dfdbe133">
@@ -80 +80 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="alsa-lib"/>,
       <xref linkend="mesalib"/> and
       <xref linkend="qtchooser"/>
@@ -148 +149 @@
     </para>
 
-<screen><userinput>./configure -confirm-license \
+<screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+     config.tests/unix/libmng/libmng.cpp &amp;&amp;
+
+./configure -confirm-license \
             -opensource \
             -release \
@@ -165 +169 @@
             -openssl-linked \
             -system-sqlite \
-            -plugin-sql-sqlite \
             -no-phonon \
             -no-phonon-backend \
@@ -198 +201 @@
     <para>
       Remove references to the build directory from installed files by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find /usr/lib/libQt*.prl -exec sed -i -e \
-     '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-find /usr/lib/pkgconfig/Qt*.pc -exec perl -pi -e \
-     "s, -L$(basename $PWD)/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Fix pkg-config files to point to the correct bindir by
       running the following command as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>find /usr/lib/pkgconfig/Qt*.pc -exec sed -i -e \
-     "s@/usr/bin/@/usr/lib/qt4/bin/@g" {} \;</userinput></screen>
+<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
+            Designer Gui Help Multimedia Network OpenGL Script \
+            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml
+do
+  sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
+       /usr/lib/libQt${file}.prl
+  perl -pi -e "s, -L$PWD/?\S+,,g" /usr/lib/pkgconfig/Qt${file}.pc
+done
+unset file</userinput></screen>
 
     <para>
@@ -232 +231 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i "..." ...</command>: This command fixes
+      detection of <application>libmng</application> 2.0.
+    </para>
 
     <para>
@@ -290 +294 @@
       <parameter>-optimized-qmake</parameter>: This switch enables
       building of the optimized <command>qmake</command> program.
-    </para>
-
-    <para>
-      <parameter>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>:
-      These switches enable SQL support in the
-      <application>Qt</application> libraries. Available drivers are:
-      ibase, mysql, psql, sqlite and odbc.
     </para>
 

x/lib/qt5.xml

@@ -167 +167 @@
 
     <para>
-      Remove references to the build directory from pkg-confg
-      files by running the following command:
+      Remove references to the build directory from the installed
+      <filename class="extension">.pc</filename> files by running
+      the following command:
     </para>