Changeset 87ff6f30

Timestamp:

12/19/2016 09:36:08 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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

Children:

ab31930

Parents:

c6ea0bd

Message:

Add instructions to graphviz and cmake that avoid installing files in /usr/lib64.
Update to poppler-0.50.0
Update to libqmi-1.16.2

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

Files:

• general/genlib/libqmi.xml (modified) (1 diff)
• general/genutils/graphviz.xml (modified) (2 diffs)
• general/graphlib/poppler.xml (modified) (3 diffs)
• general/prog/cmake.xml (modified) (2 diffs)
• general/prog/perl-modules.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• x/installing/xorg7.xml (modified) (3 diffs)

general/genlib/libqmi.xml

@@ -7 +7 @@
   <!ENTITY libqmi-download-http "http://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
   <!ENTITY libqmi-download-ftp  " ">
-  <!ENTITY libqmi-md5sum        "4970c110f160b33637a3515004c637b2">
+  <!ENTITY libqmi-md5sum        "052318439128e428b1a41e75a605d91f">
   <!ENTITY libqmi-size          "720 KB">
-  <!ENTITY libqmi-buildsize     "73 MB (with tests)">
+  <!ENTITY libqmi-buildsize     "48 MB (with tests)">
   <!ENTITY libqmi-time          "0.4 SBU (with tests)">
 ]>

general/genutils/graphviz.xml

@@ -146 +146 @@
 
 <screen><userinput>patch -Np1 -i ../graphviz-&graphviz-version;-consolidated_fixes-1.patch &amp;&amp;
+
+sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
+
 autoreconf                               &amp;&amp;
 ./configure --prefix=/usr --disable-php  &amp;&amp;
@@ -176 +179 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed ... configure.ac</command>: This command is needed to 
+      avoid installing files in /usr/lib64.
+    </para>
 
     <para>

general/graphlib/poppler.xml

@@ -7 +7 @@
   <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "9e057ed8eee1f9979fa75d8f044783b8">
+  <!ENTITY poppler-md5sum             "1a4c0cd873bddd8f266b85ab8d799962">
   <!ENTITY poppler-size               "1.6 MB">
   <!ENTITY poppler-buildsize          "49 MB (with Qt5 library)">
@@ -170 +170 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr               \
+<!-- Note: the sed is needed even if the /usr/lib64 symlink is not present -->
+
+<screen><userinput>sed -i "/was moved/s/^/#/" ltmain.sh &amp;&amp;
+
+./configure --prefix=/usr               \
             --sysconfdir=/etc           \
             --disable-static            \
@@ -225 +229 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed ... ltmain.sh</command>: This command removes a lot
+      of irritating invalid warnings.
+    </para>
 
     <para>

general/prog/cmake.xml

@@ -112 +112 @@
     </para>
 
-<screen><userinput>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt &amp;&amp;
+<screen><userinput>sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt     &amp;&amp;
+sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake &amp;&amp;
 
 ./bootstrap --prefix=/usr       \
@@ -153 +154 @@
       <command>sed ... CMakeLists.txt</command>: This command
       disables the attempt to use the external libuv library.
+    </para>
+
+    <para>
+      <command>sed ... Modules/GNUInstallDirs.cmake</command>: 
+      This command disables applications using cmake from attempting to 
+      install files in /usr/lib64/.
     </para>
 

general/prog/perl-modules.xml

@@ -1259 +1259 @@
     <bridgehead renderas="sect3" id="perl-log-log4perl"
     xreflabel="Log::Log4perl-&Log-Log4perl-version;">
-    Log-Log4perl-&Log-Log4perl-version;</bridgehead>
+    Log::Log4perl-&Log-Log4perl-version;</bridgehead>
 
     <indexterm zone="perl-modules perl-log-log4perl">
@@ -1265 +1265 @@
     </indexterm>
 
-    <para>Log-Log4perl provides a Log4j implementation for
+    <para>Log::Log4perl provides a Log4j implementation for
     <application>perl</application>. This module uses the
     standard <xref linkend="perl-standard-install"/>.</para>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <para>December 19th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add instructions to graphviz and cmake that
+          avoid installing files in /usr/lib64. </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-0.50.0. Fixes
+          <ulink url="&blfs-ticket-root;8646">#8646</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libqmi-1.16.2. Fixes
+          <ulink url="&blfs-ticket-root;8514">#8514</ulink>.</para>
+        </listitem>
         <listitem revision="systemd">
           <para>[renodr] - Update to colord-1.3.4. Fixes

packages.ent

@@ -137 +137 @@
 <!ENTITY libnfsidmap-version          "0.26">
 <!ENTITY libpaper-version             "1.1.24+nmu5">
-<!ENTITY libqmi-version               "1.16.0">
+<!ENTITY libqmi-version               "1.16.2">
 <!ENTITY libsigc-version              "2.10.0">
 <!ENTITY libsigsegv-version           "2.10">
@@ -199 +199 @@
 <!ENTITY openjpeg2-version            "2.1.2">
 <!ENTITY pixman-version               "0.34.0">   <!-- Even minors only -->
-<!ENTITY poppler-version              "0.49.0">
+<!ENTITY poppler-version              "0.50.0">
 <!ENTITY qpdf-version                 "6.0.0">
 

x/installing/xorg7.xml

@@ -156 +156 @@
 pathappend $XORG_PREFIX/include         CPLUS_INCLUDE_PATH
 
-ACLOCAL='aclocal -I $XORG_PREFIX/share/aclocal'
+ACLOCAL="aclocal -I $XORG_PREFIX/share/aclocal"
 
 export PATH PKG_CONFIG_PATH ACLOCAL LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
@@ -189 +189 @@
 
 <screen role="root"><userinput>ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
-
+<!--
     <para>Finally, if building on x86_64, you will need to create the
     <filename class="directory">$XORG_PREFIX/lib</filename> directory and the
@@ -199 +199 @@
 install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
 ln -sf lib $XORG_PREFIX/lib64</userinput></screen>
-
+-->
   </sect2>