From 11a83b18fed214aeaf3c3684086fa0d7b15b92cb Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 6 Sep 2013 19:06:41 +0000 Subject: [PATCH] Move goffice 0.8 to archive since nothing in the book uses it. More tags. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11782 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- {x/lib => archive}/goffice.xml | 7 ++++--- server/mail/exim.xml | 2 +- x/installing/x7driver-mga.xml | 2 +- x/lib/agg.xml | 16 +++++++++------- x/lib/goffice010.xml | 10 +++++----- x/lib/lib.xml | 1 - xsoft/other/balsa.xml | 4 ++-- xsoft/other/blueman.xml | 8 ++++---- xsoft/other/pidgin.xml | 10 +++++----- xsoft/other/rox-filer.xml | 2 +- xsoft/other/xchat.xml | 8 +++++--- 11 files changed, 37 insertions(+), 33 deletions(-) rename {x/lib => archive}/goffice.xml (98%) diff --git a/x/lib/goffice.xml b/archive/goffice.xml similarity index 98% rename from x/lib/goffice.xml rename to archive/goffice.xml index 5bea43bea5..298a158df4 100644 --- a/x/lib/goffice.xml +++ b/archive/goffice.xml @@ -41,7 +41,7 @@ load/save routines for application documents and undo/redo functions. - &lfs73_checked; + &lfs74_checked; Package Information @@ -84,7 +84,7 @@ , , , - and + , and @@ -107,6 +107,7 @@ sed -i 's#info (r, NULL#full&, 0#' goffice/utils/regutf8.c && + ./configure --prefix=/usr --disable-static && make @@ -156,7 +157,7 @@ make /usr/include/libgoffice-0.8, /usr/lib/goffice, - /usr/share/gtk-doc/html/goffice-0.8 and + /usr/share/gtk-doc/html/goffice-0.8, and /usr/share/pixmaps/goffice. diff --git a/server/mail/exim.xml b/server/mail/exim.xml index 011506337b..77838878d8 100644 --- a/server/mail/exim.xml +++ b/server/mail/exim.xml @@ -33,7 +33,7 @@ Transport Agent written by the University of Cambridge, released under the GNU Public License. - &lfs73_built; + &lfs74_built; Package Information diff --git a/x/installing/x7driver-mga.xml b/x/installing/x7driver-mga.xml index 8ebe4b6072..c4fabc082d 100644 --- a/x/installing/x7driver-mga.xml +++ b/x/installing/x7driver-mga.xml @@ -32,7 +32,7 @@ G4xx, G5xx, Millennium II and Mystique G200 chipsets. - &lfs73_checked; + &lfs74_built; Package Information diff --git a/x/lib/agg.xml b/x/lib/agg.xml index a3a6682b2d..30c6638c0b 100644 --- a/x/lib/agg.xml +++ b/x/lib/agg.xml @@ -36,7 +36,7 @@ where high quality 2D graphics is an essential part of the project. - &lfs73_checked; + &lfs74_checked; Package Information @@ -77,7 +77,7 @@ Required , - and + , and @@ -94,8 +94,10 @@ commands: -sed -i 's: -L@x_libraries@::' src/platform/X11/Makefile.am && -sed -i '/^AM_C_PROTOTYPES/d' configure.in && + +sed -i 's: -L@x_libraries@::' src/platform/X11/Makefile.am && +sed -i '/^AM_C_PROTOTYPES/d' configure.in && + bash autogen.sh --prefix=/usr --disable-static && make @@ -148,10 +150,10 @@ make libagg.so, libaggfontfreetype.so, - libaggplatformsdl.so and - libaggplatformX11.so. + libaggplatformsdl.so, and + libaggplatformX11.so - /usr/include/agg2. + /usr/include/agg2 diff --git a/x/lib/goffice010.xml b/x/lib/goffice010.xml index 897c3afefe..8b24628b39 100644 --- a/x/lib/goffice010.xml +++ b/x/lib/goffice010.xml @@ -24,7 +24,7 @@ GOffice-&goffice010-version; - + GOffice @@ -41,7 +41,7 @@ load/save routines for application documents and undo/redo functions. - &lfs73_checked; + &lfs74_checked; Package Information @@ -83,7 +83,7 @@ , , - and + , and @@ -93,7 +93,7 @@ libspectre, , - and + , and @@ -149,7 +149,7 @@ make /usr/include/libgoffice-0.10, - /usr/lib/goffice and + /usr/lib/goffice, and /usr/share/gtk-doc/html/goffice-0.10 diff --git a/x/lib/lib.xml b/x/lib/lib.xml index e277df3f69..3b6e27878b 100644 --- a/x/lib/lib.xml +++ b/x/lib/lib.xml @@ -37,7 +37,6 @@ $Date$ - diff --git a/xsoft/other/balsa.xml b/xsoft/other/balsa.xml index c09a19e92d..ad4b33aa97 100644 --- a/xsoft/other/balsa.xml +++ b/xsoft/other/balsa.xml @@ -32,7 +32,7 @@ The Balsa package contains a GNOME-2 based mail client. - &lfs73_checked; + &lfs74_checked; Package Information @@ -83,7 +83,7 @@ , , , - , and and + , and (that provides a sendmail command, note that it is only used if you didn't install the recommended libESMTP diff --git a/xsoft/other/blueman.xml b/xsoft/other/blueman.xml index ad4f9a66ba..a8c8a83ed9 100644 --- a/xsoft/other/blueman.xml +++ b/xsoft/other/blueman.xml @@ -34,7 +34,7 @@ Bluetooth manager. - &lfs73_built; + &lfs74_built; Package Information @@ -79,7 +79,7 @@ , , (with support), - and + , and @@ -148,14 +148,14 @@ make blueman-adapters, blueman-applet, blueman-assistant, blueman-browse, - blueman-manager, blueman-sendto and blueman-services + blueman-manager, blueman-sendto, and blueman-services None /usr/lib/blueman, - /usr/lib/python&python2-majorver;/site-packages/blueman and + /usr/lib/python&python2-majorver;/site-packages/blueman, and /usr/share/blueman diff --git a/xsoft/other/pidgin.xml b/xsoft/other/pidgin.xml index 2833fd5711..7227c7cbf6 100644 --- a/xsoft/other/pidgin.xml +++ b/xsoft/other/pidgin.xml @@ -35,7 +35,7 @@ GroupWise, MSN, Jabber, IRC, Napster, Gadu-Gadu, SILC, Zephyr and Yahoo! - &lfs73_checked; + &lfs74_checked; Package Information @@ -120,7 +120,7 @@ , (required for the Contact Availability Prediction plugin), - and + , and Zephyr @@ -289,11 +289,11 @@ cp -v doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api finch, pidgin, purple-client-example, - purple-remote, purple-send, purple-send-async and + purple-remote, purple-send, purple-send-async, and purple-url-handler - libgnt.so, libpurple.so and libpurple-client.so + libgnt.so, libpurple.so, and libpurple-client.so /usr/include/finch, @@ -306,7 +306,7 @@ cp -v doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api /usr/lib/purple-2, /usr/share/doc/pidgin-&pidgin-version;, /usr/share/pixmaps/pidgin, - /usr/share/purple and + /usr/share/purple, and /usr/share/sounds/purple diff --git a/xsoft/other/rox-filer.xml b/xsoft/other/rox-filer.xml index ca0e2737ce..43df2805d3 100644 --- a/xsoft/other/rox-filer.xml +++ b/xsoft/other/rox-filer.xml @@ -35,7 +35,7 @@ manager. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/xsoft/other/xchat.xml b/xsoft/other/xchat.xml index 799f2cb38c..0807a97170 100644 --- a/xsoft/other/xchat.xml +++ b/xsoft/other/xchat.xml @@ -34,7 +34,7 @@ publicly, have private one-on-one conversations, etc. File transfers are also possible. - &lfs73_checked; + &lfs74_checked; Package Information @@ -82,7 +82,7 @@ , , , - and + , and @@ -98,7 +98,9 @@ commands: patch -Np1 -i ../xchat-&xchat-version;-glib-2.31-1.patch && -LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \ + +LIBS+="-lgmodule-2.0" \ +./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-shm && make