[blfs-book] r21532 - in trunk/BOOK: gnome/applications introduction/welcome server/mail xincludes

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed May 1 10:14:16 PDT 2019


Author: pierre
Date: Wed May  1 10:14:16 2019
New Revision: 21532

Log:
Various fixes and nits:
- gnome-calculator: fix building with vala-0.44.x
- sendmail: don't use an unset variable
- file-roller: separate install and configuration
- xincludes: fix updating the icon cache and the desktop database

Modified:
   trunk/BOOK/gnome/applications/file-roller.xml
   trunk/BOOK/gnome/applications/gnome-calculator.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/server/mail/sendmail.xml
   trunk/BOOK/xincludes/gtk-update-icon-cache.xml
   trunk/BOOK/xincludes/update-desktop-database.xml
   trunk/BOOK/xincludes/update-icons-and-desktop.xml

Modified: trunk/BOOK/gnome/applications/file-roller.xml
==============================================================================
--- trunk/BOOK/gnome/applications/file-roller.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/gnome/applications/file-roller.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -134,10 +134,13 @@
     </para>
 
 <screen role="root"><userinput>ninja install &&
-chmod -v 0755 /usr/libexec/file-roller/isoinfo.sh &&
-glib-compile-schemas /usr/share/glib-2.0/schemas</userinput></screen>
+chmod -v 0755 /usr/libexec/file-roller/isoinfo.sh</userinput></screen>
 
-<!-- There is a possibilty that glib-compile-schemas needs to be run. -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                href="../../xincludes/gsettings-destdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                href="../../xincludes/update-icons-and-desktop.xml"/>
 
   </sect2>
 

Modified: trunk/BOOK/gnome/applications/gnome-calculator.xml
==============================================================================
--- trunk/BOOK/gnome/applications/gnome-calculator.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/gnome/applications/gnome-calculator.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -97,6 +97,15 @@
   <sect2 role="installation">
     <title>Installation of GNOME Calculator</title>
 
+<!-- Should not be needed with next version -->
+    <para>
+      First apply an upstream fix to prevent a type mismatch flagged as an
+      error by vala-0.44.x:
+    </para>
+
+<screen><userinput>sed -e 's/token_list\.copy()/token_list.copy_deep((CopyFunc) Object.ref)/' \
+    -i lib/equation-parser.vala</userinput></screen>
+
     <para>
       Install <application>GNOME Calculator</application> by running
       the following commands:

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -46,6 +46,17 @@
       <para>May 1st, 2019</para>
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Fix the instructions for updating the icon cache
+          and the desktop database.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Fix building gnome-calculator with
+          vala-0.44.x.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Remove an unset variable in sendmail.</para>
+        </listitem>
+        <listitem>
           <para>[timtas] - Update to dovecot-2.3.6. Fixes
           <ulink url="&blfs-ticket-root;12005">#12005</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/server/mail/sendmail.xml
==============================================================================
--- trunk/BOOK/server/mail/sendmail.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/server/mail/sendmail.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -122,7 +122,7 @@
     <para>Install <application>sendmail</application> with the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i $DIR/sendmail.&sendmail-version;-openssl-1.patch &&
+<screen><userinput>patch -Np1 -i ../sendmail.&sendmail-version;-openssl-1.patch &&
 
 cat >> devtools/Site/site.config.m4 << "EOF"
 <literal>define(`confMANGRP',`root')

Modified: trunk/BOOK/xincludes/gtk-update-icon-cache.xml
==============================================================================
--- trunk/BOOK/xincludes/gtk-update-icon-cache.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/xincludes/gtk-update-icon-cache.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -16,5 +16,5 @@
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>gtk-update-icon-cache</userinput></screen>
+<screen role="root"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor</userinput></screen>
     </note>

Modified: trunk/BOOK/xincludes/update-desktop-database.xml
==============================================================================
--- trunk/BOOK/xincludes/update-desktop-database.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/xincludes/update-desktop-database.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -16,5 +16,5 @@
         command as the <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>update-desktop-database</userinput></screen>
+<screen role="root"><userinput>update-desktop-database -q</userinput></screen>
     </note>

Modified: trunk/BOOK/xincludes/update-icons-and-desktop.xml
==============================================================================
--- trunk/BOOK/xincludes/update-icons-and-desktop.xml	Wed May  1 08:12:47 2019	(r21531)
+++ trunk/BOOK/xincludes/update-icons-and-desktop.xml	Wed May  1 10:14:16 2019	(r21532)
@@ -21,6 +21,6 @@
         <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>gtk-update-icon-cache &&
-update-desktop-database</userinput></screen>
+<screen role="root"><userinput>gtk-update-icon-cache -qtf /usr/share/icons/hicolor &&
+update-desktop-database -q</userinput></screen>
     </note>


More information about the blfs-book mailing list