Changeset c85a7c2 for gnome

Timestamp:

02/14/2012 06:27:08 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:

79f61a7

Parents:

b82ef46

Message:

gnome-screensaver-3.2.0

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

Location:

gnome

Files:

• add/add.xml (modified) (1 diff)
• core/core.xml (modified) (1 diff)
• core/gnome-screensaver.xml (moved) (moved from gnome/add/gnome-screensaver.xml ) (12 diffs)

gnome/add/add.xml

@@ -49 +49 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-nettool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-power-manager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screensaver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-monitor.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-tools.xml"/>

gnome/core/core.xml

@@ -70 +70 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-online-accounts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-packagekit.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screensaver.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-screensaver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-session.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-settings-daemon.xml"/>

gnome/core/gnome-screensaver.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
-  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
-  <!ENTITY gnome-screensaver-md5sum        "a18086bf2191795d87b7ea80b7b66daa">
-  <!ENTITY gnome-screensaver-size          "4.6 MB">
-  <!ENTITY gnome-screensaver-buildsize     "26 MB">
-  <!ENTITY gnome-screensaver-time          "0.3 SBU">
+  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
+  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.xz">
+  <!ENTITY gnome-screensaver-md5sum        "53fdcff388fadbc788571724874d5ab6">
+  <!ENTITY gnome-screensaver-size          "553 KB">
+  <!ENTITY gnome-screensaver-buildsize     "?? MB">
+  <!ENTITY gnome-screensaver-time          "?? SBU">
 ]>
 
@@ -36 +36 @@
     convenient user switching.</para>
 
-    &lfs65_checked;
+    <!-- &lfs65_checked; not for this version! -->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63 +63 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/> and
-    <xref linkend="gnome-menus"/></para>
+    <para role="required"><xref linkend="gnome-desktop"/>,
+    <xref linkend="gnome-menus"/>, and
+    <xref linkend="linux-pam"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -103 +104 @@
 
 <screen><userinput>sed -i 's|etc/pam\.d"|etc"|' data/Makefile.in &amp;&amp;
-./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-screensaver \
+./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib/gnome-screensaver \
             --with-pam-prefix=/etc &amp;&amp;
 make</userinput></screen>
@@ -144 +144 @@
     commands:</para>
 
-<screen role='root'><userinput>GNOMEDOCDIR="$(pkg-config \
-    --variable=prefix ORBit-2.0)/share/doc/gnome-screensaver-&gnome-screensaver-version;" &amp;&amp;
+<screen role='root'><userinput>GNOMEDOCDIR="$GNOME_PREFIX/share/doc/gnome-screensaver-&gnome-screensaver-version;" &amp;&amp;
 
 install -v -m644 -D doc/gnome-screensaver.html \
@@ -157 +156 @@
     user:</para>
 
-<screen role='root'><userinput>install -v -m755 -d $(pkg-config --variable=prefix \
-        ORBit-2.0)/share/applications/screensavers/xscreensaver &amp;&amp;
+<screen role='root'><userinput>install -v -m755 -d $GNOME_PREFIX/share/applications/screensavers/xscreensaver &amp;&amp;
 install -v -m644 xscreensavers/*.desktop \
-        $(pkg-config --variable=prefix \
-            ORBit-2.0)/share/applications/screensavers/xscreensaver</userinput></screen>
+        $GNOME_PREFIX/share/applications/screensavers/xscreensaver</userinput></screen>
 
   </sect2>
@@ -178 +175 @@
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-screensaver</parameter>: This parameter causes the
-    libexec files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-screensaver</filename>
-    instead of
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-screensaver</parameter>:
+    This parameter causes the libexec files to be installed in the preferred
+    location of <filename
+    class="directory">$GNOME_PREFIX/lib/gnome-screensaver</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
@@ -188 +184 @@
     used so that the <application>Linux-PAM</application> configuration file
     for the <application>gnome-screensaver</application> application is
-    installed in the correct location. You may omit this parameter if you
-    don't have <application>Linux-PAM</application> installed, though it
-    won't affect the build if you don't.</para>
+    installed in the correct location.</para>
 
     <para><option>--with-xscreensaverdir=$XSAVERDIR</option>: This parameter
@@ -205 +199 @@
 
       <para><filename>/etc/pam.d/gnome-screensaver</filename>,
-      <filename>&gnome-etc-dir;/gdm/custom.conf</filename></para>
+      <filename>$GNOME_SYSCONFDIR/gdm/custom.conf</filename></para>
 
       <indexterm zone="gnome-screensaver gnome-screensaver-config">
@@ -213 +207 @@
       <indexterm zone="gnome-screensaver gnome-screensaver-config">
         <primary sortas="etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
-        &gnome-etc-dir;/gdm/custom.conf</primary>
+        $GNOME_SYSCONFDIR/gdm/custom.conf</primary>
       </indexterm>
 
@@ -228 +222 @@
         <guimenuitem>Screensaver</guimenuitem> menu item from the
         <guimenu>Desktop</guimenu>&mdash;<guisubmenu>Preferences</guisubmenu>
-        drop-down menu. Some of the fine-tuning parameters are only available
-        using <xref linkend="gconf-editor"/>.</para>
+        drop-down menu.<!-- Some of the fine-tuning parameters are only available
+        using <xref linkend="gconf-editor"/>.--></para>
 
       </sect4>
@@ -236 +230 @@
         <title>Linux-PAM Configuration</title>
 
-        <para>If you have <application>Linux-PAM</application> installed, the
+        <!-- FIXME:ken PAM is *required*.  I assume this config does no harm
+        <para>If you have <application>Linux-PAM</application> installed, the-->
+        <para>The
         just-installed <filename>gnome-screensaver</filename> configuration
         file does not work with a BLFS system. Replace the existing file with