From cdb1b4bbe266e3f7b090909c80185e822f64336a Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Fri, 10 Feb 2012 23:18:59 +0000 Subject: [PATCH] evince-3.2.1 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9358 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 2 +- gnome/add/add.xml | 1 - gnome/core/core.xml | 4 +-- gnome/{add => core}/evince.xml | 57 +++++++++--------------------- introduction/welcome/changelog.xml | 3 ++ 5 files changed, 23 insertions(+), 44 deletions(-) rename gnome/{add => core}/evince.xml (82%) diff --git a/general.ent b/general.ent index 956d9a034a..88c88ae4f6 100644 --- a/general.ent +++ b/general.ent @@ -708,6 +708,7 @@ $Date$ + @@ -743,7 +744,6 @@ $Date$ - diff --git a/gnome/add/add.xml b/gnome/add/add.xml index 8e24705374..155a10086c 100644 --- a/gnome/add/add.xml +++ b/gnome/add/add.xml @@ -41,7 +41,6 @@ $Date$ - diff --git a/gnome/core/core.xml b/gnome/core/core.xml index 129fcb58e2..e49f1b27eb 100644 --- a/gnome/core/core.xml +++ b/gnome/core/core.xml @@ -97,8 +97,8 @@ $Date$ - diff --git a/gnome/add/evince.xml b/gnome/core/evince.xml similarity index 82% rename from gnome/add/evince.xml rename to gnome/core/evince.xml index f9c4891d88..e974e2d3c6 100644 --- a/gnome/add/evince.xml +++ b/gnome/core/evince.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + ]> @@ -35,7 +35,7 @@ various types using one simple application instead of the multiple document viewers that once existed on the GNOME Desktop. - &lfs65_built; + &lfs70_checked; Package Information @@ -74,7 +74,7 @@ Required , , - , and + , and Required (Runtime) @@ -83,6 +83,7 @@ Optional , , + , , , (required to build the DVI viewer), @@ -108,16 +109,9 @@ Install Evince by running the following commands: -./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 \ +./configure --prefix=$GNOME_PREFIX \ + --libexecdir=$GNOME_PREFIX/lib/evince \ --without-keyring \ - --without-gconf \ --disable-nautilus \ --disable-pdf && make @@ -140,33 +134,16 @@ make - - - --libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/evince: This parameter is used so that the - Evince internal support programs are installed - in the preferred location of --libexecdir=$GNOME_PREFIX/lib/evince: This + parameter is used so that the Evince internal + support programs are installed in the preferred location of $GNOME_PREFIX/lib/evince instead of $GNOME_PREFIX/libexec. - - - - - --enable-pixbuf: This parameter enables the - Pixbuf Backend. - --without-keyring: This parameter disables the use of gnome-keyring. Remove parameter if gnome-keyring is installed. - --without-gconf: This parameter disables - GConf Support. Remove parameter if - GConf is installed. - --disable-nautilus: This parameter disables the Nautilus Plugin. Remove parameter if Nautilus is installed. @@ -182,9 +159,6 @@ make have the gobject-introspection package installed and you wish to enable GObject introspection. - : Use this parameter if you wish to - compile with support for impress presentations. - : Use this parameter if you have the teTeX or TeX Live package installed and you wish to build support to view DVI files. @@ -193,6 +167,9 @@ make t1lib package installed and you wish to build support for Type1 fonts in the DVI viewer. + : This switch prevents the static + libraries being installed. + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 5a92285940..a527fbe377 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -87,6 +87,9 @@ [ken] - merge epiphany-3.2.1 from Wayne. + + [ken] - merge evince-3.2.1 from Wayne. +