Changeset 3116315

Timestamp:

07/21/2007 07:02:05 PM (17 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 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:

45a3c48

Parents:

b4be59c1

Message:

Updated to Metacity-2.18.5

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/wm/metacity.xml (modified) (6 diffs)

general.ent

@@ -426 +426 @@
 <!ENTITY sawfish-version              "1.3">
 <!ENTITY fluxbox-version              "0.9.15.1">
-<!ENTITY metacity-version             "2.14.5">
+<!ENTITY metacity-version             "2.18.5">
 <!ENTITY xfce-version                 "4.2.3.2">
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to Metacity-2.18.5</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added new package libgnomekbd-2.18.2 to the GNOME
           Additional packages Libraries section.</para>

x/wm/metacity.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY metacity-download-http "&gnome-download-http;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-md5sum        "a14c4a07e456a2590452d6c9db2e5153">
-  <!ENTITY metacity-size          "1.8 MB">
-  <!ENTITY metacity-buildsize     "54.9 MB">
+  <!ENTITY metacity-download-http "&gnome-download-http;/metacity/2.18/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/2.18/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-md5sum        "7928172bf41f6b63976a62554a699674">
+  <!ENTITY metacity-size          "1.9 MB">
+  <!ENTITY metacity-buildsize     "61 MB">
   <!ENTITY metacity-time          "0.6 SBU">
+  
 ]>
 
@@ -67 +68 @@
     (recommended if you are installing <application>GNOME</application>-2),
     <xref linkend="intltool"/>, and
-    <ulink url="http://freedesktop.org/Software/xlibs">libXcomposite</ulink>*</para>
-
-    <para>* <application>libXcomposite</application> can optionally be used,
-    but here's what the <application>Metacity</application> package maintainer
-    has to say about it in the <command>configure</command> script if the
-    package is found: <quote>Not building compositing manager by default now,
-    must enable explicitly to get it. And it doesn't work, so don't bother
-    unless you want to hack on it...</quote></para>
+    <ulink url="&gnome-download-http;/libcm/">libcm</ulink>*</para>
+
+    <para>* Xorg <application>X</application> installations only.
+    <application>libcm</application> is used to build the
+    <application>Metacity</application> composite manager and it also requires
+    <application>libXcomposite</application> &gt;= 2.0. Xorg ships with
+    (XFree86 does not) the required <application>libXcomposite</application>
+    and there is not a stand-alone version that works.</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84 +85 @@
     <title>Installation of Metacity</title>
 
-    <para><application>Metacity</application> will look for an
+    <!-- <para><application>Metacity</application> will look for an
     <application>X Render</application> <application>pkg-config</application>
     file. If you use <application>XFree86</application> as your
     <application>X</application> Window system, ensure this file exists
-    (<filename>/usr/X11R6/lib/pkgconfig/xrender.pc</filename>).</para>
+    (<filename>/usr/X11R6/lib/pkgconfig/xrender.pc</filename>).</para> -->
 
     <para>Install <application>Metacity</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/metacity \
-            --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/metacity \
+    --sysconfdir=/etc \
+    --with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas &amp;&amp;
 make</userinput></screen>
 
@@ -105 +108 @@
 install -v -m755 -d /usr/share/doc/metacity-&metacity-version; &amp;&amp;
 install -v -m644 README rationales.txt doc/*.txt \
-    /usr/share/doc/metacity-&metacity-version;</userinput></screen>
+                    /usr/share/doc/metacity-&metacity-version;</userinput></screen>
 
   </sect2>
@@ -112 +115 @@
     <title>Command Explanations</title>
 
-    <para>
-    <option>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</option>:
-    Use this option if you are installing <application>Metacity</application> for
-    a GNOME-2 installation.</para>
+    <para><option>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</option>:
+    Omit this parameter if you are not installing
+    <application>Metacity</application> for a GNOME-2 installation.</para>
+
+    <para><option>--enable-compositor</option>: You must use this parameter
+    (and have <application>libcm</application> installed) to build the
+    <application>Metacity</application> composite manager.</para>
 
   </sect2>
@@ -164 +170 @@
         /usr/share/gnome/wm-properties,
         /usr/share/metacity and
-        /usr/share/themes/{AgingGorilla,Atlanta,Bright,Crux,Esco,Metabox,Simple}</seg>
+        the following subdirectories of /usr/share/themes/:
+        AgingGorilla Atlanta Bright Crux/metacity-1 Esco Metabox
+        Simple/metacity-1}</seg>
       </seglistitem>
     </segmentedlist>