r3012 - in trunk: BOOK BOOK/gnome/core BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Nov 22 22:19:17 PST 2004


Author: randy
Date: 2004-11-22 23:19:15 -0700 (Mon, 22 Nov 2004)
New Revision: 3012

Added:
   trunk/patches/gnome-applets-2.8.1-fix_gswitchit-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/core/gnome-applets.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to GNOME Applets-2.8.1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-11-23 05:35:02 UTC (rev 3011)
+++ trunk/BOOK/general.ent	2004-11-23 06:19:15 UTC (rev 3012)
@@ -1,8 +1,8 @@
-<!ENTITY day          "22">
+<!ENTITY day          "23">
 <!ENTITY month        "11">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "November &day;nd, &year;">
+<!ENTITY releasedate  "November &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->

Modified: trunk/BOOK/gnome/core/gnome-applets.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-applets.xml	2004-11-23 05:35:02 UTC (rev 3011)
+++ trunk/BOOK/gnome/core/gnome-applets.xml	2004-11-23 06:19:15 UTC (rev 3012)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY gnome-applets-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.6/gnome-applets-&gnome-applets-version;.tar.bz2">
-<!ENTITY gnome-applets-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.6/gnome-applets-&gnome-applets-version;.tar.bz2">
-<!ENTITY gnome-applets-size "5.3 MB">
-<!ENTITY gnome-applets-buildsize "117.8 MB">
-<!ENTITY gnome-applets-time "0.85 SBU">
-
+<!ENTITY gnome-applets-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
+<!ENTITY gnome-applets-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
+<!ENTITY gnome-applets-md5sum "472941a24eaf4ef6e7012f07d32e83cf">
+<!ENTITY gnome-applets-size "6.4 MB">
+<!ENTITY gnome-applets-buildsize "105 MB">
+<!ENTITY gnome-applets-time "4.04 SBU">
 ]>
 
 <sect1 id="gnome-applets" xreflabel="GNOME Applets-&gnome-applets-version;">
@@ -21,11 +21,12 @@
 <title>GNOME Applets-&gnome-applets-version;</title>
 
 <sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> Applets</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> 
+Applets</application></title>
 
-<para>The <application><acronym>GNOME</acronym> Applets</application> package contains small applications which
-generally run in the background and display their output to the gnome
-panel.</para>
+<para>The <application><acronym>GNOME</acronym> Applets</application> package 
+contains small applications which generally run in the background and display 
+their output to the gnome panel.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -33,6 +34,7 @@
 url="&gnome-applets-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&gnome-applets-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &gnome-applets-md5sum;</para></listitem>
 <listitem><para>Download size: &gnome-applets-size;</para></listitem>
 <listitem><para>Estimated Disk space required:
 &gnome-applets-buildsize;</para></listitem>
@@ -40,63 +42,86 @@
 &gnome-applets-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application><acronym>GNOME</acronym> Applets</application> dependencies</title>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink 
+url="&patch-root;/gnome-applets-&gnome-applets-version;-fix_gswitchit-1.patch"/>
+</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>GNOME</acronym> Applets</application> 
+dependencies</title>
 <sect4><title>Required</title>
-<para>
-<xref linkend="gail"/>,
+<para><xref linkend="gail"/>, 
 <xref linkend="gnome-panel"/> and
-<xref linkend="libxklavier"/>
-</para></sect4>
+<xref linkend="libxklavier"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>
-<xref linkend="libgtop"/> and
-<xref linkend="gst-plugins"/>
-</para></sect4>
+<para><xref linkend="libgtop"/>, 
+<xref linkend="gst-plugins"/>, 
+<xref linkend="docbook-utils"/> and 
+<ulink 
+url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>
+</para>
+</sect4>
 </sect3>
 
 </sect2>
 
 <sect2>
-<title>Installation of <application><acronym>GNOME</acronym> Applets</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> 
+Applets</application></title>
 
-<para>Install <application><acronym>GNOME</acronym> Applets</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Applets</application> by 
+running the following commands:</para>
 
 <screen><userinput><command>PRE=`pkg-config --variable=prefix ORBit-2.0` &&
+patch -Np1 -i ../gnome-applets-&gnome-applets-version;-fix_gswitchit-1.patch &&
 ./configure --prefix=$PRE --libexecdir=$PRE/sbin \
     --localstatedir=/var/lib --sysconfdir=/etc/gnome &&
 make tooldir=$PRE/lib/gnome-applets &&
 make tooldir=$PRE/lib/gnome-applets install &&
+make -C man install-man &&
 unset PRE</command></userinput></screen>
 
+<note><para>If you build the package as an ordinary user then switch to the 
+root user to install the package, ensure you set the <envar>PRE</envar> 
+variable again before installing the package.</para></note>
+
 </sect2>
 
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--libexecdir=$PRE/sbin</parameter>: This switch puts libexec files in
-<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<para><parameter>--libexecdir=$PRE/sbin</parameter>: This switch puts libexec 
+files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of 
 <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
 <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-puts <application>ScrollKeeper</application> files in <filename
-class="directory">/var/lib/scrollkeeper</filename>
-instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+puts <application>ScrollKeeper</application> files in 
+<filename class="directory">/var/lib/scrollkeeper</filename> instead of 
+<filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
 <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
-<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+puts configuration files in <filename class="directory">/etc/gnome</filename> 
+instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-<para><parameter>tooldir=$PRE/lib/gnome-applets</parameter>: This puts the gnome-applet
-internal files in <filename>$PRE/lib/gnome-applets</filename> instead of
-<filename>$PRE/sbin/gnome-applets</filename>.</para>
+<para><parameter>tooldir=$PRE/lib/gnome-applets</parameter>: This puts the 
+gnome-applet internal files in 
+<filename class='directory'>$PRE/lib/gnome-applets</filename> instead of 
+<filename class='directory'>$PRE/sbin/gnome-applets</filename>.</para>
 
+<para><command>make -C man install-man</command>: This installs the man-pages 
+in <filename class='directory'>$PRE/man</filename>.</para>
+
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application><acronym>GNOME</acronym> Applets</application> package contains
-<command>battstat</command>, <command>cdplayer</command>,
+<para>The <application><acronym>GNOME</acronym> Applets</application> package 
+contains <command>battstat</command>, <command>cdplayer</command>, 
 <command>charpick</command>, <command>drivemount</command>,
 <command>geyes</command>, <command>gkb</command>,
 <command>gtik2</command>, <command>gweather</command>,
@@ -108,7 +133,8 @@
 <sect2><title>Description</title>
 
 <sect3><title>applets</title>
-<para>These are small programs designed to run inside the Panel display.</para></sect3>
+<para>These are small programs designed to run inside the Panel 
+display.</para></sect3>
 
 </sect2>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-23 05:35:02 UTC (rev 3011)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-23 06:19:15 UTC (rev 3012)
@@ -31,8 +31,8 @@
 libgnome-2.8.0, libgnomecanvas-2.8.0, libbonoboui-2.8.0, 
 GNOME-Icon-Theme-2.8.0, gnome-keyring-0.4.0, libgnomeui-2.8.0, 
 GNOME-Themes-2.8.1, GNOME-Desktop-2.8.1, libwnck-2.8.1, GNOME-Panel-2.8.1, 
-GNOME-Session-2.8.1, GNOME-Terminal-2.8.0, libgtop-2.8.1 and 
-GAIL-1.8.0.</para></listitem>
+GNOME-Session-2.8.1, GNOME-Terminal-2.8.0, libgtop-2.8.1, GAIL-1.8.0 and 
+GNOME-Applets-2.8.1.</para></listitem>
 
 <listitem><para>November 21st, 2004 [igor]: Applied a bunch of fixes to
 XScreenSaver, contributed by Randy.</para></listitem>

Added: trunk/patches/gnome-applets-2.8.1-fix_gswitchit-1.patch
===================================================================
--- trunk/patches/gnome-applets-2.8.1-fix_gswitchit-1.patch	2004-11-23 05:35:02 UTC (rev 3011)
+++ trunk/patches/gnome-applets-2.8.1-fix_gswitchit-1.patch	2004-11-23 06:19:15 UTC (rev 3012)
@@ -0,0 +1,82 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-11-19
+Initial Package Version: 2.8.1
+Upstream Status:         Included in version 2.9.1
+Origin:                  Diff from development 2.9.1 version
+Description:             Fixes build due to the API change in libxklavier
+
+$LastChangedBy$
+$Date$
+
+--- gnome-applets-2.8.1/libgswitchit/gswitchit_config.c	2004-11-19 18:23:42.600883816 +0000
++++ gnome-applets-2.9.1/libgswitchit/gswitchit_config.c	2004-10-04 21:54:55.000000000 +0000
+@@ -380,44 +380,6 @@
+ }
+ 
+ static gboolean
+-_GSwitchItXkbConfigDoWithSettings (GSwitchItXkbConfig *
+-				   xkbConfig,
+-				   gboolean activate,
+-				   const char *psFileName)
+-{
+-	gboolean rv = FALSE;
+-
+-	XklConfigRec data;
+-	XklConfigRecInit (&data);
+-
+-	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
+-
+-	if (activate) {
+-		rv = XklConfigActivate (&data, NULL);
+-	} else {
+-		char *home = getenv ("HOME");
+-		char xkmFileName[PATH_MAX];
+-		char cmd[PATH_MAX * 2 + 20];
+-		int status;
+-		g_snprintf (xkmFileName, sizeof (xkmFileName),
+-			    "%s/.gnome_private/xkbpreview.xkm", home);
+-		rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
+-		if (rv) {
+-			g_snprintf (cmd, sizeof (cmd),
+-				    "xkbprint -full -color %s %s",
+-				    xkmFileName, psFileName);
+-			status = system (cmd);
+-			XklDebug (100, "Res: [%d]\n", status);
+-			//unlink( xkmFileName );
+-		} else {
+-			XklDebug (10, "Could not create XKM file!\n");
+-		}
+-	}
+-	XklConfigRecDestroy (&data);
+-	return rv;
+-}
+-
+-static gboolean
+ _GSListStrEqual (GSList * l1, GSList * l2)
+ {
+ 	if (l1 == l2)
+@@ -752,15 +714,16 @@
+ gboolean
+ GSwitchItXkbConfigActivate (GSwitchItXkbConfig * xkbConfig)
+ {
+-	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, TRUE, NULL);
+-}
++	gboolean rv = FALSE;
+ 
+-gboolean
+-GSwitchItXkbConfigDumpSettings (GSwitchItXkbConfig * xkbConfig,
+-				const char *fileName)
+-{
+-	return _GSwitchItXkbConfigDoWithSettings (xkbConfig, FALSE,
+-						  fileName);
++	XklConfigRec data;
++	XklConfigRecInit (&data);
++
++	_GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
++
++	rv = XklConfigActivate (&data);
++	XklConfigRecDestroy (&data);
++	return rv;
+ }
+ 
+ void


Property changes on: trunk/patches/gnome-applets-2.8.1-fix_gswitchit-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list