Control: tags 1042844 + patch Control: tags 1042844 + pending
Dear maintainer, I've prepared an NMU for elinks (versioned as 0.16.1.1-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru elinks-0.16.1.1/debian/changelog elinks-0.16.1.1/debian/changelog --- elinks-0.16.1.1/debian/changelog 2023-06-30 03:01:41.000000000 +0200 +++ elinks-0.16.1.1/debian/changelog 2023-11-17 21:39:04.000000000 +0100 @@ -1,3 +1,12 @@ +elinks (0.16.1.1-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with Perl 5.38: error: redefinition of 'struct object'": + add patch from upstream pull request/commit. + (Closes: #1042844) + + -- gregor herrmann <gre...@debian.org> Fri, 17 Nov 2023 21:39:04 +0100 + elinks (0.16.1.1-4) unstable; urgency=medium [ Pino Toscano ] diff -Nru elinks-0.16.1.1/debian/patches/perl_5.38.patch elinks-0.16.1.1/debian/patches/perl_5.38.patch --- elinks-0.16.1.1/debian/patches/perl_5.38.patch 1970-01-01 01:00:00.000000000 +0100 +++ elinks-0.16.1.1/debian/patches/perl_5.38.patch 2023-11-17 21:38:58.000000000 +0100 @@ -0,0 +1,64 @@ +From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hacki...@gmail.com> +Date: Mon, 3 Jul 2023 14:12:22 +0300 +Subject: [PATCH] Fix compilation with Perl 5.38 + +Perl now includes own `struct object` which clashes with elinks +implementation. Renamed `struct object` to `struct elinks_object` to +avoid it. + +Bug-Gentoo: https://bugs.gentoo.org/909042 +Bug-Debian: https://bugs.debian.org/1042844 +Bug: https://github.com/rkd77/elinks/pull/243 +--- + src/main/object.h | 6 +++--- + src/protocol/uri.c | 2 +- + src/protocol/uri.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +--- a/src/main/object.h ++++ b/src/main/object.h +@@ -11,7 +11,7 @@ + #define DEBUG_REFCOUNT + #endif + +-struct object { ++struct elinks_object { + int refcount; + #ifdef CONFIG_DEBUG + char *name; +@@ -20,10 +20,10 @@ + + #define OBJECT_HEAD(type) \ + LIST_HEAD(type); \ +- struct object object ++ struct elinks_object object + + struct object_head { +- OBJECT_HEAD(struct object *); ++ OBJECT_HEAD(struct elinks_object *); + }; + + #ifdef DEBUG_REFCOUNT +--- a/src/protocol/uri.c ++++ b/src/protocol/uri.c +@@ -1578,7 +1578,7 @@ + + struct uri_cache { + struct hash *map; +- struct object object; ++ struct elinks_object object; + }; + + static struct uri_cache uri_cache; +--- a/src/protocol/uri.h ++++ b/src/protocol/uri.h +@@ -89,7 +89,7 @@ + unsigned int form:1; /* URI originated from form */ + + /* Usage count object. */ +- struct object object; ++ struct elinks_object object; + }; + + enum uri_errno { diff -Nru elinks-0.16.1.1/debian/patches/series elinks-0.16.1.1/debian/patches/series --- elinks-0.16.1.1/debian/patches/series 2023-06-30 03:01:41.000000000 +0200 +++ elinks-0.16.1.1/debian/patches/series 2023-11-17 21:35:59.000000000 +0100 @@ -3,3 +3,4 @@ 07_617713_cache_control.diff 14_debug_disable_Werror.diff fix-mailcap-test.diff +perl_5.38.patch
signature.asc
Description: Digital Signature
