[blfs-book] r11678 - in trunk/BOOK: . general/graphlib introduction/welcome x/lib

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Fri Aug 23 11:14:58 PDT 2013


Author: krejzi
Date: Fri Aug 23 11:14:58 2013
New Revision: 11678

Log:
libmng 2.0.2

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/libmng.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt5.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Fri Aug 23 04:37:46 2013	(r11677)
+++ trunk/BOOK/general.ent	Fri Aug 23 11:14:58 2013	(r11678)
@@ -294,7 +294,7 @@
 <!ENTITY libexif-version              "0.6.21">
 <!ENTITY libjpeg-version              "8d">
 <!ENTITY libjpeg-turbo-version        "1.3.0">
-<!ENTITY libmng-version               "1.0.10">
+<!ENTITY libmng-version               "2.0.2">
 <!ENTITY libpng-version               "1.6.3">
 <!ENTITY librsvg-version              "2.37.0">   <!-- Required version in order to use
                                                        svg pixbuf loader. -->

Modified: trunk/BOOK/general/graphlib/libmng.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libmng.xml	Fri Aug 23 04:37:46 2013	(r11677)
+++ trunk/BOOK/general/graphlib/libmng.xml	Fri Aug 23 11:14:58 2013	(r11678)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libmng-download-http "&sourceforge-repo;/libmng/libmng-&libmng-version;.tar.bz2">
+  <!ENTITY libmng-download-http "&sourceforge-repo;/libmng/libmng-&libmng-version;.tar.xz">
   <!ENTITY libmng-download-ftp  " ">
-  <!ENTITY libmng-md5sum        "eaf1476a3bb29f6190bca660e6abef16">
-  <!ENTITY libmng-size          "840 KB">
-  <!ENTITY libmng-buildsize     "7.9 MB">
-  <!ENTITY libmng-time          "0.1 SBU">
+  <!ENTITY libmng-md5sum        "3804bf2523af9b4e0670b5982b3bf984">
+  <!ENTITY libmng-size          "932 KB">
+  <!ENTITY libmng-buildsize     "15 MB">
+  <!ENTITY libmng-time          "0.2 SBU">
 ]>
 
 <sect1 id="libmng" xreflabel="libmng-&libmng-version;">
@@ -60,8 +60,10 @@
     <bridgehead renderas="sect3">libmng Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libjpeg"/> and
-    <xref linkend="lcms"/></para>
+    <para role="required">
+      <xref linkend="libjpeg"/> and
+      <xref linkend="lcms2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libmng"/></para>
@@ -74,38 +76,31 @@
     <para>Install <application>libmng</application> by running the following
     commands:</para>
 
-<screen><userinput>cp makefiles/makefile.linux Makefile         &&
-sed -i -e 's/unroll-loops/& -fPIC/' Makefile &&
+<screen><userinput>sed -i "s:#include <jpeg:#include <stdio.h>\n&:" libmng_types.h &&
+./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//' Makefile &&
-make prefix=/usr install &&
-install -v -m644 doc/man/*.3 /usr/share/man/man3 &&
-install -v -m644 doc/man/*.5 /usr/share/man/man5 &&
+<screen role="root"><userinput>make install &&
 install -v -m755 -d /usr/share/doc/libmng-&libmng-version; &&
-install -v -m644 doc/*.{png,txt} /usr/share/doc/libmng-&libmng-version;</userinput></screen>
+install -v -m644 doc/*.txt /usr/share/doc/libmng-&libmng-version;</userinput></screen>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>cp makefiles/makefile.linux Makefile</command>: There are no
-    autotools shipped with this package. The Linux <filename>Makefile</filename>
-    is copied to the root of the source tree, facilitating the installation.</para>
+    <para>
+      <command>sed -i "..." libmng_types.h</command>: This command adds a
+      missing header which would cause other apps that link to this
+      package fail to compile.
+    </para>
 
-    <para><command>sed -i -e 's/unroll-loops/& -fPIC/' Makefile</command>:
-    Add a gcc option to make the build compatible with x86_64 systems.</para>
-
-    <para><command>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//' Makefile</command>
-    This command disables installing the static library.</para>
-
-    <para><command>install ...</command>: The documentation files are not
-    installed by the installation procedure, so they are copied manually.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Fri Aug 23 04:37:46 2013	(r11677)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Fri Aug 23 11:14:58 2013	(r11678)
@@ -47,7 +47,12 @@
       <para>August 23nd, 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[fernando] - freetype: comment broken ftp link; compressdoc: note to alternatively use editor; cacerts: change wget to recommended and cut-and-pasting to copy-and-pasting.</para>
+          <para>[fernando] - freetype: comment broken ftp link; compressdoc:
+          note to alternatively use editor; cacerts: change wget to
+          recommended and cut-and-pasting to copy-and-pasting.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libmng 2.0.2.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml	Fri Aug 23 04:37:46 2013	(r11677)
+++ trunk/BOOK/x/lib/qt5.xml	Fri Aug 23 11:14:58 2013	(r11678)
@@ -77,16 +77,6 @@
       </listitem>
     </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>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -149,7 +139,11 @@
       following commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../qt-&qt5-version;-bison_fixes-1.patch &&
+<screen><userinput>sed -i "s:Context\* context}:&\n%lex-param {YYLEX_PARAM}:" \
+     qtwebkit/Source/ThirdParty/ANGLE/src/compiler/glslang.y &&
+
+sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+     qtimageformats/config.tests/libmng/libmng.cpp &&
 
 ./configure -prefix /usr                \
             -sysconfdir /etc/xdg        \
@@ -165,7 +159,6 @@
             -dbus-linked       \
             -openssl-linked    \
             -system-sqlite     \
-            -plugin-sql-sqlite \
             -no-nis            \
             -nomake examples   \
             -opengl es2        \
@@ -310,6 +303,13 @@
     <title>Command Explanations</title>
 
     <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.
     </para>
@@ -352,13 +352,6 @@
     </para>
 
     <para>
-      <parameter>-plugin-sql-<replaceable><driver></replaceable></parameter>:
-      These switches enable SQL support in the
-      <application>Qt</application> libraries. Available drivers are:
-      ibase, mysql, psql, sqlite and odbc.
-    </para>
-
-    <para>
       <parameter>-opengl es2</parameter>: This switch enables OpenGL ES2
       support in <application>Qt</application>.
     </para>



More information about the blfs-book mailing list