Changeset ecc6758

Timestamp:

02/10/2012 09:16:34 PM (12 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e237c169

Parents:

ac02266

Message:

Epiphany-3.2.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9356 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• gnome/add/add.xml (modified) (1 diff)
• gnome/core/core.xml (modified) (1 diff)
• gnome/core/epiphany.xml (moved) (moved from gnome/add/epiphany.xml ) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -708 +708 @@
 <!ENTITY empathy-version              "3.2.2">
 <!ENTITY eog-version                  "3.2.2">
+<!ENTITY epiphany-version             "3.2.1">
 <!ENTITY gnome-terminal-version       "2.30.2">
 <!ENTITY nautilus-version             "2.30.1">
@@ -743 +744 @@
 <!ENTITY deskbar-applet-version       "2.30.1">
 <!ENTITY ekiga-version                "3.2.7">
-<!ENTITY epiphany-version             "2.30.2">
 <!ENTITY evince-version               "2.30.2">
 <!ENTITY file-roller-version          "2.30.2">

gnome/add/add.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deskbar-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>

gnome/core/core.xml

@@ -97 +97 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eog.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-contacts.xml"/>

gnome/core/epiphany.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-md5sum        "29b084acfa016540d91d3601ec3dff5c">
-  <!ENTITY epiphany-size          "5.6 MB">
-  <!ENTITY epiphany-buildsize     "83 MB">
+  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.xz">
+  <!ENTITY epiphany-md5sum        "b07a47656a07f695c70eb56b628f9df7">
+  <!ENTITY epiphany-size          "4.9 MB">
+  <!ENTITY epiphany-buildsize     "92 MB">
   <!ENTITY epiphany-time          "1.0 SBU">
 ]>
@@ -34 +34 @@
     users. Its principles are simplicity and standards compliance.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70 +70 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
+    <para role="recommended"><xref linkend="cacerts"/> and
+    <xref linkend="rarian"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -76 +77 @@
     <xref linkend="gtk-doc"/>,
     <xref linkend="libnotify"/>,
-    <ulink
-    url="http://www.gnome.org/projects/NetworkManager/">NetworkManager</ulink>,
-    and <ulink url="http://live.gnome.org/Seed">Seed</ulink></para>
+    <xref linkend="NetworkManager"/>,
+    <!-- FIXME:ken
+    and <xref linkend="seed"/></para>-->
+    and seed-3.2.0</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -91 +93 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man \
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
             --with-ca-file=/etc/ssl/ca-bundle.crt &amp;&amp;
 make</userinput></screen>
@@ -121 +119 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-scrollkeeper</option>: Use this option if you
-    wish to disable the updates to the scrollkeeper database.</para>
+    <para><parameter>--with-ca-file=/etc/ssl/ca-bundle.crt</parameter>:
+    Omit this if you have not installed the certificates.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -149 +138 @@
         <seg>epiphany</seg>
         <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/epiphany/2.30/epiphany,
+        <seg><envar>$GNOME_PREFIX</envar>/{include/epiphany/,
         share/{epiphany/{art,glade,icons/hicolor/{16x16/{actions,places,status},
         22x22/{actions,places,status},24x24/{actions,places,status},

introduction/welcome/changelog.xml

@@ -81 +81 @@
           <para>[ken] - merge eog-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge epiphany-3.2.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>