* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Locale-gettext/files/, dev-perl/Locale-gettext/
@ 2017-10-27 2:50 Kent Fredric
0 siblings, 0 replies; 3+ messages in thread
From: Kent Fredric @ 2017-10-27 2:50 UTC (permalink / raw
To: gentoo-commits
commit: a383b4acc260ddeb41fd16e51e41394b710983d5
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 02:49:55 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:50:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a383b4ac
dev-perl/Locale-gettext: Fix '.' in @INC test failure bug #617048
Bug: https://bugs.gentoo.org/617048
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../Locale-gettext/Locale-gettext-1.70.0.ebuild | 2 +-
.../files/Locale-gettext-1.70.0-no-dot-inc.patch | 90 ++++++++++++++++++++++
2 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index 542a8efc797..b239751ccd1 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -18,5 +18,5 @@ RDEPEND="sys-devel/gettext"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
-
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
S="${WORKDIR}/${PN}-${DIST_VERSION}"
diff --git a/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
new file mode 100644
index 00000000000..962d90cdae7
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-no-dot-inc.patch
@@ -0,0 +1,90 @@
+From 08c1f219ae209b2475e5a1b025caceb10cb4a41b Mon Sep 17 00:00:00 2001
+From: Kim Vandry <vandry@TZoNE.ORG>
+Date: Sun, 28 May 2017 19:11:30 +0100
+Subject: Update tests to work with @INC that does not contain '.'
+
+Perl 5.25.11 removes '.' from the default @INC, and this breaks
+`require "test_data/gen_test_data.pl"` due to not being able to assume
+./test_data/gen_test_data.pl is in the @INC load path, and due to
+`require` treating paths without leading "/" or "./" as search paths.
+
+This change implements the first solution suggested by the reporter of
+the bug: Re-organise test dependencies into a dedicated directory such
+as `t/lib` and load that path into @INC with `use lib 't/lib'`.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121458
+Bug: https://bugs.gentoo.org/617048
+---
+ MANIFEST | 2 +-
+ t/frconvert.t | 3 ++-
+ t/jaconvert.t | 3 ++-
+ {test_data => t/lib}/gen_test_data.pl | 0
+ t/raw.t | 3 ++-
+ 5 files changed, 7 insertions(+), 4 deletions(-)
+ rename {test_data => t/lib}/gen_test_data.pl (100%)
+
+diff --git a/MANIFEST b/MANIFEST
+index 9604b91..e9f6e08 100644
+--- a/MANIFEST
++++ b/MANIFEST
+@@ -8,7 +8,7 @@ t/jaconvert.t
+ t/raw.t
+ t/use.t
+ test_data/foo.po
+-test_data/gen_test_data.pl
++t/lib/gen_test_data.pl
+ test_data/jaeuc.po
+ MANIFEST
+ META.yml Module YAML meta-data (added by MakeMaker)
+diff --git a/t/frconvert.t b/t/frconvert.t
+index 2bca28b..9a4f4f5 100644
+--- a/t/frconvert.t
++++ b/t/frconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+
+ gen("foo");
+ use Locale::gettext;
+diff --git a/t/jaconvert.t b/t/jaconvert.t
+index 5794dc4..b95c883 100644
+--- a/t/jaconvert.t
++++ b/t/jaconvert.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+
+ gen("jaeuc");
+ use Locale::gettext;
+diff --git a/test_data/gen_test_data.pl b/t/lib/gen_test_data.pl
+similarity index 100%
+rename from test_data/gen_test_data.pl
+rename to t/lib/gen_test_data.pl
+diff --git a/t/raw.t b/t/raw.t
+index 1e1cf14..7439397 100644
+--- a/t/raw.t
++++ b/t/raw.t
+@@ -1,8 +1,9 @@
+ #!/usr/bin/env perl -w
+ use strict;
+ use Test;
++use lib 't/lib';
+ BEGIN { plan tests => 1 }
+-require "test_data/gen_test_data.pl";
++require "gen_test_data.pl";
+
+ gen("foo");
+ use Locale::gettext;
+--
+2.14.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Locale-gettext/files/, dev-perl/Locale-gettext/
@ 2018-01-05 12:10 Mikle Kolyada
0 siblings, 0 replies; 3+ messages in thread
From: Mikle Kolyada @ 2018-01-05 12:10 UTC (permalink / raw
To: gentoo-commits
commit: de9a80ae2ad28b067df521260cfcbc69b5604fbd
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 12:09:55 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 12:09:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9a80ae
dev-perl/Locale-gettext: Drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../Locale-gettext/Locale-gettext-1.50.0-r1.ebuild | 23 ----------------------
dev-perl/Locale-gettext/Manifest | 1 -
.../files/compatibility-with-POSIX-module.diff | 16 ---------------
3 files changed, 40 deletions(-)
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild
deleted file mode 100644
index dbe7bdb3f3c..00000000000
--- a/dev-perl/Locale-gettext/Locale-gettext-1.50.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=gettext
-MODULE_AUTHOR=PVANDRY
-MODULE_VERSION=1.05
-inherit perl-module
-
-DESCRIPTION="A Perl module for accessing the GNU locale utilities"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/compatibility-with-POSIX-module.diff )
-
-# Disabling the tests - not ready for prime time - mcummings
-#SRC_TEST="do"
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index 2991c9fb794..e801cadb376 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1,2 +1 @@
-DIST gettext-1.05.tar.gz 7693 BLAKE2B cde9bcef86c8118858e150d13022e09affa240d2a996f6c352ea5bcddf9eea97026a56da5933c1948b2d6d7586fa125ea3b373a3013d7c093bbd3dd6231c7ff4 SHA512 ce58940be16b7f2b3bde8f321f142486b38874018d37267ecf0587f44a0ea6c7a2d86fc22ce4ac78f3c9cc521e1ef7142009dd8d050aa45bb12a0e64959d37b1
DIST gettext-1.07.tar.gz 8651 BLAKE2B ecdc105303c0b494d53f985ca0d789d75da33abc85e8579a43af1658d6faa18e2564e18fc6613548acc2add4ce847d03769c1fbe29dbb760b9498f4b251cbb1c SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6
diff --git a/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff b/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff
deleted file mode 100644
index 101e9f26e2b..00000000000
--- a/dev-perl/Locale-gettext/files/compatibility-with-POSIX-module.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=237378
-Bug: http://rt.cpan.org/Public/Bug/Display.html?id=35680
-Bug-Debian: http://bugs.debian.org/479803
-Author: Raphaël Hertzog <hertzog@debian.org>
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479803#20
-
---- a/gettext.pm
-+++ b/gettext.pm
-@@ -32,6 +32,7 @@ to internationalize software.
- =cut
-
- use Carp;
-+use POSIX qw(:locale_h);
-
- require Exporter;
- require DynaLoader;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Locale-gettext/files/, dev-perl/Locale-gettext/
@ 2024-10-29 3:49 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-10-29 3:49 UTC (permalink / raw
To: gentoo-commits
commit: 084f4c950b6c51ea5fc9892aec270097566c86a0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 03:45:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 03:45:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084f4c95
dev-perl/Locale-gettext: fix tests (w >=glibc-2.35?)
Closes: https://bugs.gentoo.org/935393
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../Locale-gettext/Locale-gettext-1.70.0-r1.ebuild | 7 ++++--
.../files/Locale-gettext-1.70.0-tests.patch | 26 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
index b3e4c7625bcd..bfb5f65d4732 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,6 +20,9 @@ BDEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
-PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch")
+PATCHES=(
+ "${FILESDIR}/${P}-no-dot-inc.patch"
+ "${FILESDIR}/${P}-tests.patch"
+)
S="${WORKDIR}/${PN}-${DIST_VERSION}"
diff --git a/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-tests.patch b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-tests.patch
new file mode 100644
index 000000000000..e84470c84244
--- /dev/null
+++ b/dev-perl/Locale-gettext/files/Locale-gettext-1.70.0-tests.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/935393
+https://github.com/vandry/Perl-Locale-gettext/issues/7
+https://github.com/vandry/Perl-Locale-gettext/pull/4
+
+From e6e30992fa4ca3e7ecf417a23a9c46af8f671226 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfandino@yahoo.com>
+Date: Fri, 27 Oct 2017 16:22:54 +0200
+Subject: [PATCH] skip for C.UTF-8 too
+
+--- a/t/lib/gen_test_data.pl
++++ b/t/lib/gen_test_data.pl
+@@ -28,11 +28,11 @@ sub gen {
+ skip("cannot run test without a locale set", 0);
+ exit 0;
+ }
+- if ($messages eq 'C') {
++ if ($messages =~ /^C(\..*)?$/) {
+ skip("cannot run test in the C locale", 0);
+ exit 0;
+ }
+- if ($messages eq 'POSIX') {
++ if ($messages =~ /^POSIX(\..*)?$/) {
+ skip("cannot run test in the POSIX locale", 0);
+ exit 0;
+ }
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-29 3:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-05 12:10 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Locale-gettext/files/, dev-perl/Locale-gettext/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2024-10-29 3:49 Sam James
2017-10-27 2:50 Kent Fredric
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox