Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package elinks for openSUSE:Factory checked in at 2023-08-07 15:28:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elinks (Old) and /work/SRC/openSUSE:Factory/.elinks.new.22712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elinks" Mon Aug 7 15:28:39 2023 rev:8 rq:1102660 version:0.16.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/elinks/elinks.changes 2023-05-06 22:08:29.492482874 +0200 +++ /work/SRC/openSUSE:Factory/.elinks.new.22712/elinks.changes 2023-08-07 15:28:41.176163378 +0200 @@ -1,0 +2,6 @@ +Thu Aug 3 13:10:56 UTC 2023 - Dominique Leuenberger <[email protected]> + +- Add perl-5.38.patch: Fix compilation with Perl 5.38 + (gh#rkd77/elinks#243). + +------------------------------------------------------------------- New: ---- perl-5.38.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elinks.spec ++++++ --- /var/tmp/diff_new_pack.9162I6/_old 2023-08-07 15:28:41.816167352 +0200 +++ /var/tmp/diff_new_pack.9162I6/_new 2023-08-07 15:28:41.820167377 +0200 @@ -31,6 +31,7 @@ URL: http://elinks.or.cz/ Source0: https://github.com/rkd77/elinks/releases/download/v%{version}/elinks-%{version}.tar.xz Patch0: 0006-elinks-0.16.0-libidn2.patch +Patch1: perl-5.38.patch BuildRequires: gcc-c++ BuildRequires: gpm-devel %if %{with js} @@ -66,8 +67,7 @@ description. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%autosetup -n %{name}-%{version} -p1 # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ perl-5.38.patch ++++++ >From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" <[email protected]> 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: https://bugs.gentoo.org/909042 --- src/main/object.h | 6 +++--- src/protocol/uri.c | 2 +- src/protocol/uri.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) Index: elinks-0.16.1.1/src/main/object.h =================================================================== --- elinks-0.16.1.1.orig/src/main/object.h +++ elinks-0.16.1.1/src/main/object.h @@ -11,7 +11,7 @@ extern "C" { #define DEBUG_REFCOUNT #endif -struct object { +struct elinks_object { int refcount; #ifdef CONFIG_DEBUG char *name; @@ -20,10 +20,10 @@ struct object { #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 Index: elinks-0.16.1.1/src/protocol/uri.c =================================================================== --- elinks-0.16.1.1.orig/src/protocol/uri.c +++ elinks-0.16.1.1/src/protocol/uri.c @@ -1578,7 +1578,7 @@ struct uri_cache_entry { struct uri_cache { struct hash *map; - struct object object; + struct elinks_object object; }; static struct uri_cache uri_cache; Index: elinks-0.16.1.1/src/protocol/uri.h =================================================================== --- elinks-0.16.1.1.orig/src/protocol/uri.h +++ elinks-0.16.1.1/src/protocol/uri.h @@ -89,7 +89,7 @@ struct uri { unsigned int form:1; /* URI originated from form */ /* Usage count object. */ - struct object object; + struct elinks_object object; }; enum uri_errno {
