linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 06:27:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move metacity to gnome-core because it can no longer be run without the gnome-daemons, particularly gnome-session, and is now not run by 'exec metacity' from .xinitrc.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9346 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2012-02-10 16:46:16 +00:00
parent ef14dbc47f
commit 604ef1fa10
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.ent
View File

@ -621,7 +621,6 @@ $Date$
<!-- Chapter 25 -->
<!ENTITY sawfish-version "1.6.1">
<!ENTITY fluxbox-version "1.3.2">
<!ENTITY metacity-version "2.34.1">
<!-- Unmaintained
<!ENTITY xfce-version "4.4.2">
@ -709,6 +708,7 @@ $Date$
<!-- Shell Fallback -->
<!ENTITY gnome-panel-version "2.30.2">
<!ENTITY metacity-version "2.34.1">
<!-- Platform -->
<!ENTITY gnome-mime-data-version "2.18.0">

4
gnome/core/core.xml
View File

@ -113,8 +113,8 @@ $Date$
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-shell-fallback.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-panel.xml"/>
<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-metacity.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-notification-daemon.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="metacity.xml"/>
<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-notification-daemon.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-dbus-python.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-polkit-gnome.xml"/>-->

23
x/wm/metacity.xml → gnome/core/metacity.xml
View File

@ -30,8 +30,10 @@
<sect2 role="package">
<title>Introduction to Metacity</title>
<para>The <application>Metacity</application> package contains a window
manager. This is useful for organizing and displaying windows.</para>
<para><application>Metacity</application> is the fallback window manager for
<application>GNOME</application>, used if the video driver does not provide
acceleration. It is conventionally run from <command>gnome-session</command>,
which will start the necessary <application>GNOME</application> daemons.</para>
&lfs70_checked;
@ -66,9 +68,8 @@
<xref linkend="zenity"/>, and
<xref linkend="libcanberra"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="startup-notification"/>
(recommended if you are installing <application>GNOME</application>-2)</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="optional"><xref linkend="startup-notification"/></para>
<bridgehead renderas="sect4">Additional Runtime Dependency</bridgehead>
<para role="optional"><xref linkend="notification-daemon"/>.</para>
@ -86,7 +87,6 @@
<screen><userinput>./configure \
--prefix=/usr \
--sysconfdir=/etc \
--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &amp;&amp;
make</userinput></screen>
@ -105,8 +105,7 @@ install -v -m644 README rationales.txt doc/*.txt \
<title>Command Explanations</title>
<para><option>--with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas</option>:
Omit this parameter if you are not installing
<application>Metacity</application> for a GNOME-2 installation.</para>
this will install the schema files are installed into the correct location.</para>
<para><option>--enable-static=no</option>: This switch prevents the static
libraries being installed.</para>
@ -118,6 +117,8 @@ install -v -m644 README rationales.txt doc/*.txt \
</sect2>
<!-- no longer correct, but retained as a comment, at least until gnome-session
has been updated.
<sect2 role="configuration" id="metacity-config">
<title>Configuring Metacity</title>
@ -144,7 +145,7 @@ EOF</userinput></screen>
</sect3>
</sect2>
</sect2>-->
<sect2 role="content">
<title>Contents</title>
@ -175,8 +176,8 @@ EOF</userinput></screen>
<varlistentry id="metacity-prog">
<term><command>metacity</command></term>
<listitem>
<para>is a window manager used mainly by
<application>GNOME</application>.</para>
<para>is the <application>GNOME</application> fallback window manager,
used when the video driver does not support acceleration.</para>
<indexterm zone="metacity metacity-prog">
<primary sortas="b-metacity">metacity</primary>
</indexterm>

4
introduction/welcome/changelog.xml
View File

@ -45,7 +45,9 @@
<para>February 11th, 2012</para>
<itemizedlist>
<listitem>
<para>[ken] - merge metacity-2.34.1 from Wayne, </para>
<para>[ken] - merge metacity-2.34.1 from Wayne, but move it into the gnome
part of the book because it can no longer be run without the gnome daemons.
</para>
</listitem>
</itemizedlist>
</listitem>

1
x/wm/wm.xml
View File

@ -55,7 +55,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sawfish.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fluxbox.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="metacity.xml"/>
<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-wms.xml"/>