Changeset 5cc2395 for chapter06/gettext.xml

Timestamp:

04/11/2018 09:37:07 PM (6 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

597019b

Parents:

c9627324

Message:

Fix appdata.loc file in gettext.
Update to linux-4.16.1.
Update to procps-ng-3.3.14.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11399 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/gettext.xml (modified) (2 diffs)

chapter06/gettext.xml

@@ -44 +44 @@
     <title>Installation of Gettext</title>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
+   <!-- This has been fixed in upstream gnulib, when a new version of
    gettext is released, please check #4055 to see if the change has been
-   picked up in this package -->
+   picked up in this package 
+   
+   As of April 11, 2018, 'TESTS = test-lock' is in gettext-runtime/tests/Makefile.am
+   Perhaps the test is fixed.
+
+   There is no reference to 'test' or TEST in  gettext-tools/gnulib-tests/Makefile.am
+   -->
    <para>First, suppress two invocations of test-lock which on some machines
    can loop forever:</para>
@@ -52 +58 @@
 <screen><userinput remap="pre">sed -i '/^TESTS =/d' gettext-runtime/tests/Makefile.in &amp;&amp;
 sed -i 's/test-lock..EXEEXT.//' gettext-tools/gnulib-tests/Makefile.in</userinput></screen>
+
+   <!-- As of April 11, 2018 appdata.* is NOT in git master, but appears
+   to be in metainfo.{its,loc},  When updating, check BLFS gnome-screenshot. -->
+   <para>Now fix a configuration file:</para>
+
+<screen><userinput remap="pre">sed -e '/AppData/N;N;p;s/\.appdata\./.metainfo./' \
+    -i gettext-tools/its/appdata.loc</userinput></screen>
 
     <para>Prepare Gettext for compilation:</para>