[blfs] 01/01: Merge branch 'xry111/intltool' into trunk

"Git Owner" ([email protected] via blfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.beyond.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository blfs.

commit cc7f454cc0dc9dec790f8b943fa466dfdcfcc523
Merge: b2979377a7 675c3e73d6
Author: Pierre Labastie <[email protected]>
AuthorDate: Tue Apr 21 14:17:00 2026 +0200

    Merge branch 'xry111/intltool' into trunk
    
    intltool and XML::Parser have been removed from LFS, so it is
    time to merge this branch. Normally, all dependencies on
    intltool are covered, but nothing is sure about dependencies
    on XML::Parser only. It may be hard to discover all of them
    since it is possible that XML::Parser be needed ony for
    documentation, that we don't always build.

 general/genutils/intltool.xml                  |   7 +-
 general/graphlib/libmypaint.xml                |   1 +
 gnome/applications/brasero.xml                 |   1 +
 gnome/applications/evolution.xml               |   1 +
 intltool-possible-rev-dep.txt                  | 829 +++++++++++++++++++++++++
 lxqt/desktop/libfm-extra.xml                   |   3 +-
 multimedia/libdriv/sound-theme-freedesktop.xml |   7 +
 packages.ent                                   |   1 +
 postlfs/security/polkit-gnome.xml              |   3 +-
 pst/ps/paps.xml                                |   3 +-
 x/dm/lightdm.xml                               |   1 +
 x/icons/gnome-icon-theme.xml                   |   5 +-
 x/icons/gnome-themes-extra.xml                 |   3 +-
 x/lib/goffice010.xml                           |   1 +
 xsoft/other/xarchiver.xml                      |   3 +-
 xsoft/other/xscreensaver.xml                   |   3 +-
 16 files changed, 863 insertions(+), 9 deletions(-)

diff --cc general/genutils/intltool.xml
index 4e695c95e2,152086ead8..aa717f8116
--- a/general/genutils/intltool.xml
+++ b/general/genutils/intltool.xml
@@@ -71,8 -71,8 +71,7 @@@
        </listitem>
      </itemizedlist>
  
 -<!-- TODO: add this back when we move XML::Parser back into BLFS as well
      <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
- 
      <bridgehead renderas="sect4">Required</bridgehead>
      <para role="required">
        <xref linkend="perl-xml-parser"/>
@@@ -83,18 -87,12 +82,24 @@@
    <sect2 role="installation">
      <title>Installation of Intltool</title>
  
 +    <para>First fix a warning that is caused by perl-5.22 and later:</para>
 +
 +<screen><userinput remap="pre">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>
+       First fix a warning that is caused by perl-5.22 and later:
+     </para>
+ 
+ <screen><userinput>sed -i 's:\\\${:\\\$\\{:' intltool-update.in</userinput></screen>
+ 
      <para>
        Install <application>Intltool</application> by running the following
        commands:
diff --cc packages.ent
index f3fa02c4be,4a04b38381..5a5499502d
--- a/packages.ent
+++ b/packages.ent
@@@ -277,14 -277,14 +277,15 @@@
  <!ENTITY bogofilter-version           "1.2.5">
  <!ENTITY compface-version             "1.5.2">
  <!ENTITY desktop-file-utils-version   "0.28">
 -<!ENTITY dos2unix-version             "7.5.4">
 -<!ENTITY graphviz-version             "14.1.3">
 +<!ENTITY dos2unix-version             "7.5.5">
 +<!ENTITY graphviz-version             "14.1.5">
  <!ENTITY gtk-doc-major                "1.36">
 -<!ENTITY gtk-doc-version              "1.36.0">
 +<!ENTITY gtk-doc-version              "1.36.1">
  <!ENTITY highlight-version            "4.19">
  <!ENTITY ibus-version                 "1.5.33">
+ <!ENTITY intltool-version             "0.51.0">
  <!ENTITY imagemagick-version          "7.1.2">
 +<!ENTITY intltool-version             "0.51.0">
  <!ENTITY iso-codes-version            "4.20.1">
  <!ENTITY lsof-version                 "4.99.6">
  <!ENTITY pinentry-version             "1.3.2">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.