From 1c9731c0078af00db31354f8513dea83a64d5d7e Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Fri, 27 Oct 2017 05:39:39 +0000
Subject: [PATCH] Update to gvfs-1.34.0. Update to gnome-disk-utility-3.26.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19392 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome.ent                                 |  4 +--
 gnome/applications/gnome-disk-utility.xml | 31 +++++++++--------------
 gnome/platform/gvfs.xml                   | 21 +++++++--------
 introduction/welcome/changelog.xml        |  6 +++++
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index 27909a692c..66f312de63 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -45,7 +45,7 @@
 <!ENTITY dconf-version                     "0.26.1">
 <!ENTITY dconf-editor-version              "3.26.1">
 <!ENTITY gnome-backgrounds-version         "3.26.2">
-<!ENTITY gvfs-version                      "1.32.1">
+<!ENTITY gvfs-version                      "1.34.1">
 <!ENTITY nautilus-version                  "3.24.2.1">
 <!ENTITY zenity-version                    "3.24.0">
 <!ENTITY gnome-bluetooth-version           "3.20.1">
@@ -80,7 +80,7 @@
 <!ENTITY gedit-version                     "3.22.1">
 <!ENTITY gnome-calculator-version          "3.24.0">
 <!ENTITY gnome-color-manager-version       "3.24.0">
-<!ENTITY gnome-disk-utility-version        "3.24.1">
+<!ENTITY gnome-disk-utility-version        "3.26.1">
 <!ENTITY gnome-logs-version                "3.24.2">
 <!ENTITY gnome-maps-version                "3.24.3">
 <!ENTITY gnome-nettool-version             "3.8.1">
diff --git a/gnome/applications/gnome-disk-utility.xml b/gnome/applications/gnome-disk-utility.xml
index 30ce3b7adb..883f8fcd73 100644
--- a/gnome/applications/gnome-disk-utility.xml
+++ b/gnome/applications/gnome-disk-utility.xml
@@ -5,13 +5,13 @@
   %general-entities;
 
   <!ENTITY gnome-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-24;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+           "&gnome-download-http;/gnome-disk-utility/&gnome-minor-26;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
   <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-24;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "42c24b84d657c8828023740131bcd36e">
-  <!ENTITY gnome-disk-utility-size          "1.9 MB">
-  <!ENTITY gnome-disk-utility-buildsize     "37 MB">
-  <!ENTITY gnome-disk-utility-time          "0.2 SBU">
+           "&gnome-download-ftp;/gnome-disk-utility/&gnome-minor-26;/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
+  <!ENTITY gnome-disk-utility-md5sum        "60c301112e202706e688a1634a881247">
+  <!ENTITY gnome-disk-utility-size          "1.6 MB">
+  <!ENTITY gnome-disk-utility-buildsize     "34 MB">
+  <!ENTITY gnome-disk-utility-time          "less than 0.1 SBU">
 ]>
 
 <sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;" revision="systemd">
@@ -103,10 +103,11 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+meson --prefix=/usr \
+      --sysconfdir=/etc &amp;&amp;
+ninja</userinput></screen>
 
     <para>
       This package does not come with a test suite.
@@ -116,15 +117,7 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
 
diff --git a/gnome/platform/gvfs.xml b/gnome/platform/gvfs.xml
index 3bd1e8853c..934b19089b 100644
--- a/gnome/platform/gvfs.xml
+++ b/gnome/platform/gvfs.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.32/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.32/gvfs-&gvfs-version;.tar.xz">
-  <!ENTITY gvfs-md5sum        "cbe766b46f324e17d7abcfb4a89a1684">
-  <!ENTITY gvfs-size          "1.7 MB">
-  <!ENTITY gvfs-buildsize     "80 MB (with tests)">
-  <!ENTITY gvfs-time          "0.7 SBU (with tests)">
+  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.34/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.34/gvfs-&gvfs-version;.tar.xz">
+  <!ENTITY gvfs-md5sum        "44012824aa75797a7d272cd60f07b488">
+  <!ENTITY gvfs-size          "1.8 MB">
+  <!ENTITY gvfs-buildsize     "73 MB (and additional 2MB for tests)">
+  <!ENTITY gvfs-time          "0.8 SBU (an additional 0.1 SBU for tests)">
 ]>
 
 <sect1 id="gvfs" xreflabel="Gvfs-&gvfs-version;">
@@ -118,7 +118,8 @@
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
       <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
-      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>, and
+      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>, 
+      <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
       <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>,
     </para>
     <para role="optional" revision="systemd">
@@ -139,7 +140,8 @@
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
       <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
-      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>, and
+      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>,
+      <ulink url="https://github.com/sahlberg/libnfs/">libnfs</ulink>, and
       <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>
     </para>
 
@@ -168,8 +170,7 @@ make</userinput></screen>
 
     <para>
       To test the results, issue: <command>make -k check</command>.
-      Some tests (potentially half) may fail, normally due to a missing
-      optional dependency (Twisted).
+      Three Samba tests are known to fail if smbd is not running.
     </para>
 
     <para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 48de5354a8..7d9283ed2c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,12 @@
     <listitem>
       <para>October 27th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to gvfs-1.34.1.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to gnome-disk-utility-3.26.1.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Update to gnome-backgrounds-3.26.2.</para>
         </listitem>