Changeset 6c7866b4 for x

Timestamp:

08/23/2013 06:14:58 PM (11 years ago)

Author:

Krejzi <krejzi@…>

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:

a6c6923

Parents:

f0dfc28

Message:

libmng 2.0.2

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

File:

• x/lib/qt5.xml (modified) (5 diffs)

x/lib/qt5.xml

@@ -78 +78 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-&qt5-version;-bison_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -150 +140 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-bison_fixes-1.patch &amp;&amp;
+<screen><userinput>sed -i "s:Context\* context}:&amp;\n%lex-param {YYLEX_PARAM}:" \
+     qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y &amp;&amp;
+
+sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+     qtimageformats/config.tests/libmng/libmng.cpp &amp;&amp;
 
 ./configure -prefix /usr                \
@@ -166 +160 @@
             -openssl-linked    \
             -system-sqlite     \
-            -plugin-sql-sqlite \
             -no-nis            \
             -nomake examples   \
@@ -311 +304 @@
 
     <para>
+      <command>sed -i "..." ...</command>: First command fixes
+      building with <application>Bison</application> 3.0 and
+      second command fixes detection of
+      <application>libmng</application> 2.0.
+    </para>
+
+    <para>
       <parameter>-confirm-license</parameter>: Accept license
       without prompting user during configuration.
@@ -350 +350 @@
       <application>Qt</application> libraries instead of
       <command>dlopen()</command>-ing them.
-    </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>