Changeset b2e07d20

Timestamp:

07/10/2016 05:54:57 AM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

937c279

Parents:

ff34b81

Message:

Correct Epiphany version number
(systemd/gnome merge staging) Restore Folks and gfbgraph
Larger commit coming in a few hours, includes ALL gnome updates and completes the GNOME merge.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17583 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• gnome.ent (modified) (1 diff)
• gnome/platform/folks.xml (modified) (7 diffs)
• gnome/platform/gfbgraph.xml (modified) (3 diffs)
• gnome/platform/platform.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)

gnome.ent

@@ -34 +34 @@
 <!ENTITY libwnck-version              "3.20.1">
 <!ENTITY evolution-data-server-version "3.20.3">
+<!ENTITY folks-version                "0.11.2">
+<!ENTITY gfbgraph-version             "0.2.3">
 
 <!-- Telepathy Framework -->

gnome/platform/folks.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.10/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.10/folks-&folks-version;.tar.xz">
-  <!ENTITY folks-md5sum        "c7134d50bba0775a9cabc6078ee19b50">
-  <!ENTITY folks-size          "1.8 MB">
-  <!ENTITY folks-buildsize     "162.7 MB">
-  <!ENTITY folks-time          "3.3 SBU">
+  <!ENTITY folks-download-http "&gnome-download-http;/folks/0.11/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-download-ftp  "&gnome-download-ftp;/folks/0.11/folks-&folks-version;.tar.xz">
+  <!ENTITY folks-md5sum        "ad732c17d7c29071871533abb9781528">
+  <!ENTITY folks-size          "1.9 MB">
+  <!ENTITY folks-buildsize     "168 MB (with tests)">
+  <!ENTITY folks-time          "2.9 SBU (with tests)">
 ]>
 
@@ -32 +32 @@
     <para>
       <application>Folks</application> is a library that
-      aggregates people from multiple sources (eg,
+      aggregates people from multiple sources (e.g,
       <application>Telepathy</application> connection managers and
       eventually <application>Evolution Data Server</application>,
@@ -38 +38 @@
     </para>
 
-    &lfs76_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78 +78 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="libgee08"/>
+      <xref linkend="evolution-data-server"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libgee"/>, and
+      <xref linkend="telepathy-glib"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="python3"/>, and
+      <xref linkend="python3"/> and
       <xref linkend="vala"/>
     </para>
@@ -92 +92 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="tracker"/>,
+      <ulink url="&gnome-download-http;/tracker/">Tracker</ulink>,
       <ulink url="&gnome-download-http;/libsocialweb/">libsocialweb</ulink>, and
       <ulink url="http://zeitgeist-project.com/">Zeitgeist</ulink>
@@ -138 +138 @@
       <option>--enable-tracker-backend</option>: This switch enables
       building of the the <application>Tracker</application> backend.
+      Use it if you have <application>Tracker</application> installed.
     </para>
 
@@ -160 +161 @@
         </seg>
         <seg>
-          libfolks-dummy.so, libfolks-eds.so, libfolks-libsocialweb.so,
-          libfolks.so, libfolks-telepathy.so, and libfolks-tracker.so
+          libfolks-dummy.so, libfolks-eds.so, libfolks.so, and 
+          libfolks-telepathy.so
         </seg>
         <seg>

gnome/platform/gfbgraph.xml

@@ -7 +7 @@
   <!ENTITY gfbgraph-download-http "&gnome-download-http;/gfbgraph/0.2/gfbgraph-&gfbgraph-version;.tar.xz">
   <!ENTITY gfbgraph-download-ftp  "&gnome-download-ftp;/gfbgraph/0.2/gfbgraph-&gfbgraph-version;.tar.xz">
-  <!ENTITY gfbgraph-md5sum        "af796932cec99e6da8e21174caf28ee3">
-  <!ENTITY gfbgraph-size          "260 KB">
-  <!ENTITY gfbgraph-buildsize     "4.4 MB">
+  <!ENTITY gfbgraph-md5sum        "81f216f637b40dc9b3a7298651305763">
+  <!ENTITY gfbgraph-size          "268 KB">
+  <!ENTITY gfbgraph-buildsize     "6.0 MB">
   <!ENTITY gfbgraph-time          "less than 0.1 SBU">
 ]>
@@ -35 +35 @@
     </para>
 
-    &lfs76_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gnome-online-accounts"/>
+      <xref linkend="gnome-online-accounts"/> and
+      <xref linkend="rest"/>
     </para>
 

gnome/platform/platform.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution-data-server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="folks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gfbgraph.xml"/>
 
 </chapter>

introduction/welcome/changelog.xml

@@ -45 +45 @@
 -->
     <listitem>
+      <para>July 10th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Restore gfbgraph and folks from the archive.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 9th, 2016</para>
       <itemizedlist>