GNU bug report logs - #27360
[core-updates] gnu: intltool: Fix a compatibility issue with Perl 5.26.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 27360 in the body.
You can then email your comments to 27360 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [core-updates] gnu: intltool: Fix a compatibility issue with Perl
 5.26.0.
Date: Wed, 14 Jun 2017 11:44:59 -0400

* gnu/packages/patches/intltool-perl-compatibility.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/glib.scm (intltool)[source]: Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/glib.scm                              |  1 +
 .../patches/intltool-perl-compatibility.patch      | 51 ++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 gnu/packages/patches/intltool-perl-compatibility.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e30fa34ef..93dda46d0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -677,6 +677,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch	\
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
+  %D%/packages/patches/intltool-perl-compatibility.patch.patch	\
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch	\
   %D%/packages/patches/jbig2dec-ignore-testtest.patch		\
   %D%/packages/patches/jbig2dec-CVE-2016-9601.patch		\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index fcd1daf5e..926703e15 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -347,6 +347,7 @@ bindings to call into the C library.")
              (uri (string-append "https://launchpad.net/intltool/trunk/"
                                  version "/+download/intltool-"
                                  version ".tar.gz"))
+             (patches (search-patches "intltool-perl-compatibility.patch"))
              (sha256
               (base32
                "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"))))
diff --git a/gnu/packages/patches/intltool-perl-compatibility.patch b/gnu/packages/patches/intltool-perl-compatibility.patch
new file mode 100644
index 000000000..5fc5d507d
--- /dev/null
+++ b/gnu/packages/patches/intltool-perl-compatibility.patch
@@ -0,0 +1,51 @@
+This patch fixes a compatibility issue with Perl 5.26.0:
+
+https://bugs.launchpad.net/intltool/+bug/1696658
+
+Copied from 3rd-party repository:
+
+https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch
+
+--- intltool-0.51.0.orig/intltool-update.in	2015-03-09 02:39:54.000000000 +0100
++++ intltool-0.51.0.orig/intltool-update.in	2015-06-19 01:52:07.171228154 +0200
+@@ -1062,7 +1062,7 @@ 
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1190,10 +1190,10 @@ 
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@ 
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
-- 
2.13.1

Message #8 received at 27360 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 27360 <at> debbugs.gnu.org
Subject: Re: [core-updates] gnu: intltool: Fix a compatibility issue with
 Perl 5.26.0.
Date: Wed, 14 Jun 2017 12:03:47 -0400

[Message part 1 (text/plain, inline)]

On Wed, Jun 14, 2017 at 11:44:59AM -0400, Leo Famulari wrote:
> * gnu/packages/patches/intltool-perl-compatibility.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/glib.scm (intltool)[source]: Use it.

Hm, seems this patch only fixes the build of glib. With this patch
applied, at-spi2-core fails like this:

------
starting phase `check'
process 4420: D-Bus library appears to be incorrectly set up; failed to read machine uuid: Failed to open "/etc/machine-id": No such file or directory
See the manual page for dbus-uuidgen to correct this issue.
Making check in po
make[1]: Entering directory '/tmp/guix-build-at-spi2-core-2.24.1.drv-0/at-spi2-core-2.24.1/po'
INTLTOOL_EXTRACT="/gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-extract" XGETTEXT="/gnu/store/rdmn68786vmi67g4rn4scj0993lqjgbb-gettext-minimal-0.19.8.1/bin/xgettext" srcdir=. /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update --gettext-package at-spi2-core --pot
rm -f missing notexist
srcdir=. /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update -m
Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ?PACKAGE}?/ at /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update line 1071, <CONF> line 229.
make[1]: *** [Makefile:154: check] Error 255
make[1]: Leaving directory '/tmp/guix-build-at-spi2-core-2.24.1.drv-0/at-spi2-core-2.24.1/po'
make: *** [Makefile:541: check-recursive] Error 1
phase `check' failed after 0.2 seconds
------

And, it seems like other packages will have similar problems:

https://bugs.gentoo.org/show_bug.cgi?id=614698

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 27360 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Leo Famulari <leo <at> famulari.name>
Cc: 27360 <at> debbugs.gnu.org
Subject: Re: [bug#27360] [core-updates] gnu: intltool: Fix a compatibility
 issue with Perl 5.26.0.
Date: Thu, 15 Jun 2017 10:06:42 +0200

Leo Famulari <leo <at> famulari.name> skribis:

> On Wed, Jun 14, 2017 at 11:44:59AM -0400, Leo Famulari wrote:
>> * gnu/packages/patches/intltool-perl-compatibility.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Add it.
>> * gnu/packages/glib.scm (intltool)[source]: Use it.
>
> Hm, seems this patch only fixes the build of glib. With this patch
> applied, at-spi2-core fails like this:
>
> ------
> starting phase `check'
> process 4420: D-Bus library appears to be incorrectly set up; failed to read machine uuid: Failed to open "/etc/machine-id": No such file or directory
> See the manual page for dbus-uuidgen to correct this issue.
> Making check in po
> make[1]: Entering directory '/tmp/guix-build-at-spi2-core-2.24.1.drv-0/at-spi2-core-2.24.1/po'
> INTLTOOL_EXTRACT="/gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-extract" XGETTEXT="/gnu/store/rdmn68786vmi67g4rn4scj0993lqjgbb-gettext-minimal-0.19.8.1/bin/xgettext" srcdir=. /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update --gettext-package at-spi2-core --pot
> rm -f missing notexist
> srcdir=. /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update -m
> Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ?PACKAGE}?/ at /gnu/store/cgk7q1rix13xqdwnlf6bv19crkkcsn04-intltool-0.51.0/bin/intltool-update line 1071, <CONF> line 229.
> make[1]: *** [Makefile:154: check] Error 255
> make[1]: Leaving directory '/tmp/guix-build-at-spi2-core-2.24.1.drv-0/at-spi2-core-2.24.1/po'
> make: *** [Makefile:541: check-recursive] Error 1
> phase `check' failed after 0.2 seconds
> ------
>
> And, it seems like other packages will have similar problems:
>
> https://bugs.gentoo.org/show_bug.cgi?id=614698

Should we keep the previous version of Perl around (with the File::Path
patch that we currently have in ‘master’) for those packages that are
not ready yet?

Ludo’.

Message #14 received at 27360 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 27360 <at> debbugs.gnu.org
Subject: Re: [core-updates] gnu: intltool: Fix a compatibility issue with
 Perl 5.26.0.
Date: Thu, 29 Jun 2017 02:27:01 -0400

[Message part 1 (text/plain, inline)]

On Wed, Jun 14, 2017 at 12:03:47PM -0400, Leo Famulari wrote:
> On Wed, Jun 14, 2017 at 11:44:59AM -0400, Leo Famulari wrote:
> > * gnu/packages/patches/intltool-perl-compatibility.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> > * gnu/packages/glib.scm (intltool)[source]: Use it.
> 
> Hm, seems this patch only fixes the build of glib. With this patch
> applied, at-spi2-core fails like this:

[...]

Applying the attached patch to core-updates, I built packages of Git and
Borg that work for basic tasks.

[0001-gnu-intltool-Fix-a-compatibility-issue-with-Perl-5.2.patch (text/plain, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 27360 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Leo Famulari <leo <at> famulari.name>
Cc: 27360 <at> debbugs.gnu.org
Subject: Re: [bug#27360] [core-updates] gnu: intltool: Fix a compatibility
 issue with Perl 5.26.0.
Date: Thu, 29 Jun 2017 18:11:50 +0200

Hi,

Leo Famulari <leo <at> famulari.name> skribis:

> From 177de9dd8ebfe160d5937c43c39899c2c84a794b Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo <at> famulari.name>
> Date: Wed, 14 Jun 2017 11:42:38 -0400
> Subject: [PATCH] gnu: intltool: Fix a compatibility issue with Perl 5.26.0.
>
> * gnu/packages/patches/intltool-perl-compatibility.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/glib.scm (intltool)[source]: Use it.

LGTM, thank you!

Ludo’.

Message #22 received at 27360-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 27360-done <at> debbugs.gnu.org
Subject: Re: [bug#27360] [core-updates] gnu: intltool: Fix a compatibility
 issue with Perl 5.26.0.
Date: Thu, 29 Jun 2017 16:57:04 -0400

[Message part 1 (text/plain, inline)]

On Thu, Jun 29, 2017 at 06:11:50PM +0200, Ludovic Courtès wrote:
> Hi,
> 
> Leo Famulari <leo <at> famulari.name> skribis:
> 
> > From 177de9dd8ebfe160d5937c43c39899c2c84a794b Mon Sep 17 00:00:00 2001
> > From: Leo Famulari <leo <at> famulari.name>
> > Date: Wed, 14 Jun 2017 11:42:38 -0400
> > Subject: [PATCH] gnu: intltool: Fix a compatibility issue with Perl 5.26.0.
> >
> > * gnu/packages/patches/intltool-perl-compatibility.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> > * gnu/packages/glib.scm (intltool)[source]: Use it.
> 
> LGTM, thank you!

Pushed as 92cb946bd9d78cb8f6aa8418d505f52da6894ab4

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.