Changeset a07f939

Timestamp:

02/15/2012 08:29:46 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:

da0b26c5

Parents:

ab1270a

Message:

gucharmap-3.2.2

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

Files:

• general.ent (modified) (2 diffs)
• gnome/add/add.xml (modified) (1 diff)
• gnome/core/core.xml (modified) (1 diff)
• gnome/core/gucharmap.xml (moved) (moved from gnome/add/gucharmap.xml ) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -730 +730 @@
 <!ENTITY gnome-terminal-version       "3.2.1">
 <!ENTITY gnome-utils-version          "3.2.1">
+<!ENTITY gucharmap-version            "3.2.2">
 <!ENTITY nautilus-version             "2.30.1">
 <!ENTITY yelp-version                 "2.30.1">
@@ -775 +776 @@
 <!ENTITY gnome-screensaver-version    "3.2.0">
 <!ENTITY gnome-system-tools-version   "2.30.2">
-<!ENTITY gucharmap-version            "2.30.2">
 <!ENTITY hamster-applet-version       "2.30.2">
 <!ENTITY seahorse-version             "2.30.1">

gnome/add/add.xml

@@ -50 +50 @@
   <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-system-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hamster-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>

gnome/core/core.xml

@@ -105 +105 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-terminal.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-utils.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gucharmap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus.xml"/>
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sushi.xml"/> -->

gnome/core/gucharmap.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-md5sum        "f997f6e6ba970fef7ec704da06e2de80">
-  <!ENTITY gucharmap-size          "3.0 MB">
-  <!ENTITY gucharmap-buildsize     "35 MB">
+  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.xz">
+  <!ENTITY gucharmap-md5sum        "f2cda38f8bc65acf0e9eac1e9805d8ae">
+  <!ENTITY gucharmap-size          "2.6 MB">
+  <!ENTITY gucharmap-buildsize     "38 MB">
   <!ENTITY gucharmap-time          "0.3 SBU">
 ]>
@@ -36 +36 @@
     only know by its Unicode name or code point.</para>
 
-    &lfs65_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65 +65 @@
     <para role="required"><xref linkend="intltool"/>,
     <xref linkend="glib2"/>, and
-    <xref linkend="gtk2"/></para>
+    <xref linkend="gtk3"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="GConf"/>,
-    <xref linkend="gir-repository"/>,
     <xref linkend="gnome-doc-utils"/>,
     <xref linkend="gtk-doc"/>,
@@ -89 +88 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp;
 make</userinput></screen>
 
@@ -111 +109 @@
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
     <para><option>--disable-gconf</option>: Use this parameter if you do not
     have <application>GConf</application> installed.</para>
@@ -122 +117 @@
     <para><option>--enable-introspection</option>: Use this parameter if you
     wish to enable <application>GObject introspection</application>.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

introduction/welcome/changelog.xml

@@ -66 +66 @@
           <para>[ken] - add gsettings-desktop-schemas-3.2.0 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge gucharmap-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>