Changeset 8394677a

Timestamp:

03/04/2022 03:15:39 PM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/intltool

Children:

4da8233

Parents:

4483a9a

git-author:

Xi Ruoyao <xry111@…> (03/04/2022 10:12:32 AM)

git-committer:

Xi Ruoyao <xry111@…> (03/04/2022 03:15:39 PM)

Message:

Add intltool back

This partially reverts commit 56605b904c9ec85e0994403b5d27b263f2751ec0.

Files:

• general/genutils/genutils.xml (modified) (1 diff)
• general/genutils/intltool.xml (moved) (moved from archive/intltool.xml ) (6 diffs)
• gnome/platform/gconf.xml (modified) (1 diff)
• lxde/apps/vte2.xml (modified) (1 diff)
• lxde/desktop/libwnck2.xml (modified) (1 diff)
• lxde/desktop/lxmenu-data.xml (modified) (1 diff)
• networking/netutils/networkmanager.xml (modified) (1 diff)
• packages.ent (modified) (4 diffs)
• x/icons/gnome-icon-theme.xml (modified) (1 diff)
• x/lib/gtk-engines.xml (modified) (1 diff)
• xfce/core/libxfce4util.xml (modified) (1 diff)
• xfce/core/tumbler.xml (modified) (1 diff)
• xsoft/other/gimp.xml (modified) (1 diff)
• xsoft/other/gparted.xml (modified) (1 diff)
• xsoft/other/pidgin.xml (modified) (1 diff)
• xsoft/other/transmission.xml (modified) (1 diff)

general/genutils/genutils.xml

@@ -36 +36 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>

general/genutils/intltool.xml

@@ -7 +7 @@
   <!ENTITY intltool-download-http "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
   <!ENTITY intltool-download-ftp  " ">
-  <!ENTITY intltool-md5sum        "23fbd879118253cb99aeac067da5f591">
-  <!ENTITY intltool-size          "188 KB">
-  <!ENTITY intltool-buildsize     "1.4 MB">
+  <!ENTITY intltool-md5sum        "12e517cac2b57a0121cda351570f1e63">
+  <!ENTITY intltool-size          "159 KB">
+  <!ENTITY intltool-buildsize     "1.5 MB">
   <!ENTITY intltool-time          "less than 0.1 SBU">
 ]>
@@ -39 +39 @@
     </para>
 
-    &lfs75_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74 +74 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
 
@@ -81 +81 @@
       <xref linkend="perl-xml-parser"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/intltool"/>
@@ -90 +90 @@
     <title>Installation of Intltool</title>
 
+    <para>First fix a warning that is caused by perl-5.22 and later:</para>
+
+<screen><userinput>sed -i 's:\\\${:\\\$\\{:' intltool-update.in</userinput></screen>
+
+    <note><para>The above regular expression looks unusual because of all the
+    backslashes.  What it does is add a backslash before the right brace
+    character in the sequence '\${' resulting in '\$\{'.</para></note>
+
     <para>
       Install <application>Intltool</application> by running the following
@@ -107 +115 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/I18N-HOWTO \
-    /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
+install -v -m644 -D doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
 
   </sect2>

gnome/platform/gconf.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/> and
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="intltool"/> and
       <xref linkend="libxml2"/>
     </para>

lxde/apps/vte2.xml

@@ -76 +76 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
     </para>
 

lxde/desktop/libwnck2.xml

@@ -76 +76 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
     </para>
 

lxde/desktop/lxmenu-data.xml

@@ -71 +71 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">LXMenu Data Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="intltool"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/lxmenu-data"/>

networking/netutils/networkmanager.xml

@@ -88 +88 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="intltool"/>,
       <xref linkend="jansson"/> and
       <xref linkend="libndp"/>

packages.ent

@@ -2 +2 @@
 <!-- Chapter 4 -->
 
-<!ENTITY acl-version                  "2.2.52">
-<!ENTITY attr-version                 "2.4.47">
 <!ENTITY consolekit-version           "1.2.1">
 <!ENTITY cracklib-version             "2.9.7">
@@ -97 +95 @@
 <!ENTITY enchant-version              "2.3.2">
 <!ENTITY exempi-version               "2.6.1">
-<!ENTITY expat-version                "2.1.0">
 <!ENTITY fftw-version                 "3.3.10">
 <!ENTITY gcab-version                 "0.7">
@@ -255 +252 @@
 <!ENTITY compface-version             "1.5.2">
 <!ENTITY desktop-file-utils-version   "0.26">
-<!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.50.0">
 <!ENTITY gtk-doc-major                "1.33">
@@ -265 +261 @@
 <!ENTITY imagemagick6-version         "6.9.10">
 <!ENTITY imagemagick-version          "7.1.0">
-<!ENTITY intltool-version             "0.50.2">
+<!ENTITY intltool-version             "0.51.0">
 <!ENTITY lsof-version                 "4.94.0">
 <!ENTITY pinentry-version             "1.2.0">

x/icons/gnome-icon-theme.xml

@@ -78 +78 @@
       <xref linkend="gtk3"/> or
       <xref role="nodep" linkend="gtk2"/>,
-      <xref linkend="hicolor-icon-theme"/>, and
-      <xref linkend="icon-naming-utils"/>
+      <xref linkend="icon-naming-utils"/>,
+      <xref linkend="intltool"/>, and
+      <xref linkend="hicolor-icon-theme"/>
     </para>
 

x/lib/gtk-engines.xml

@@ -77 +77 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
     </para>
 

xfce/core/libxfce4util.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="glib2"/>,
+      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="intltool"/>
     </para>
 

xfce/core/tumbler.xml

@@ -77 +77 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="intltool"/>
     </para>
 

xsoft/other/gimp.xml

@@ -152 +152 @@
       <xref linkend="glib-networking"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="harfbuzz"/>.
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="intltool"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libmypaint"/>,

xsoft/other/gparted.xml

@@ -75 +75 @@
     <para role="required">
       <!-- GTKMM2 is no longer used since 1.0.0, see #12110 -->
-      <xref linkend="gtkmm3"/> and
+      <xref linkend="gtkmm3"/>,
+      <xref linkend="intltool"/>, and
       <xref linkend="parted"/>
     </para>

xsoft/other/pidgin.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>
+      <xref linkend="gtk2"/> and
+      <xref linkend="intltool"/>
     </para>
 

xsoft/other/transmission.xml

@@ -83 +83 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="curl"/>, and
+      <xref linkend="curl"/>,
+      <xref linkend="intltool"/>, and
       <xref linkend="libevent"/>
     </para>