From 4b3efab5f1f51b81b23bfc9f68a79c99bd50c47d7f76084dac92fc663d15099d Mon Sep 17 00:00:00 2001 From: Antonio Teixeira Date: Tue, 6 Feb 2024 13:02:14 +0000 Subject: [PATCH] Accepting request 1143489 from home:mantarimay:branches:network - update to 0.17.0 - Add pkgconfig(libdom) BuildRequires: fix build to enable js. - Enable gemini support - Removed unneeded patches: * perl-5.38.patch * 0006-elinks-0.16.0-libidn2.patch OBS-URL: https://build.opensuse.org/request/show/1143489 OBS-URL: https://build.opensuse.org/package/show/network/elinks?expand=0&rev=24 --- 0006-elinks-0.16.0-libidn2.patch | 98 -------------------------------- elinks-0.16.1.1.tar.xz | 3 - elinks-0.17.0.tar.xz | 3 + elinks.changes | 35 ++++++++++++ elinks.spec | 10 ++-- perl-5.38.patch | 68 ---------------------- 6 files changed, 42 insertions(+), 175 deletions(-) delete mode 100644 0006-elinks-0.16.0-libidn2.patch delete mode 100644 elinks-0.16.1.1.tar.xz create mode 100644 elinks-0.17.0.tar.xz delete mode 100644 perl-5.38.patch diff --git a/0006-elinks-0.16.0-libidn2.patch b/0006-elinks-0.16.0-libidn2.patch deleted file mode 100644 index 72bcef1..0000000 --- a/0006-elinks-0.16.0-libidn2.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 41461147907ed9a93792309f074072e981b33f42 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 11 Apr 2022 09:39:48 +0200 -Subject: [PATCH] Resolves: #1098789 - add support for GNU Libidn2 - -patch by Robert Scheck ---- - Makefile.config.in | 2 +- - configure.ac | 4 ++-- - src/osdep/win32/win32.c | 2 +- - src/protocol/uri.c | 12 ++++++------ - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index bf01d78..73d9762 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -139,7 +139,7 @@ CONFIG_GOPHER = @CONFIG_GOPHER@ - CONFIG_GPM = @CONFIG_GPM@ - CONFIG_GZIP = @CONFIG_GZIP@ - CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@ --CONFIG_IDN = @CONFIG_IDN@ -+CONFIG_IDN2 = @CONFIG_IDN2@ - CONFIG_INTERLINK = @CONFIG_INTERLINK@ - CONFIG_IPV6 = @CONFIG_IPV6@ - CONFIG_DBLATEX = @CONFIG_DBLATEX@ -diff --git a/configure.ac b/configure.ac -index d4537ab..d3bf724 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -556,8 +556,8 @@ EL_LOG_CONFIG([CONFIG_BROTLI], [[brotli]], [[$enable_brotli]]) - EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_LZMA, lzma, lzma.h, lzma, lzma_code, - [ --with-lzma enable lzma encoding support]) - --EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version, -- [ --without-idn disable international domain names support]) -+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN2, idn2, idn2.h, idn2, idn2_lookup_ul, -+ [ --without-idn2 disable international domain names support]) - - # =================================================================== - # Check for GSSAPI, optional even if installed. -diff --git a/src/osdep/win32/win32.c b/src/osdep/win32/win32.c -index 02b1834..f4c148d 100644 ---- a/src/osdep/win32/win32.c -+++ b/src/osdep/win32/win32.c -@@ -44,7 +44,7 @@ init_osdep(void) - } - #endif - setlocale(LC_ALL, ""); --#ifdef CONFIG_IDN -+#ifdef CONFIG_IDN2 - { - char buf[60]; - UINT cp = GetACP(); -diff --git a/src/protocol/uri.c b/src/protocol/uri.c -index a8f15d1..218d1af 100644 ---- a/src/protocol/uri.c -+++ b/src/protocol/uri.c -@@ -9,8 +9,8 @@ - #ifdef HAVE_ICONV - #include - #endif --#ifdef HAVE_IDNA_H --#include -+#ifdef HAVE_IDN2_H -+#include - #endif - #include - #include -@@ -535,10 +535,10 @@ add_uri_to_string(struct string *string, const struct uri *uri, - * --pasky */ - if (uri->ipv6 && wants(URI_PORT)) add_char_to_string(string, '['); - #endif --#ifdef CONFIG_IDN -+#ifdef CONFIG_IDN2 - /* Support for the GNU International Domain Name library. - * -- * http://www.gnu.org/software/libidn/manual/html_node/IDNA-Functions.html -+ * http://www.gnu.org/software/libidn/libidn2/manual/libidn2.html - */ - if (wants(URI_IDN)) { - char *host = NULL; -@@ -556,10 +556,10 @@ add_uri_to_string(struct string *string, const struct uri *uri, - - if (host) { - char *idname; -- int code = idna_to_ascii_8z(host, &idname, 0); -+ int code = idn2_lookup_ul(host, &idname, 0); - - /* FIXME: Return NULL if it coughed? --jonas */ -- if (code == IDNA_SUCCESS) { -+ if (code == IDN2_OK) { - add_to_string(string, idname); - free(idname); - add_host = 0; --- -2.38.1 - diff --git a/elinks-0.16.1.1.tar.xz b/elinks-0.16.1.1.tar.xz deleted file mode 100644 index 2840c33..0000000 --- a/elinks-0.16.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:303c6f830b98658dcb813b68432ecde27d3857ccf1e765109fb6b0edb89f5095 -size 2037292 diff --git a/elinks-0.17.0.tar.xz b/elinks-0.17.0.tar.xz new file mode 100644 index 0000000..3e9c1ad --- /dev/null +++ b/elinks-0.17.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58c73a6694dbb7ccf4e22cee362cf14f1a20c09aaa4273343e8b7df9378b330e +size 2076460 diff --git a/elinks.changes b/elinks.changes index 9b56bf9..b79b6b5 100644 --- a/elinks.changes +++ b/elinks.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Sun Jan 14 02:31:22 UTC 2024 - Muhammad Akbar Yanuar Mantari + +- update to 0.17.0: + * Avoid division by zero. Refs #276 + * fix for some 32-bit systems and select-only builds + * configuration files are now saved to ~/.config/elinks/ or + $XDG_CONFIG_HOME/elinks/ #199 + * User must copy files from ~/.elinks/ to ~/.config/elinks/ + himself or herself + * HOME_ETC support was dropped, you can set with ELINKS_CONFDIR + * idn2 in place of idn #206 + * libcss support (a few netsurf's libraries are required). + Set document.css.libcss = 1 to enable + * experimental libsixel support (image/*; img2sixel %s; + copiousoutput) in ~/.mailcap + * Must be enabled in a few places in configuration: set + document.plain.sixel = 1 + * and in terminal options. Do not try it on metered remote + connections + * testing libcurl support (explicit FTPS and SFTP among others) + * To enable set protocol.ftp.use_curl = 1 + * set protocol.http.use_curl = 1 for http/https + * ui.sessions.postpone_unlink option. Delete temporary files at + exit instead of immediately after + * closing viewer #257 + * redefined isspace #249 + * Serbian translation update + * compilation fixes +- Add pkgconfig(libdom) BuildRequires: fix build to enable js. +- Enable gemini support +- Removed unneeded patches: + * perl-5.38.patch + * 0006-elinks-0.16.0-libidn2.patch + ------------------------------------------------------------------- Thu Aug 3 13:10:56 UTC 2023 - Dominique Leuenberger diff --git a/elinks.spec b/elinks.spec index 3d023d7..277fa7c 100644 --- a/elinks.spec +++ b/elinks.spec @@ -1,7 +1,7 @@ # # spec file for package elinks # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,28 +15,25 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - %if 0%{?suse_version} > 1500 %bcond_without js %else %bcond_with js %endif - Name: elinks -Version: 0.16.1.1 +Version: 0.17.0 Release: 0 Summary: An advanced and well-established feature-rich text mode web browser License: GPL-2.0-or-later 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} BuildRequires: pkgconfig(libcss) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libdom) BuildRequires: pkgconfig(libxml++-5.0) BuildRequires: pkgconfig(mujs) BuildRequires: pkgconfig(sqlite3) @@ -90,6 +87,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" --enable-88-colors \ --enable-256-colors \ --enable-true-color \ + --enable-gemini \ --enable-exmode \ --enable-html-highlight \ --enable-fastmem \ diff --git a/perl-5.38.patch b/perl-5.38.patch deleted file mode 100644 index 2290753..0000000 --- a/perl-5.38.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -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 {