Changeset cdb1b4b

Timestamp:

02/10/2012 11:18:59 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:

4b4ce7f3

Parents:

e237c169

Message:

evince-3.2.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9358 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/evince.xml (moved) (moved from gnome/add/evince.xml ) (9 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -709 +709 @@
 <!ENTITY eog-version                  "3.2.2">
 <!ENTITY epiphany-version             "3.2.1">
+<!ENTITY evince-version               "3.2.1">
 <!ENTITY gnome-terminal-version       "2.30.2">
 <!ENTITY nautilus-version             "2.30.1">
@@ -744 +745 @@
 <!ENTITY deskbar-applet-version       "2.30.1">
 <!ENTITY ekiga-version                "3.2.7">
-<!ENTITY evince-version               "2.30.2">
 <!ENTITY file-roller-version          "2.30.2">
 <!ENTITY gcalctool-version            "5.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="evince.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>

gnome/core/core.xml

@@ -98 +98 @@
   <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="gcalctool.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"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>

gnome/core/evince.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY evince-download-http "&gnome-download-http;/evince/&gnome-version;/evince-&evince-version;.tar.bz2">
-  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/&gnome-version;/evince-&evince-version;.tar.bz2">
-  <!ENTITY evince-md5sum        "2ae7fe7da797a9f08f2dd1ba4cbdeeae">
-  <!ENTITY evince-size          "2.1 MB">
-  <!ENTITY evince-buildsize     "53 MB">
-  <!ENTITY evince-time          "1.3 SBU">
+  <!ENTITY evince-download-http "&gnome-download-http;/evince/&gnome-version;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/&gnome-version;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "8c01b6741709b8e32b800b71820648ac">
+  <!ENTITY evince-size          "3.7 MB">
+  <!ENTITY evince-buildsize     "85 MB">
+  <!ENTITY evince-time          "2.5 SBU">
 ]>
 
@@ -36 +36 @@
     viewers that once existed on the GNOME Desktop.</para>
 
-    &lfs65_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75 +75 @@
     <para role="required"><xref linkend="gnome-doc-utils"/>,
     <xref linkend="gnome-icon-theme"/>,
-    <xref linkend="gtk2"/>, and
+    <xref linkend="gtk3"/>, and
     <xref linkend="which"/></para>
 
@@ -84 +84 @@
     <para role="optional"><xref linkend="GConf"/>,
     <xref linkend="libgnome-keyring"/>,
+    <xref linkend="gobject-introspection"/>,
     <xref linkend="gtk-doc"/>,
     <xref linkend="libtiff"/>,
@@ -109 +110 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/evince \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man \
-            --enable-pixbuf \
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --libexecdir=$GNOME_PREFIX/lib/evince \
             --without-keyring \
-            --without-gconf \
             --disable-nautilus \
             --disable-pdf &amp;&amp;
@@ -141 +135 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/evince</parameter>: This parameter is used so that the
-    <application>Evince</application> internal support programs are installed
-    in the preferred location of <filename
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/evince</parameter>: This
+    parameter is used so that the <application>Evince</application> internal
+    support programs are installed in the preferred location of <filename
     class='directory'>$GNOME_PREFIX/lib/evince</filename> instead of <filename
     class='directory'>$GNOME_PREFIX/libexec</filename>.</para>
-
-    <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><parameter>--enable-pixbuf</parameter>: This parameter enables the
-    Pixbuf Backend.</para>
 
     <para><parameter>--without-keyring</parameter>: This parameter disables the
@@ -164 +145 @@
     <application>gnome-keyring</application> is installed.</para>
 
-    <para><parameter>--without-gconf</parameter>: This parameter disables
-    <application>GConf</application> Support. Remove parameter if
-    <application>GConf</application> is installed.</para>
-
     <para><parameter>--disable-nautilus</parameter>: This parameter disables the
     <application>Nautilus</application> Plugin. Remove parameter if
@@ -183 +160 @@
     and you wish to enable GObject introspection.</para>
 
-    <para><option>--enable-impress</option>: Use this parameter if you wish to
-    compile with support for impress presentations.</para>
-
     <para><option>--enable-dvi</option>: Use this parameter if you have the
     <application>teTeX</application> or <application>TeX Live</application>
@@ -193 +167 @@
     <application>t1lib</application> package installed and you wish to build
     support for Type1 fonts in the DVI viewer.</para>
+
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
 
   </sect2>

introduction/welcome/changelog.xml

@@ -88 +88 @@
           <para>[ken] - merge epiphany-3.2.1 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge evince-3.2.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>