Author: bdubbs
Date: Sun Sep 10 13:20:18 2017
New Revision: 19202

Log:
Update to btrfs-progs-4.13. 
Update to File-Which-1.22 (perl module). 
Add inkscape patch to use latest poppler.

Modified:
   trunk/BOOK/general/prog/perl-modules.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/postlfs/filesystems/btrfs-progs.xml
   trunk/BOOK/xsoft/other/inkscape.xml

Modified: trunk/BOOK/general/prog/perl-modules.xml
==============================================================================
--- trunk/BOOK/general/prog/perl-modules.xml    Sun Sep 10 12:28:25 2017        
(r19201)
+++ trunk/BOOK/general/prog/perl-modules.xml    Sun Sep 10 13:20:18 2017        
(r19202)
@@ -60,7 +60,7 @@
   <!ENTITY File-Slurp-md5sum "7d584cd15c4f8b9547765eff8c4ef078">
 
   <!ENTITY File-Which-download-http 
"&perl_authors;/id/P/PL/PLICEASE/File-Which-&File-Which-version;.tar.gz">
-  <!ENTITY File-Which-md5sum "115a6efe5d7e9621237fcb655c7a0980">
+  <!ENTITY File-Which-md5sum "face60fafd220dc83fa581ef6f96d480">
 
   <!ENTITY HTML-Parser-download-http 
"&perl_authors;/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
   <!ENTITY HTML-Parser-md5sum "eb7505e5f626913350df9dd4a03d54a8">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun Sep 10 12:28:25 
2017        (r19201)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Sep 10 13:20:18 
2017        (r19202)
@@ -46,6 +46,18 @@
       <para>September 10th, 2017</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-4.13. Fixes
+          <ulink url="&blfs-ticket-root;9734">#9734</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to File-Which-1.22 (perl module). Fixes
+          <ulink url="&blfs-ticket-root;9733">#9733</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add inkscape patch to use latest poppler. Fixes
+          <ulink url="&blfs-ticket-root;9733">#9733</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to mutt-1.9.0. Fixes
           <ulink url="&blfs-ticket-root;9699">#9699</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Sun Sep 10 12:28:25 2017        (r19201)
+++ trunk/BOOK/packages.ent     Sun Sep 10 13:20:18 2017        (r19202)
@@ -48,7 +48,7 @@
 <!ENTITY volume_key-version           "0.3.9">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "4.12.1">
+<!ENTITY btrfs-progs-version          "4.13">
 <!ENTITY dosfstools-version           "4.1">
 <!ENTITY fuse3-version                "3.1.1">
 <!ENTITY fuse2-version                "2.9.7">
@@ -358,7 +358,7 @@
 <!ENTITY Error-version                "0.17025">
 <!ENTITY File-BaseDir-version         "0.07">
 <!ENTITY File-Slurp-version           "9999.19">
-<!ENTITY File-Which-version           "1.21">
+<!ENTITY File-Which-version           "1.22">
 <!ENTITY HTML-Parser-version          "3.72">
 <!ENTITY IPC-Run3-version             "0.048">
 <!ENTITY Lingua-Translit-version      "0.27">

Modified: trunk/BOOK/postlfs/filesystems/btrfs-progs.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/btrfs-progs.xml      Sun Sep 10 12:28:25 
2017        (r19201)
+++ trunk/BOOK/postlfs/filesystems/btrfs-progs.xml      Sun Sep 10 13:20:18 
2017        (r19202)
@@ -6,7 +6,7 @@
 
   <!ENTITY btrfs-progs-download-http 
"&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "ef6dc0caff8b51daf4bed5f25ed003d5">
+  <!ENTITY btrfs-progs-md5sum        "321c0161f0f26db0cbda73e6ca4d9056">
   <!ENTITY btrfs-progs-size          "1.6 MB">
   <!ENTITY btrfs-progs-buildsize     "44 MB (add 94 MB for tests)">
   <!ENTITY btrfs-progs-time          "0.3 SBU (add 10 SBU for tests)">
@@ -88,7 +88,8 @@
 <screen><literal>File systems ---&gt;
   &lt;*/M&gt; Btrfs filesystem support [CONFIG_BTRFS_FS]</literal></screen>
 
-    <note><para>CONFIG_BTRFS_FS_POSIX_ACL is required for the tests.
+    <note><para>CONFIG_BTRFS_FS_POSIX_ACL and 
+    CONFIG_REISERFS_FS_XATTR are required for some tests.
     Other Btrfs options in the kernel are optional.</para></note>
 
     <indexterm zone="btrfs-progs btrfs-progs-kernel">
@@ -115,11 +116,12 @@
 
 <screen><userinput>make fssum &amp;&amp;
 
-mv tests/convert-tests/007-unsupported-block-sizes/test.sh{,.broken} &amp;&amp;
-mv tests/misc-tests/014-filesystem-label/test.sh{,.broken}           &amp;&amp;
-mv tests/misc-tests/016-send-clone-src/test.sh.broken{,.broken}      &amp;&amp;
-mv tests/fuzz-tests/003-multi-check-unmounted/test.sh{,.broken}      &amp;&amp;
-mv tests/fuzz-tests/004-simple-dump-tree/test.sh{,.broken}           &amp;&amp;
+sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;
+
+mv tests/cli-tests/007-check-force/test.sh{,.broken}            &amp;&amp;
+mv tests/convert-tests/010-reiserfs-basic/test.sh{,.broken}     &amp;&amp;
+mv tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh{,.broken} 
&amp;&amp;
+mv tests/fuzz-tests/003-multi-check-unmounted/test.sh{,.broken} &amp;&amp;
 mv tests/fuzz-tests/009-simple-zero-log/test.sh{,.broken}</userinput></screen>
 
     <para>To test the results, issue (as the <systemitem
@@ -154,7 +156,7 @@
     <para><option>--disable-documentation</option>: This option
     is needed if the recommended dependencies are not installed.</para>
 
-    <para><command>mv tests/fuzz-tests/ ...</command>: Disables
+    <para><command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: 
Disables
     tests that fail and prevent tests from completing.</para>
 
     <para><command>ln -s ... /usr/lib/libbtrfs.so</command>: Creates a 

Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Sun Sep 10 12:28:25 2017        (r19201)
+++ trunk/BOOK/xsoft/other/inkscape.xml Sun Sep 10 13:20:18 2017        (r19202)
@@ -75,6 +75,9 @@
       <listitem>
         <para>Required patch: <ulink 
url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Required patch: <ulink 
url="&patch-root;/inkscape-&inkscape-version;-poppler-1.patch"/></para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
@@ -138,9 +141,12 @@
   <sect2 role="installation">
     <title>Installation of Inkscape</title>
 
-    <para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be 
used:</para>
+    <para>Ensure that the libraries from <xref linkend="imagemagick6"/> and 
+    <xref linkend="poppler"/> can be used:</para>
 
-<screen><userinput>patch -Np1 -i 
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i 
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &amp;&amp;
+patch -Np1 -i ../inkscape-&inkscape-version;-poppler-1.patch
+</userinput></screen>
 
     <para>
       Fix a build issue with <application>GCC-7.1</application>:
@@ -154,7 +160,9 @@
       <application>googlemock</application> by running:
     </para>
 
+<!-- If there is no test suite, then this is not needed
 <screen><userinput>bash download-gtest.sh</userinput></screen>
+-->
 
     <para>
       Install <application>Inkscape</application> by running the following
@@ -162,12 +170,11 @@
     </para>
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build    &amp;&amp;
+cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       ..                          &amp;&amp;
-
 make</userinput></screen>
 
     <para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to