Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/
Date: Sun, 30 Oct 2022 09:28:34
Message-Id: 1667122078.6aa1c4d810e67092ac80f42f006e086a42269fcf.sam@gentoo
1 commit: 6aa1c4d810e67092ac80f42f006e086a42269fcf
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Oct 30 07:52:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 09:27:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa1c4d8
7
8 dev-lang/perl: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/28035
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch | 40 -------------------------
15 1 file changed, 40 deletions(-)
16
17 diff --git a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
18 deleted file mode 100644
19 index fc4c55c6899f..000000000000
20 --- a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
21 +++ /dev/null
22 @@ -1,40 +0,0 @@
23 -From: Sergey Poznyakoff <gray@×××.org>
24 -Date: Wed, 23 Jun 2021 10:26:50 +0300
25 -Subject: Fix GDBM_File to compile with version 1.20 and earlier
26 -
27 -* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
28 -depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
29 -Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
30 -gdbm commit d3e27957).
31 -
32 -Origin: backport, https://github.com/Perl/perl5/pull/18924/commits/aacd2398e766500cb5d83c4d76b642fcf31d997a
33 -Bug: https://github.com/Perl/perl5/issues/18915
34 -Bug-Debian: https://bugs.debian.org/993514
35 ----
36 - ext/GDBM_File/GDBM_File.xs | 11 +++++------
37 - 1 file changed, 5 insertions(+), 6 deletions(-)
38 -
39 -diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
40 -index cd0bb6f..494c288 100644
41 ---- a/ext/GDBM_File/GDBM_File.xs
42 -+++ b/ext/GDBM_File/GDBM_File.xs
43 -@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
44 - #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
45 - #endif
46 -
47 --#ifndef GDBM_ITEM_NOT_FOUND
48 --# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR
49 --#endif
50 --
51 -+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
52 - /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
53 - if the requested key did not exist */
54 --#define ITEM_NOT_FOUND() \
55 -- (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR)
56 -+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR)
57 -+#else
58 -+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND)
59 -+#endif
60 -
61 - #define CHECKDB(db) do { \
62 - if (!db->dbp) { \