Changeset eb32964

Timestamp:

04/13/2015 10:56:22 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:

5eee16a

Parents:

70f1af0

Message:

FFmpeg-2.6.2: minor formatting.
Setting the PATH for TeX Live: minor formatting.
Qt-5.4.1: fix build of Qt Web Kit against glib-2.43 or newer.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/ffmpeg.xml (modified) (1 diff)
• pst/typesetting/tex-path.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 12th, &year;">
+<!ENTITY releasedate  "April 13th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>April 13th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Qt-5.4.1: fix build of Qt Web Kit against
+          glib-2.43 or newer.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 12th, 2015</para>
       <itemizedlist>

multimedia/videoutils/ffmpeg.xml

@@ -171 +171 @@
 <screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;
 
-./configure --prefix=/usr       \
-            --enable-gpl        \
-            --enable-version3   \
-            --enable-nonfree    \
-            --disable-static    \
-            --enable-shared     \
-            --disable-debug     \
-            --enable-libass     \
-            --enable-libfdk-aac \
+./configure --prefix=/usr        \
+            --enable-gpl         \
+            --enable-version3    \
+            --enable-nonfree     \
+            --disable-static     \
+            --enable-shared      \
+            --disable-debug      \
+            --enable-libass      \
+            --enable-libfdk-aac  \
             --enable-libfreetype \
-            --enable-libmp3lame \
-            --enable-libopus    \
-            --enable-libtheora  \
-            --enable-libvorbis  \
-            --enable-libvpx     \
-            --enable-libx264    \
-            --enable-x11grab    \
+            --enable-libmp3lame  \
+            --enable-libopus     \
+            --enable-libtheora   \
+            --enable-libvorbis   \
+            --enable-libvpx      \
+            --enable-libx264     \
+            --enable-x11grab     \
             --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
 

pst/typesetting/tex-path.xml

@@ -30 +30 @@
 
 cat >> /etc/profile.d/extrapaths.sh << EOF
+<literal>
+# Begin texlive addition
+
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/man  MANPATH
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/info INFOPATH
 pathappend /opt/texlive/&texlive-year;/bin/$TEXARCH
+
+# End texlive addition
+</literal>
 EOF
 

x/lib/qt5.xml

@@ -157 +157 @@
       </para>
     </warning>
+
+    <para>
+     If you wish to build the Qt Web Kit against glib-2.43 or newer, removing
+     the <command>configure</command> switch line <quote>-skip qtwebengine
+     ...</quote> below, both Methods need a fix:
+    </para>
+
+<screen role="root"><userinput>sed -i 's/GMutexLocker locker/WebCore::&amp;/' \
+       qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</userinput></screen>
 
 <!-- ==== Method 1 ====== -->