Dominique Leuenberger 2023-08-07 13:28:39 +00:00 committed by Git OBS Bridge
commit 0b9f3c1b02
3 changed files with 83 additions and 9 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 3 13:10:56 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add perl-5.38.patch: Fix compilation with Perl 5.38
(gh#rkd77/elinks#243).
-------------------------------------------------------------------
Thu May 4 17:00:50 UTC 2023 - Dirk Müller <dmueller@suse.com>
@ -10,7 +16,7 @@ Mon May 1 03:49:11 UTC 2023 - Muhammad Akbar Yanuar Mantari <mantarimay@pm.me>
- Update to version 0.16.1
* handle SECTION html element #207
* allocate more memory for BLOCKQUOTE #214
* encode A href to terminal codepage and encode bytes with
* encode A href to terminal codepage and encode bytes with
highest bit set as %HEX #221
* Serbian translation update
* install doc by default in meson #224
@ -26,7 +32,7 @@ Sun Apr 30 02:08:20 UTC 2023 - Muhammad Akbar Yanuar Mantari <mantarimay@pm.me>
* build-with-new-ruby.patch
- Added the following patches:
* 0006-elinks-0.16.0-libidn2.patch
-------------------------------------------------------------------
Wed Aug 24 10:44:19 UTC 2022 - Andreas Schwab <schwab@suse.de>
@ -56,7 +62,7 @@ Mon Apr 1 09:31:50 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
* parse_header: document parameters and return value
* doxygen: Fix link to bookmark::url
* use draw_text for titles
* iconv: Bail out of the loop when an illegal sequence of bytes
* iconv: Bail out of the loop when an illegal sequence of bytes
occur
* Add support for the CSS list-style-type property
* configure.in: use PKG_CONFIG
@ -135,22 +141,22 @@ Sun Jun 10 17:19:18 UTC 2012 - asterios.dramis@gmail.com
-------------------------------------------------------------------
Fri Jun 10 12:54:28 UTC 2011 - lijewski.stefan@gmail.com
- fix sysconfdir to /etc/elinks
- fix sysconfdir to /etc/elinks
-------------------------------------------------------------------
Tue Apr 26 13:12:57 UTC 2011 - puzel@novell.com
- use spec-cleaner
- use spec-cleaner
-------------------------------------------------------------------
Wed Jan 27 17:55:54 UTC 2010 - puzel@novell.com
- update to 0.12pre5
- update to 0.12pre5
-------------------------------------------------------------------
Wed Jan 27 17:45:25 UTC 2010 - puzel@novell.com
- prepare for Contrib (disabled lua and js functionality for now)
- prepare for Contrib (disabled lua and js functionality for now)
-------------------------------------------------------------------
Mon Sep 15 18:28:05 CEST 2008 - mrueckert@suse.de

View File

@ -31,6 +31,7 @@ Group: Productivity/Networking/Web/Browsers
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 @@ and runs on a variety of platforms. Check the about page for a more complete
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')

68
perl-5.38.patch Normal file
View File

@ -0,0 +1,68 @@
From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <azamat.hackimov@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: 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 {