Changeset 21c0f032 for x

Timestamp:

06/26/2015 12:22:19 AM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

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

Children:

9c20252

Parents:

c2de366

Message:

Tag CVS-1.11.23 for gcc5 and include Command Explanations.
Qt-4.8.7 and Qt-5.4.2: typos, tweaks and fixes.

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

Location:

x/lib

Files:

• qt4.xml (modified) (4 diffs)
• qt5.xml (modified) (3 diffs)

x/lib/qt4.xml

@@ -8 +8 @@
   <!ENTITY qt4-url   "http://download.qt-project.org/official_releases/qt/&qt4-major;">
 
-  <!ENTITY qt4-download-http
-           "&qt4-url;;/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
+  <!ENTITY qt4-download-http "&qt4-url;/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
   <!ENTITY qt4-download-ftp  " ">
   <!ENTITY qt4-md5sum        "d990ee66bf7ab0c785589776f35ba6ad">
@@ -184 +183 @@
       <para>
         The build time and space required for the full
-        <application>Qt3</application> is quite long. The instructions below do
+        <application>Qt4</application> is quite long. The instructions below do
         not build the tutorials and examples. Removing the
         <parameter>-nomake</parameter> lines will create a complete build.
@@ -240 +239 @@
 <screen role="root"><userinput>make install &amp;&amp;
 rm -rf $QT4PREFIX/tests</userinput></screen>
-
+<!--
     <para>
       Remove references to the build directory from the installed
@@ -247 +246 @@
     </para>
 
-<screen><userinput>find $QT4PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Remove references to the build directory in the installed library dependency
-      (prl) files by running the following command as the
+<screen><userinput>find $QT4PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>-->
+
+    <para>
+      Remove references to the build directory in the installed library
+      dependency (prl) files by running the following command as the
       <systemitem class="username">root</systemitem> user:
     </para>

x/lib/qt5.xml

@@ -253 +253 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
+<!--
     <para>
       Remove references to the build directory from the installed
@@ -260 +260 @@
     </para>
 
-<screen><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed library dependency
-      (prl) and profile include (pri) files by running the following commands as 
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
-    -i $QT5PREFIX/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
-
-find $QT5PREFIX/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
-     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
+<screen><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>-->
+
+    <para>
+      Remove references to the build directory from installed library
+      dependency (prl) and profile include (pri) files by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>find $QT5PREFIX -name qt_lib_bootstrap_private.pri \
+   -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
+
+find $QT5PREFIX -name \*.prl \
+   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
 
     <para>
@@ -354 +354 @@
 EOF</userinput></screen>
 
-    <para>Some packages such as <xref linkend='vlc'/> look for certain
+    <para>Some packages<!-- such as <xref linkend='vlc'/>--> look for certain
     executables with a -qt5 suffix.  Run the following command as the root user
     to create the necessary symlinks:</para>