From 4c2be43886361a629e4715d6d5119f642e462b27 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Tue, 1 May 2012 12:35:38 +0000 Subject: [PATCH] fix Gnome dependencies - switch itstool with yelp-xsl (YELP_HELP_INIT requires yelp-xsl stylesheets),recommend gobject-introspection for every package in gnome/{core,add} and make Optional g-i section indicating that is required for gnome in packages that are not just required by gnome. Made some recommended (expected) deps to gstreamer plugins (codecs, input and output sinks), recommended alsa to the libcanberra, explicitly disabled oss to remove configure warning + added gnome dependencies into seperate optional section to libcanberra page. Added --disable-scrollkeeper explanation to many packages that can use rarian (for the scrollkeeper compat) and added some more rarian recommendations. Checked polkit, accountservice and consolekit deps, sorted them a bit. Finished Gnome 3.4 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10043 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/json-glib.xml | 7 +- general/genlib/libunique.xml | 57 ++++----- general/genlib/telepathy-glib.xml | 1 - general/genlib/telepathy-logger.xml | 1 - general/graphlib/librsvg.xml | 10 +- general/sysutils/upower.xml | 5 +- gnome/add/accerciser.xml | 13 +++ gnome/add/anjuta.xml | 8 +- gnome/add/cheese.xml | 12 +- gnome/add/epiphany-extensions.xml | 11 +- gnome/add/file-roller.xml | 3 + gnome/add/gdl.xml | 6 +- gnome/add/gedit.xml | 10 +- gnome/add/ghex.xml | 8 ++ gnome/add/glade.xml | 5 +- gnome/add/gnome-applets.xml | 3 + gnome/add/gnome-color-manager.xml | 8 ++ gnome/add/gnome-devel-docs.xml | 8 ++ gnome/add/gnome-games.xml | 10 +- gnome/add/gnome-nettool.xml | 11 +- gnome/add/gtkhtml.xml | 4 +- gnome/add/nemiver.xml | 3 + gnome/add/orca.xml | 16 ++- gnome/add/seahorse.xml | 3 + gnome/add/sound-juicer.xml | 13 ++- gnome/add/totem.xml | 3 + gnome/add/vinagre.xml | 6 +- gnome/core/baobab.xml | 4 +- gnome/core/brasero.xml | 3 + gnome/core/caribou.xml | 4 +- gnome/core/empathy.xml | 8 +- gnome/core/eog.xml | 5 +- gnome/core/epiphany.xml | 9 +- gnome/core/evince.xml | 8 +- gnome/core/evolution-data-server.xml | 2 +- gnome/core/gcalctool.xml | 7 +- gnome/core/gconf.xml | 2 +- gnome/core/gcr.xml | 20 +--- gnome/core/gdm.xml | 11 +- gnome/core/gnome-bluetooth.xml | 3 + gnome/core/gnome-control-center.xml | 16 +-- gnome/core/gnome-desktop.xml | 9 +- gnome/core/gnome-dictionary.xml | 8 ++ gnome/core/gnome-keyring.xml | 6 - gnome/core/gnome-menus.xml | 1 - gnome/core/gnome-online-accounts.xml | 1 - gnome/core/gnome-panel.xml | 3 + gnome/core/gnome-screensaver.xml | 4 +- gnome/core/gnome-screenshot.xml | 1 + gnome/core/gnome-search-tool.xml | 13 +++ gnome/core/gnome-settings-daemon.xml | 14 +-- gnome/core/gnome-system-log.xml | 6 +- gnome/core/gnome-system-monitor.xml | 11 +- gnome/core/gnome-terminal.xml | 11 +- gnome/core/gnome-user-docs.xml | 7 +- gnome/core/gnome-user-share.xml | 3 + gnome/core/gtksourceview.xml | 2 - gnome/core/gucharmap.xml | 5 +- gnome/core/libgnome-keyring.xml | 1 - gnome/core/libgnomekbd.xml | 1 - gnome/core/libgtop.xml | 1 - gnome/core/libgweather.xml | 1 - gnome/core/libwnck.xml | 7 +- gnome/core/metacity.xml | 4 + gnome/core/mousetweaks.xml | 11 +- gnome/core/mutter.xml | 8 ++ gnome/core/nautilus.xml | 1 - gnome/core/network-manager-applet.xml | 4 +- gnome/core/totem-pl-parser.xml | 1 - gnome/core/vte.xml | 1 - gnome/core/yelp.xml | 5 - gnome/core/zenity.xml | 18 ++- introduction/welcome/changelog.xml | 4 + multimedia/libdriv/gst-plugins-base.xml | 40 ++++--- multimedia/libdriv/gst-plugins-good.xml | 24 ++-- multimedia/libdriv/gst-plugins-ugly.xml | 53 +++++---- multimedia/libdriv/gstreamer.xml | 52 +++++---- multimedia/libdriv/libcanberra.xml | 148 ++++++------------------ networking/netlibs/geocode-glib.xml | 1 - networking/netlibs/glib-networking.xml | 10 +- networking/netlibs/libchamplain.xml | 1 - networking/netlibs/libgdata.xml | 3 +- networking/netlibs/librest.xml | 1 - networking/netutils/networkmanager.xml | 1 - postlfs/security/accountsservice.xml | 16 ++- postlfs/security/consolekit.xml | 22 ++-- postlfs/security/polkit.xml | 39 +++---- postlfs/virtualization/libosinfo.xml | 12 +- postlfs/virtualization/libvirt-glib.xml | 11 +- postlfs/virtualization/spice-gtk.xml | 1 - x/lib/atk.xml | 6 +- x/lib/clutter-gst.xml | 6 +- x/lib/clutter-gtk.xml | 6 +- x/lib/clutter.xml | 1 - x/lib/cogl.xml | 1 - x/lib/gdk-pixbuf.xml | 6 +- x/lib/gtk+3.xml | 8 +- x/lib/gtk-vnc.xml | 1 - x/lib/libnotify.xml | 6 +- x/lib/libxklavier.xml | 1 - x/lib/mx.xml | 1 - x/lib/pango.xml | 6 +- x/lib/webkitgtk.xml | 9 +- xincludes/static-libraries.xml | 3 + xincludes/without-scrollkeeper.xml | 12 ++ 105 files changed, 584 insertions(+), 444 deletions(-) create mode 100644 xincludes/without-scrollkeeper.xml diff --git a/general/genlib/json-glib.xml b/general/genlib/json-glib.xml index c581a6b7cb..de9df18944 100644 --- a/general/genlib/json-glib.xml +++ b/general/genlib/json-glib.xml @@ -64,10 +64,13 @@ - Optional + Optional (Required if building GNOME) - (Required if building GNOME) and + + + Optional + diff --git a/general/genlib/libunique.xml b/general/genlib/libunique.xml index 1920af0228..f733fab038 100644 --- a/general/genlib/libunique.xml +++ b/general/genlib/libunique.xml @@ -4,12 +4,12 @@ %general-entities; - - - - - - + + + + + + ]> @@ -32,7 +32,7 @@ The libunique package contains a library for writing single instance applications. - &lfs70_built; + &lfs70_checked; Package Information @@ -59,12 +59,19 @@ libunique Dependencies Required - + + + + + Recommended + + + Optional - , - , and - + + + User Notes: @@ -75,10 +82,7 @@ Install libunique by running the following commands: - + ./configure --prefix=/usr && make @@ -92,32 +96,26 @@ make Command Explanations - + Contents - Installed Programs Installed Library Installed Directories - None - libunique-3.0.so - /usr/{include/unique-3.0/unique,share/gtk-doc/html/unique-3.0} + + libunique-3.0.so + + + /usr/include/unique-3.0 and /usr/share/gtk-doc/html/unique-3.0 + @@ -136,6 +134,9 @@ make + + + diff --git a/general/genlib/telepathy-glib.xml b/general/genlib/telepathy-glib.xml index a5f0ca0fcb..42c6850294 100644 --- a/general/genlib/telepathy-glib.xml +++ b/general/genlib/telepathy-glib.xml @@ -74,7 +74,6 @@ and - (Required if building GNOME) Optional diff --git a/general/genlib/telepathy-logger.xml b/general/genlib/telepathy-logger.xml index ef13e837f5..4cb7f1056f 100644 --- a/general/genlib/telepathy-logger.xml +++ b/general/genlib/telepathy-logger.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml index 9d983a0597..656d90e446 100644 --- a/general/graphlib/librsvg.xml +++ b/general/graphlib/librsvg.xml @@ -65,10 +65,14 @@ + Optional (Required if building GNOME) + + + + Optional , - (Required if building GNOME), and @@ -99,10 +103,10 @@ make Command Explanations + href="../../xincludes/static-libraries.xml"/> + href="../../xincludes/gtk-doc-rebuild.xml"/> diff --git a/general/sysutils/upower.xml b/general/sysutils/upower.xml index a4e7e2b4ef..1ec8c7b36d 100644 --- a/general/sysutils/upower.xml +++ b/general/sysutils/upower.xml @@ -68,10 +68,9 @@ - Recommended - + Optional (Required if building GNOME) + - (Required if building GNOME) Optional diff --git a/gnome/add/accerciser.xml b/gnome/add/accerciser.xml index fda9d72ea5..7143a554d1 100644 --- a/gnome/add/accerciser.xml +++ b/gnome/add/accerciser.xml @@ -77,6 +77,11 @@ + Recommended + + + + User Notes: @@ -100,6 +105,14 @@ make + + Command Explanations + + + + + Contents diff --git a/gnome/add/anjuta.xml b/gnome/add/anjuta.xml index da0ca15f2f..31a6e88e6d 100644 --- a/gnome/add/anjuta.xml +++ b/gnome/add/anjuta.xml @@ -73,13 +73,14 @@ , , - and + , + , + and Optional - , and @@ -113,6 +114,9 @@ make --disable-packagekit: This parameter disables use of PackageKit which isn't suitable for BLFS. + + diff --git a/gnome/add/cheese.xml b/gnome/add/cheese.xml index 62e0f9ed1c..1fdb34ff9a 100644 --- a/gnome/add/cheese.xml +++ b/gnome/add/cheese.xml @@ -64,19 +64,23 @@ , , , - , , , , , , - and - + , + and + + + + Recommended + + Optional - and diff --git a/gnome/add/epiphany-extensions.xml b/gnome/add/epiphany-extensions.xml index d56bf019fa..09cf2a9187 100644 --- a/gnome/add/epiphany-extensions.xml +++ b/gnome/add/epiphany-extensions.xml @@ -95,13 +95,16 @@ make - - --> + + + Configuring Epiphany Extensions diff --git a/gnome/add/file-roller.xml b/gnome/add/file-roller.xml index 98d384b92b..63734c091f 100644 --- a/gnome/add/file-roller.xml +++ b/gnome/add/file-roller.xml @@ -123,6 +123,9 @@ make --disable-packagekit: This parameter disables use of PackageKit which isn't suitable for BLFS. + + diff --git a/gnome/add/gdl.xml b/gnome/add/gdl.xml index 807c64c380..e6ef3cc24b 100644 --- a/gnome/add/gdl.xml +++ b/gnome/add/gdl.xml @@ -63,9 +63,13 @@ + Recommended + + + + Optional - and diff --git a/gnome/add/gedit.xml b/gnome/add/gedit.xml index b506d02404..084b8aa197 100644 --- a/gnome/add/gedit.xml +++ b/gnome/add/gedit.xml @@ -63,8 +63,8 @@ , , , - and - + and + Recommended @@ -75,9 +75,13 @@ + Recommended + + + + Optional - , and libzeitgeist diff --git a/gnome/add/ghex.xml b/gnome/add/ghex.xml index f3d8879609..da1a47837f 100644 --- a/gnome/add/ghex.xml +++ b/gnome/add/ghex.xml @@ -92,6 +92,14 @@ make + + Command Explanations + + + + + Contents diff --git a/gnome/add/glade.xml b/gnome/add/glade.xml index ecc25e4ffd..7fbc638a2e 100644 --- a/gnome/add/glade.xml +++ b/gnome/add/glade.xml @@ -67,12 +67,12 @@ Recommended + and Optional - and @@ -102,6 +102,9 @@ make Command Explanations + + diff --git a/gnome/add/gnome-applets.xml b/gnome/add/gnome-applets.xml index 6d5c73619c..5cf771dcfa 100644 --- a/gnome/add/gnome-applets.xml +++ b/gnome/add/gnome-applets.xml @@ -125,6 +125,9 @@ make class="directory">/usr/lib/gnome-applets instead of /usr/libexec. + + diff --git a/gnome/add/gnome-color-manager.xml b/gnome/add/gnome-color-manager.xml index 1de1d2c96c..76e77e69f4 100644 --- a/gnome/add/gnome-color-manager.xml +++ b/gnome/add/gnome-color-manager.xml @@ -72,6 +72,11 @@ + Recommended + + + + Optional with @@ -110,6 +115,9 @@ make --disable-packagekit: This parameter disables use of PackageKit which isn't suitable for BLFS. + + diff --git a/gnome/add/gnome-devel-docs.xml b/gnome/add/gnome-devel-docs.xml index 075b2f7b03..8adf6ffdea 100644 --- a/gnome/add/gnome-devel-docs.xml +++ b/gnome/add/gnome-devel-docs.xml @@ -93,6 +93,14 @@ make + + Command Explanations + + + + + Contents diff --git a/gnome/add/gnome-games.xml b/gnome/add/gnome-games.xml index 5747e39164..10a48f25c9 100644 --- a/gnome/add/gnome-games.xml +++ b/gnome/add/gnome-games.xml @@ -89,14 +89,14 @@ , , - , , - and - + , + and + - Optional - + Recommended + diff --git a/gnome/add/gnome-nettool.xml b/gnome/add/gnome-nettool.xml index adfdfc0169..d8cb90fb2b 100644 --- a/gnome/add/gnome-nettool.xml +++ b/gnome/add/gnome-nettool.xml @@ -103,13 +103,16 @@ make - - --> + + + Contents diff --git a/gnome/add/gtkhtml.xml b/gnome/add/gtkhtml.xml index 24e95bc965..3b82517c1b 100644 --- a/gnome/add/gtkhtml.xml +++ b/gnome/add/gtkhtml.xml @@ -67,8 +67,8 @@ - Optional - + Recommended + diff --git a/gnome/add/nemiver.xml b/gnome/add/nemiver.xml index f0a28cb5e4..e62f018fe9 100644 --- a/gnome/add/nemiver.xml +++ b/gnome/add/nemiver.xml @@ -109,6 +109,9 @@ make + + diff --git a/gnome/add/orca.xml b/gnome/add/orca.xml index faf057ab08..725dfbfc22 100644 --- a/gnome/add/orca.xml +++ b/gnome/add/orca.xml @@ -70,6 +70,11 @@ + Recommended + + + + Optional BRLTTY @@ -109,17 +114,20 @@ make - - --> + + + Contents diff --git a/gnome/add/seahorse.xml b/gnome/add/seahorse.xml index fbe0820f51..13c3b9f069 100644 --- a/gnome/add/seahorse.xml +++ b/gnome/add/seahorse.xml @@ -112,6 +112,9 @@ make + + diff --git a/gnome/add/sound-juicer.xml b/gnome/add/sound-juicer.xml index e304e57770..cfb554d17f 100644 --- a/gnome/add/sound-juicer.xml +++ b/gnome/add/sound-juicer.xml @@ -70,7 +70,7 @@ , , and - + Recommended @@ -109,16 +109,19 @@ make - - --> + + + Configuring Sound Juicer diff --git a/gnome/add/totem.xml b/gnome/add/totem.xml index dcd4a0ae38..55a828c449 100644 --- a/gnome/add/totem.xml +++ b/gnome/add/totem.xml @@ -141,6 +141,9 @@ make + + diff --git a/gnome/add/vinagre.xml b/gnome/add/vinagre.xml index d9f7568026..575fdce865 100644 --- a/gnome/add/vinagre.xml +++ b/gnome/add/vinagre.xml @@ -64,9 +64,9 @@ , , , - , - and - + , + and + Recommended diff --git a/gnome/core/baobab.xml b/gnome/core/baobab.xml index d3a4494bca..e85cf7c296 100644 --- a/gnome/core/baobab.xml +++ b/gnome/core/baobab.xml @@ -77,8 +77,8 @@ , , - and - + and + diff --git a/gnome/core/brasero.xml b/gnome/core/brasero.xml index bd36f49b7f..a6f390e9ae 100644 --- a/gnome/core/brasero.xml +++ b/gnome/core/brasero.xml @@ -116,6 +116,9 @@ make Command Explanations + + diff --git a/gnome/core/caribou.xml b/gnome/core/caribou.xml index e5c0d040e7..42de1dd5cf 100644 --- a/gnome/core/caribou.xml +++ b/gnome/core/caribou.xml @@ -72,7 +72,6 @@ Recommended - (Required if building GNOME) Additional Runtime Dependencies @@ -126,6 +125,9 @@ make + + diff --git a/gnome/core/empathy.xml b/gnome/core/empathy.xml index 3323240b26..9914fc97d1 100644 --- a/gnome/core/empathy.xml +++ b/gnome/core/empathy.xml @@ -65,18 +65,18 @@ , , - , , , , , , - , , , + , , - and - + , + and + Recommended diff --git a/gnome/core/eog.xml b/gnome/core/eog.xml index 8c8b22f6b3..dc2b5cde18 100644 --- a/gnome/core/eog.xml +++ b/gnome/core/eog.xml @@ -70,13 +70,13 @@ Recommended + and Optional , - , , , and @@ -111,6 +111,9 @@ make + + diff --git a/gnome/core/epiphany.xml b/gnome/core/epiphany.xml index 677c9359ba..d68d517625 100644 --- a/gnome/core/epiphany.xml +++ b/gnome/core/epiphany.xml @@ -73,15 +73,15 @@ Recommended - and + , + and Optional , - , - and + and @@ -119,6 +119,9 @@ make : Enable seed support. + + diff --git a/gnome/core/evince.xml b/gnome/core/evince.xml index 6fe0a850c3..376e8e5941 100644 --- a/gnome/core/evince.xml +++ b/gnome/core/evince.xml @@ -79,9 +79,10 @@ , , (required for XPS support), - (required for the Nautilus plugin) and + (required for the Nautilus plugin), (required for PDF support and must be built - with GTK+ support). + with GTK+ support) and + Optional @@ -158,6 +159,9 @@ make Backend. Add this parameter if Poppler is not installed. + + diff --git a/gnome/core/evolution-data-server.xml b/gnome/core/evolution-data-server.xml index cb97a2b4ab..698d7cc8be 100644 --- a/gnome/core/evolution-data-server.xml +++ b/gnome/core/evolution-data-server.xml @@ -74,7 +74,7 @@ xreflabel="evolution-data-server-&evolution-data-server-version;"> - Recommended (Required if building GNOME) + Recommended and diff --git a/gnome/core/gcalctool.xml b/gnome/core/gcalctool.xml index f302b1f4dd..9ad6041d8f 100644 --- a/gnome/core/gcalctool.xml +++ b/gnome/core/gcalctool.xml @@ -64,12 +64,7 @@ , and - - - - Recommended - - + User Notes: diff --git a/gnome/core/gconf.xml b/gnome/core/gconf.xml index 7c7b996073..da4ad55b80 100644 --- a/gnome/core/gconf.xml +++ b/gnome/core/gconf.xml @@ -67,7 +67,7 @@ - Recommended (Required if building GNOME) + Recommended , and diff --git a/gnome/core/gcr.xml b/gnome/core/gcr.xml index 917c8c71a0..ccdbbd3423 100644 --- a/gnome/core/gcr.xml +++ b/gnome/core/gcr.xml @@ -85,7 +85,6 @@ Recommended - (Required if building GNOME) Optional @@ -107,10 +106,9 @@ commands: -./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-keyring \ - --with-pkcs11-modules=/usr/lib/pkcs11 \ - --with-dbus-services=/usr/share/dbus-1/services && +./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-keyring && make @@ -130,18 +128,6 @@ make - - --with-pkcs11-modules=/usr/lib/pkcs11: - This parameter ensures that p11-kit modules - are installed in a correct location. - - - - --with-dbus-services=/usr/share/dbus-1/services: - This parameter ensures that D-BUS service - files are installed in a correct location. - - diff --git a/gnome/core/gdm.xml b/gnome/core/gdm.xml index 790bb01319..297441ba5d 100644 --- a/gnome/core/gdm.xml +++ b/gnome/core/gdm.xml @@ -75,6 +75,7 @@ , , + , , , and @@ -93,14 +94,15 @@ (Required for Shutdown/Restart functionality), - and + , + , + and Optional - (required to run the testsuite), - and + (required to run the testsuite) and @@ -163,6 +165,9 @@ chown -R -v gdm:gdm /var/lib/gdm /var/cache/gdm /var/log/gdm + + diff --git a/gnome/core/gnome-bluetooth.xml b/gnome/core/gnome-bluetooth.xml index 7e21149187..7cc87292ec 100644 --- a/gnome/core/gnome-bluetooth.xml +++ b/gnome/core/gnome-bluetooth.xml @@ -118,6 +118,9 @@ make --> + + diff --git a/gnome/core/gnome-control-center.xml b/gnome/core/gnome-control-center.xml index 7ffc8b7e5c..319dc0a11d 100644 --- a/gnome/core/gnome-control-center.xml +++ b/gnome/core/gnome-control-center.xml @@ -69,20 +69,20 @@ - Recommended - - and - - - - Recommended (Runtime) - + Required (Runtime) + , , and + Recommended + + and + + + Optional and diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml index 1c86ee0275..012c7d597f 100644 --- a/gnome/core/gnome-desktop.xml +++ b/gnome/core/gnome-desktop.xml @@ -71,9 +71,9 @@ Recommended - and - - (Required if building GNOME) + , + and + Optional @@ -113,6 +113,9 @@ make parameter to supply a custom name in the Distributor: field of the GNOME About display window. + + diff --git a/gnome/core/gnome-dictionary.xml b/gnome/core/gnome-dictionary.xml index 04e199fd50..b0b20d20f9 100644 --- a/gnome/core/gnome-dictionary.xml +++ b/gnome/core/gnome-dictionary.xml @@ -80,6 +80,11 @@ + Recommended + + + + Optional . @@ -115,6 +120,9 @@ make Command Explanations + + diff --git a/gnome/core/gnome-keyring.xml b/gnome/core/gnome-keyring.xml index c19b374a28..01799f7c12 100644 --- a/gnome/core/gnome-keyring.xml +++ b/gnome/core/gnome-keyring.xml @@ -91,7 +91,6 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-pam-dir=/lib/security \ - --with-dbus-services=/usr/share/dbus-1/services \ --with-root-certs=/etc/ssl/certs && make @@ -116,11 +115,6 @@ make specifies where the pam modules will be installed: you can omit this if you have not installed Linux-PAM. - --with-dbus-services=/usr/share/dbus-1/services: - This parameter specifies where the D-BUS session - services directory is located: you can omit this if your GNOME_PREFIX is - /usr. - --with-root-certs=/etc/ssl/certs: This parameter specifies where the trusted root certificates are located. diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml index bf7532f9d7..b0e78a4332 100644 --- a/gnome/core/gnome-menus.xml +++ b/gnome/core/gnome-menus.xml @@ -74,7 +74,6 @@ Recommended - (Required if building GNOME) User Notes: diff --git a/gnome/core/gnome-online-accounts.xml b/gnome/core/gnome-online-accounts.xml index 5d13f48d1c..c3ed88ab8d 100644 --- a/gnome/core/gnome-online-accounts.xml +++ b/gnome/core/gnome-online-accounts.xml @@ -72,7 +72,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/gnome-panel.xml b/gnome/core/gnome-panel.xml index df12872de1..ffd10495e8 100644 --- a/gnome/core/gnome-panel.xml +++ b/gnome/core/gnome-panel.xml @@ -130,6 +130,9 @@ make class="directory">/usr/lib/gnome-applets instead of /usr/libexec. + + diff --git a/gnome/core/gnome-screensaver.xml b/gnome/core/gnome-screensaver.xml index 9bd7343bea..d09b04a00b 100644 --- a/gnome/core/gnome-screensaver.xml +++ b/gnome/core/gnome-screensaver.xml @@ -70,8 +70,8 @@ - Optional - + Recommended + , diff --git a/gnome/core/gnome-screenshot.xml b/gnome/core/gnome-screenshot.xml index ff2d63f366..2c3af08bfa 100644 --- a/gnome/core/gnome-screenshot.xml +++ b/gnome/core/gnome-screenshot.xml @@ -77,6 +77,7 @@ Required + and (Compiled with GTK+3 support). diff --git a/gnome/core/gnome-search-tool.xml b/gnome/core/gnome-search-tool.xml index 38e376300b..42b1af4907 100644 --- a/gnome/core/gnome-search-tool.xml +++ b/gnome/core/gnome-search-tool.xml @@ -81,6 +81,11 @@ + Recommended + + + + User Notes: @@ -108,6 +113,14 @@ make make install + + Command Explanations + + + + + Contents diff --git a/gnome/core/gnome-settings-daemon.xml b/gnome/core/gnome-settings-daemon.xml index d1f7e5eea8..0db61e0f13 100644 --- a/gnome/core/gnome-settings-daemon.xml +++ b/gnome/core/gnome-settings-daemon.xml @@ -75,11 +75,6 @@ - Optional - - packagekit - - User Notes: @@ -115,10 +110,10 @@ make --> - --libexecdir=/usr/lib/gnome-settings-daemon-3.0: + --libexecdir=/usr/lib/gnome-settings-daemon: This parameter causes the libexec files to be installed in the preferred location of /usr/lib/gnome-settings-daemon-3.0 + class="directory">/usr/lib/gnome-settings-daemon instead of /usr/libexec. @@ -128,11 +123,6 @@ make - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids: - The configure script looks for - /usr/share/hwdata/pnp.ids and thus fails to find this required - file. - diff --git a/gnome/core/gnome-system-log.xml b/gnome/core/gnome-system-log.xml index 7635a2ba2e..1df844f073 100644 --- a/gnome/core/gnome-system-log.xml +++ b/gnome/core/gnome-system-log.xml @@ -14,7 +14,6 @@ ]> - @@ -81,6 +80,11 @@ + Recommended + + + + User Notes: diff --git a/gnome/core/gnome-system-monitor.xml b/gnome/core/gnome-system-monitor.xml index a56e12994d..f8dacb0d51 100644 --- a/gnome/core/gnome-system-monitor.xml +++ b/gnome/core/gnome-system-monitor.xml @@ -101,13 +101,16 @@ make - - --> + + + Contents diff --git a/gnome/core/gnome-terminal.xml b/gnome/core/gnome-terminal.xml index fc37a76b64..909b4cac95 100644 --- a/gnome/core/gnome-terminal.xml +++ b/gnome/core/gnome-terminal.xml @@ -96,16 +96,19 @@ make - - --> + + + Contents diff --git a/gnome/core/gnome-user-docs.xml b/gnome/core/gnome-user-docs.xml index 0eadd2bd81..4108d4184d 100644 --- a/gnome/core/gnome-user-docs.xml +++ b/gnome/core/gnome-user-docs.xml @@ -64,12 +64,7 @@ Required and - - - - Recommended - - + User Notes: diff --git a/gnome/core/gnome-user-share.xml b/gnome/core/gnome-user-share.xml index 36081bfcf3..866ad33cb3 100644 --- a/gnome/core/gnome-user-share.xml +++ b/gnome/core/gnome-user-share.xml @@ -118,6 +118,9 @@ make class='directory'>/usr/lib/gnome-user-share instead of /usr/libexec. + + diff --git a/gnome/core/gtksourceview.xml b/gnome/core/gtksourceview.xml index 2ab36542aa..2bc5663d10 100644 --- a/gnome/core/gtksourceview.xml +++ b/gnome/core/gtksourceview.xml @@ -70,8 +70,6 @@ Recommended - (Required if you are going to build - ) Optional diff --git a/gnome/core/gucharmap.xml b/gnome/core/gucharmap.xml index e350748062..5133560288 100644 --- a/gnome/core/gucharmap.xml +++ b/gnome/core/gucharmap.xml @@ -71,12 +71,12 @@ Recommended + and Optional - and @@ -111,6 +111,9 @@ make : Use this parameter if you wish to enable GObject introspection. + + diff --git a/gnome/core/libgnome-keyring.xml b/gnome/core/libgnome-keyring.xml index 0739a60cf8..9d8f8f2099 100644 --- a/gnome/core/libgnome-keyring.xml +++ b/gnome/core/libgnome-keyring.xml @@ -72,7 +72,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/libgnomekbd.xml b/gnome/core/libgnomekbd.xml index 311d2cc39e..24d286ec18 100644 --- a/gnome/core/libgnomekbd.xml +++ b/gnome/core/libgnomekbd.xml @@ -70,7 +70,6 @@ Recommended - (Required if building GNOME) User Notes: diff --git a/gnome/core/libgtop.xml b/gnome/core/libgtop.xml index 7a280e2a46..58400d2dd5 100644 --- a/gnome/core/libgtop.xml +++ b/gnome/core/libgtop.xml @@ -67,7 +67,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/libgweather.xml b/gnome/core/libgweather.xml index e15ed794f2..d691e1f8c9 100644 --- a/gnome/core/libgweather.xml +++ b/gnome/core/libgweather.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/libwnck.xml b/gnome/core/libwnck.xml index e2ec2a4460..aad525bb8e 100644 --- a/gnome/core/libwnck.xml +++ b/gnome/core/libwnck.xml @@ -66,14 +66,13 @@ Recommended - - (Required if building GNOME) + and + Optional - and - + User Notes: diff --git a/gnome/core/metacity.xml b/gnome/core/metacity.xml index 21bcdb7abf..225b418287 100644 --- a/gnome/core/metacity.xml +++ b/gnome/core/metacity.xml @@ -71,6 +71,7 @@ Recommended + and @@ -110,6 +111,9 @@ install -v -m644 README rationales.txt doc/*.txt \ + + diff --git a/gnome/core/mousetweaks.xml b/gnome/core/mousetweaks.xml index feabc1ea0a..b4301d8568 100644 --- a/gnome/core/mousetweaks.xml +++ b/gnome/core/mousetweaks.xml @@ -95,13 +95,16 @@ make - - --> + + + Contents diff --git a/gnome/core/mutter.xml b/gnome/core/mutter.xml index 26dd006387..d225823e8b 100644 --- a/gnome/core/mutter.xml +++ b/gnome/core/mutter.xml @@ -71,6 +71,11 @@ + Recommended + + + + User Notes: @@ -100,6 +105,9 @@ make + + diff --git a/gnome/core/nautilus.xml b/gnome/core/nautilus.xml index 4d255e0a92..b4fe92e1e0 100644 --- a/gnome/core/nautilus.xml +++ b/gnome/core/nautilus.xml @@ -67,7 +67,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/network-manager-applet.xml b/gnome/core/network-manager-applet.xml index 2d2c9baac6..0739343763 100644 --- a/gnome/core/network-manager-applet.xml +++ b/gnome/core/network-manager-applet.xml @@ -75,8 +75,8 @@ - Optional - + Recommended + and diff --git a/gnome/core/totem-pl-parser.xml b/gnome/core/totem-pl-parser.xml index 9830114bda..70499d20ad 100644 --- a/gnome/core/totem-pl-parser.xml +++ b/gnome/core/totem-pl-parser.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/vte.xml b/gnome/core/vte.xml index 467bf5a5b1..e9b720f465 100644 --- a/gnome/core/vte.xml +++ b/gnome/core/vte.xml @@ -67,7 +67,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/gnome/core/yelp.xml b/gnome/core/yelp.xml index 952f6a6b1e..4959bb7d43 100644 --- a/gnome/core/yelp.xml +++ b/gnome/core/yelp.xml @@ -65,11 +65,6 @@ - Recommended - - - - Optional diff --git a/gnome/core/zenity.xml b/gnome/core/zenity.xml index 9c97f62b58..128478c639 100644 --- a/gnome/core/zenity.xml +++ b/gnome/core/zenity.xml @@ -67,9 +67,14 @@ + Recommended + + and + + + Optional - and @@ -95,13 +100,16 @@ make - - --> + + + Contents diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index e62d412635..f10a8b3b48 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,10 @@ [abenton] - Update Cairo to 1.12.2. + + [krejzi] - Sorted out remaining GNOME dependencies. + GNOME 3.4 is now in the book. + diff --git a/multimedia/libdriv/gst-plugins-base.xml b/multimedia/libdriv/gst-plugins-base.xml index af74d76b3c..ace866dd58 100644 --- a/multimedia/libdriv/gst-plugins-base.xml +++ b/multimedia/libdriv/gst-plugins-base.xml @@ -70,32 +70,42 @@ Required and - - - Optional - + + + + Recommended + , - , - (required if building Gnome), - or - (required to build the examples), , , - libvisual, , + and + + + + Optional (Required if building GNOME) + + + + + Optional + + , + (required to build the examples), + libvisual, ORC, - (gudev), - , (required to run the unit regression tests), and Valgrind - (optionally used during the unit regression tests) + (optionaly used during the unit regression tests) Optional (Required to Rebuild the API Documentation) - and - (compiled against an XML parser such as - ). + + and + (compiled against an XML parser such as + ). + User Notes: diff --git a/multimedia/libdriv/gst-plugins-good.xml b/multimedia/libdriv/gst-plugins-good.xml index 185da5044f..8d7dc53a6a 100644 --- a/multimedia/libdriv/gst-plugins-good.xml +++ b/multimedia/libdriv/gst-plugins-good.xml @@ -86,12 +86,24 @@ + Recommended + + , + , + , + and + + + + Optional (Required if building GNOME) + + and + + + Optional , - , - , - (Required for ), (required to build the examples), JACK, libavc1394 @@ -101,16 +113,12 @@ libcdio, , libiec61883, - , - , libshout, - (Required for ), ORC, , , , - Video4Linux, - and + Video4Linux and WavPack. diff --git a/multimedia/libdriv/gst-plugins-ugly.xml b/multimedia/libdriv/gst-plugins-ugly.xml index b6528bb936..a1588ec9b6 100644 --- a/multimedia/libdriv/gst-plugins-ugly.xml +++ b/multimedia/libdriv/gst-plugins-ugly.xml @@ -70,35 +70,46 @@ GStreamer Ugly Plug-ins Dependencies Required - + + + + + Recommended + + , + and + + Optional - , - , - libcdio, - , - , - , - , - - libsidplay, - - OpenCore AMR, - ORC, - TwoLAME and - x264 + + , + libcdio, + , + , + + libsidplay, + + OpenCore AMR, + ORC, + TwoLAME and + x264 Optional, for the unit regression tests - To run the tests you need to have compiled gstreamer against libcheck, - and you can optionally use - Valgrind + + To run the tests you need to have compiled gstreamer against libcheck, + and you can optionaly use + Valgrind + Optional (Required to Rebuild the API Documentation) - and - (compiled against an XML parser such as - ). + + and + (compiled against an XML parser such as + ) + User Notes: diff --git a/multimedia/libdriv/gstreamer.xml b/multimedia/libdriv/gstreamer.xml index c8df864703..4394428d94 100644 --- a/multimedia/libdriv/gstreamer.xml +++ b/multimedia/libdriv/gstreamer.xml @@ -67,42 +67,52 @@ GStreamer Dependencies Required - , and - + + and + + + + Optional (Required if building GNOME) + + + Optional - - (required if building Gnome), + , (required to run the unit regression tests and also enables - libgstcheck-0.10), and + libgstcheck-0.10), and Valgrind - (optionally used during the unit regression tests) + (optionaly used during the unit regression tests) Optional (Required to build the API Documentation) - and - (compiled against an XML Parser such as - ). Alternatively, developers can access - the online API docs at freedesktop.org + + and + (compiled against an XML Parser such as + ). Alternatively, developers can access + the online API docs at + freedesktop.org Optional (Required to Build Manuals) - , - , - , - Transfig (all needed - to build the HTML manual), plus - , and - Netpbm - to build the postscript and PDF manuals. - Alternatively, developers can access the online manual at freedesktop.org + + , + , + , + Transfig (all needed + to build the HTML manual), plus + , and + Netpbm + to build the postscript and PDF manuals. + Alternatively, developers can access the online manual at + freedesktop.org User Notes: diff --git a/multimedia/libdriv/libcanberra.xml b/multimedia/libdriv/libcanberra.xml index bb76c15d4a..ce83c30e04 100644 --- a/multimedia/libdriv/libcanberra.xml +++ b/multimedia/libdriv/libcanberra.xml @@ -4,7 +4,8 @@ %general-entities; - + @@ -33,7 +34,7 @@ XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. - &lfs70_built; + &lfs70_checked; Package Information @@ -60,17 +61,26 @@ libcanberra Dependencies Required - + + + + + Recommended + + + + + Optional (Required if building GNOME) + + and + + Optional - , - , , - , , - , - , and + and tdb @@ -86,7 +96,7 @@ commands: ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas && + --disable-oss && make This package does not come with a test suite. @@ -100,10 +110,6 @@ make Command Explanations - : - Omit this parameter if you are not installing - libcanberra for a GNOME installation. - @@ -118,15 +124,17 @@ make Installed Directories - canberra-boot and canberra-gtk-play - libcanberra-alsa.so, libcanberra-gstreamer.so, - libcanberra-gtk-module.so, libcanberra-gtk.so, - libcanberra-gtk3-module.so, libcanberra-gtk3.so, libcanberra-multi.so, - libcanberra-null.so, libcanberra-oss.so, libcanberra-pulse.so, and - libcanberra.so - /usr/{lib/{gnome-settings-daemon-3.0/gtk-modules,libcanberra-0.28}, - share/{doc/libcanberra,gdm/autostart/LoginWindow,gnome/{autostart, - shutdown},gtk-doc/html/libcanberra}} + + canberra-boot and canberra-gtk-play + + + libcanberra-gtk.so, libcanberra-gtk3.so and + libcanberra.so + + + /usr/lib/libcanberra-0.28, /usr/share/doc/libcanberra + and /usr/share/gtk-doc/html/libcanberra + @@ -135,16 +143,6 @@ make - - canberra-gtk-play @@ -155,110 +153,30 @@ make - - libcanberra-alsa.so - - is an ALSA backend. - - libcanberra-alsa.so - - - - - - libcanberra-gstreamer.so - - is an GStreamer backend. - - libcanberra-gstreamer.so - - - - - - libcanberra-gtk-module.so - - contains Gtk+2 module functions. - - libcanberra-gtk-module.so - - - - libcanberra-gtk.so - contains Gtk+2 libcanberra bindings functions. + contains the libcanberra bindings for GTK+2. libcanberra-gtk.so - - libcanberra-gtk3-module.so - - contains Gtk+3 module functions. - - libcanberra-gtk3-module.so - - - - libcanberra-gtk3.so - contains Gtk+3 libcanberra bindings functions. + contains the libcanberra bindings for GTK+3. libcanberra-gtk3.so - - libcanberra-multi.so - - is a multi backend. - - libcanberra-multi.so - - - - - - libcanberra-null.so - - is a null backend. - - libcanberra-null.so - - - - - - libcanberra-oss.so - - is an oss backend. - - libcanberra-oss.so - - - - - - libcanberra-pulse.so - - is an PulseAudio backend. - - libcanberra-pulse.so - - - - libcanberra.so - contains general libcanberra API functions. + contains the libcanberra API functions. libcanberra.so diff --git a/networking/netlibs/geocode-glib.xml b/networking/netlibs/geocode-glib.xml index e3365652d9..46fcff28f2 100644 --- a/networking/netlibs/geocode-glib.xml +++ b/networking/netlibs/geocode-glib.xml @@ -85,7 +85,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/networking/netlibs/glib-networking.xml b/networking/netlibs/glib-networking.xml index 0165cf90a8..5953931a5c 100644 --- a/networking/netlibs/glib-networking.xml +++ b/networking/netlibs/glib-networking.xml @@ -66,11 +66,15 @@ + Recommended + + + + Optional - , - and - + and + User Notes: diff --git a/networking/netlibs/libchamplain.xml b/networking/netlibs/libchamplain.xml index 416537b9f5..adf1bd66b3 100644 --- a/networking/netlibs/libchamplain.xml +++ b/networking/netlibs/libchamplain.xml @@ -84,7 +84,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/networking/netlibs/libgdata.xml b/networking/netlibs/libgdata.xml index d8c454da1d..d03fc4b57d 100644 --- a/networking/netlibs/libgdata.xml +++ b/networking/netlibs/libgdata.xml @@ -63,13 +63,12 @@ Required and - (built with GNOME support). + (built with GNOME support libraries). Recommended - (Required if building GNOME) Optional diff --git a/networking/netlibs/librest.xml b/networking/netlibs/librest.xml index cd8cd177e4..897acecad8 100644 --- a/networking/netlibs/librest.xml +++ b/networking/netlibs/librest.xml @@ -68,7 +68,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/networking/netutils/networkmanager.xml b/networking/netutils/networkmanager.xml index 7ce29516d0..33b3cee829 100644 --- a/networking/netutils/networkmanager.xml +++ b/networking/netutils/networkmanager.xml @@ -94,7 +94,6 @@ or and - (Required if building Gnome Shell). Optional diff --git a/postlfs/security/accountsservice.xml b/postlfs/security/accountsservice.xml index ed213a39ac..e2110685f1 100644 --- a/postlfs/security/accountsservice.xml +++ b/postlfs/security/accountsservice.xml @@ -61,12 +61,20 @@ AccountsService Dependencies Required - and - + + and + + + + Optional (Required if building GNOME) + + + Optional - and - + + + User Notes: diff --git a/postlfs/security/consolekit.xml b/postlfs/security/consolekit.xml index 6230a765dd..f3d1767532 100644 --- a/postlfs/security/consolekit.xml +++ b/postlfs/security/consolekit.xml @@ -9,7 +9,7 @@ - + ]> @@ -61,12 +61,16 @@ ConsoleKit Dependencies Required - and - + + and + + Recommended - - and + + and + + If you intend NOT to install @@ -76,7 +80,9 @@ Optional - + + + User Notes: @@ -90,8 +96,8 @@ commands: ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/ConsoleKit --localstatedir=/var \ - --enable-pam-module && + --localstatedir=/var --libexecdir=/usr/lib/ConsoleKit \ + --enable-pam-module && make This package does not come with a test suite. diff --git a/postlfs/security/polkit.xml b/postlfs/security/polkit.xml index 37eace651b..1795b6d10c 100644 --- a/postlfs/security/polkit.xml +++ b/postlfs/security/polkit.xml @@ -61,18 +61,23 @@ Required - , - and - + and + + + + Optional (Required if building GNOME) + + + Optional - , - , - , - , - and - + , + , + , + and + + If is installed then Installation of polkit - Install polkit by running the following commands as an unprivileged user: -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/polkit-1 \ - --localstatedir=/var \ +./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --with-authfw=shadow && make diff --git a/postlfs/virtualization/libosinfo.xml b/postlfs/virtualization/libosinfo.xml index a8fb4c612c..6519dd0c06 100644 --- a/postlfs/virtualization/libosinfo.xml +++ b/postlfs/virtualization/libosinfo.xml @@ -79,12 +79,16 @@ (built with GNOME components). + Recommended + + and + + + Optional - (required for the test suite), - , - and - + (required for the test suite) and + diff --git a/postlfs/virtualization/libvirt-glib.xml b/postlfs/virtualization/libvirt-glib.xml index 6f07383c58..12da1a9ea3 100644 --- a/postlfs/virtualization/libvirt-glib.xml +++ b/postlfs/virtualization/libvirt-glib.xml @@ -80,11 +80,16 @@ + Recommended + + and + + + + Optional - , - and - + diff --git a/postlfs/virtualization/spice-gtk.xml b/postlfs/virtualization/spice-gtk.xml index ac9604ffb8..91154f1df7 100644 --- a/postlfs/virtualization/spice-gtk.xml +++ b/postlfs/virtualization/spice-gtk.xml @@ -12,7 +12,6 @@ ]> - diff --git a/x/lib/atk.xml b/x/lib/atk.xml index 08ff69b338..caf7f84356 100644 --- a/x/lib/atk.xml +++ b/x/lib/atk.xml @@ -65,9 +65,13 @@ + Optional (Required if building GNOME) + + + + Optional - (required if building Gnome) and diff --git a/x/lib/clutter-gst.xml b/x/lib/clutter-gst.xml index c1026a7f5f..c7df6da95c 100644 --- a/x/lib/clutter-gst.xml +++ b/x/lib/clutter-gst.xml @@ -67,9 +67,13 @@ + Recommended + + + + Optional - and diff --git a/x/lib/clutter-gtk.xml b/x/lib/clutter-gtk.xml index c731ba3753..1d43a9484e 100644 --- a/x/lib/clutter-gtk.xml +++ b/x/lib/clutter-gtk.xml @@ -67,9 +67,13 @@ + Recommended + + + + Optional - and diff --git a/x/lib/clutter.xml b/x/lib/clutter.xml index fd42e406c1..c410d9ae84 100644 --- a/x/lib/clutter.xml +++ b/x/lib/clutter.xml @@ -86,7 +86,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/x/lib/cogl.xml b/x/lib/cogl.xml index 9417175eb1..038afa88be 100644 --- a/x/lib/cogl.xml +++ b/x/lib/cogl.xml @@ -70,7 +70,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/x/lib/gdk-pixbuf.xml b/x/lib/gdk-pixbuf.xml index f49391f1a7..15fd71add6 100644 --- a/x/lib/gdk-pixbuf.xml +++ b/x/lib/gdk-pixbuf.xml @@ -71,9 +71,13 @@ + Optional (Required if building GNOME) + + + + Optional - (required if building Gnome), and diff --git a/x/lib/gtk+3.xml b/x/lib/gtk+3.xml index 0575b5a7ac..34b5a6d7cd 100644 --- a/x/lib/gtk+3.xml +++ b/x/lib/gtk+3.xml @@ -82,12 +82,16 @@ + Optional (Required if building GNOME) + + + + Optional , , - , - (required if building Gnome) and + and . diff --git a/x/lib/gtk-vnc.xml b/x/lib/gtk-vnc.xml index cf56bac96d..deec93f68d 100644 --- a/x/lib/gtk-vnc.xml +++ b/x/lib/gtk-vnc.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/x/lib/libnotify.xml b/x/lib/libnotify.xml index 7c2ef3a29f..51e495b64f 100644 --- a/x/lib/libnotify.xml +++ b/x/lib/libnotify.xml @@ -66,9 +66,13 @@ + Optional (Required if building GNOME) + + + + Optional - (Required if building GNOME) and diff --git a/x/lib/libxklavier.xml b/x/lib/libxklavier.xml index d32616940e..fe32a8eec7 100644 --- a/x/lib/libxklavier.xml +++ b/x/lib/libxklavier.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/x/lib/mx.xml b/x/lib/mx.xml index 825320d937..8dca715bf9 100644 --- a/x/lib/mx.xml +++ b/x/lib/mx.xml @@ -71,7 +71,6 @@ Recommended - (Required if building GNOME) Optional diff --git a/x/lib/pango.xml b/x/lib/pango.xml index f89b950b69..4144f22320 100644 --- a/x/lib/pango.xml +++ b/x/lib/pango.xml @@ -69,9 +69,13 @@ + Optional (Required if building GNOME) + + + + Optional - (required if building Gnome), and LibThai diff --git a/x/lib/webkitgtk.xml b/x/lib/webkitgtk.xml index 12691b11f4..8d714c9afc 100644 --- a/x/lib/webkitgtk.xml +++ b/x/lib/webkitgtk.xml @@ -77,8 +77,6 @@ Required , - , - , , , or @@ -90,12 +88,15 @@ . + Optional (Required if building GNOME) + + + + Optional , , - (required if building - epiphany), and MathML. diff --git a/xincludes/static-libraries.xml b/xincludes/static-libraries.xml index 3da6adb38f..b66bd6de1b 100644 --- a/xincludes/static-libraries.xml +++ b/xincludes/static-libraries.xml @@ -2,6 +2,9 @@ + + : This switch prevents installation of static versions of the libraries. diff --git a/xincludes/without-scrollkeeper.xml b/xincludes/without-scrollkeeper.xml new file mode 100644 index 0000000000..0ad1ad384a --- /dev/null +++ b/xincludes/without-scrollkeeper.xml @@ -0,0 +1,12 @@ + + + + + + + : Use this parameter if you + have installed Rarian but wish to disable the + updates to the Scrollkeeper database. +