Changeset 604ef1f

Timestamp:

02/10/2012 04:46:16 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:

84ae34a

Parents:

ef14dbc

Message:

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.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9346 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• gnome/core/core.xml (modified) (1 diff)
• gnome/core/metacity.xml (moved) (moved from x/wm/metacity.xml ) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/wm/wm.xml (modified) (1 diff)

general.ent

@@ -622 +622 @@
 <!ENTITY sawfish-version              "1.6.1">
 <!ENTITY fluxbox-version              "1.3.2">
-<!ENTITY metacity-version             "2.34.1">
 
 <!-- Unmaintained
@@ -710 +709 @@
 <!-- Shell Fallback -->
 <!ENTITY gnome-panel-version          "2.30.2">
+<!ENTITY metacity-version             "2.34.1">
 
 <!-- Platform -->

gnome/core/core.xml

@@ -114 +114 @@
 
   <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"/>-->

gnome/core/metacity.xml

@@ -31 +31 @@
     <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;
@@ -67 +69 @@
     <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>
@@ -87 +88 @@
 <screen><userinput>./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
     --with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &amp;&amp;
 make</userinput></screen>
@@ -106 +106 @@
 
     <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
@@ -119 +118 @@
   </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>
@@ -145 +146 @@
     </sect3>
 
-  </sect2>
+  </sect2>-->
 
   <sect2 role="content">
@@ -176 +177 @@
         <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>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <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>

x/wm/wm.xml

@@ -56 +56 @@
   <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"/>