Changeset 41ddd5f

Timestamp:

03/02/2014 03:40:57 AM (10 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.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:

4b072fd

Parents:

3b00d20

Message:

tag gnash and rename qt to qt4 in Qt-4.8.5.

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

Files:

• x/lib/qt4.xml (modified) (7 diffs)
• xsoft/other/gnash.xml (modified) (1 diff)

x/lib/qt4.xml

@@ -233 +233 @@
 
 <screen><userinput>export QTDIR=/opt/qt-&qt4-version; &amp;&amp;
-export QTLINK=/opt/qt &amp;&amp;
+export QTLINK=/opt/qt4 &amp;&amp;
 
 sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
@@ -265 +265 @@
 
 <screen role="root"><userinput>make install
-ln -svfn $QTDIR /opt/qt</userinput></screen>
+ln -svfn $QTDIR /opt/qt4</userinput></screen>
 
     <para>
@@ -274 +274 @@
 
 <screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
-   sed -r '/^QMAKE_PRL_BUILD_DIR/d'    \
-       -r 's/(QMAKE_PRL_LIBS =).*/\1/' \
-       -i $QTDIR/lib/${file}.prl
+       sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
+              -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
+              -i $QTDIR/lib/${file}.prl
 
    perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
@@ -462 +462 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt.sh
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt4.sh
 
 QTDIR=/usr
 export QTDIR
 
-# End /etc/profile.d/qt.sh</literal>
+# End /etc/profile.d/qt4.sh</literal>
 EOF</userinput></screen>
 
@@ -485 +485 @@
 <literal># Begin Qt addition
    
-/opt/qt/lib
+/opt/qt4/lib
    
 # End Qt addition</literal>
@@ -498 +498 @@
    <para>
       As the <systemitem class="username">root</systemitem> user, create
-      the <filename>/etc/profile.d/qt.sh</filename> file:
+      the <filename>/etc/profile.d/qt4.sh</filename> file:
    </para>
    
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt.sh
-   
-QTDIR=/opt/qt
-   
-pathappend /opt/qt/bin           PATH
-pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt4.sh
+   
+QTDIR=/opt/qt4
+   
+pathappend /opt/qt4/bin           PATH
+pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
    
 export QTDIR
    
-# End /etc/profile.d/qt.sh</literal>
+# End /etc/profile.d/qt4.sh</literal>
 EOF</userinput></screen>
 
@@ -553 +553 @@
           /usr/share/qt4 
           OR 
-          /opt/qt and 
+          /opt/qt4 and 
           /opt/qt-&qt4-version;
         </seg>

xsoft/other/gnash.xml

@@ -38 +38 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>