[packages/elinks] - added quickjs.patch - force newer quickjs version - rel 2

witekfl witekfl at pld-linux.org
Sat May 17 17:51:50 CEST 2025


commit 2a1fb8a556c5b7b91c45f9849f5fe3a435d59593
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sat May 17 17:23:04 2025 +0200

    - added quickjs.patch
    - force newer quickjs version
    - rel 2

 elinks.spec   | 14 ++++++++------
 quickjs.patch | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/elinks.spec b/elinks.spec
index 412e7c8..13f443c 100644
--- a/elinks.spec
+++ b/elinks.spec
@@ -46,7 +46,7 @@ Summary(pl.UTF-8):	Eksperymentalny Links (tekstowa przeglądarka WWW)
 Summary(pt_BR.UTF-8):	O links é um browser para modo texto, similar ao lynx
 Name:		elinks
 Version:	0.18.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		Applications/Networking
@@ -54,6 +54,7 @@ Source0:	https://github.com/rkd77/elinks/releases/download/v%{version}/%{name}-%
 # Source0-md5:	43ac5edc5735117317827550607e9035
 Source1:	%{name}.desktop
 Source2:	links.png
+Patch0:		quickjs.patch
 URL:		http://www.elinks.cz/
 BuildRequires:	bzip2-devel
 %{?with_curl:BuildRequires:	curl-devel >= 7.66.0}
@@ -69,7 +70,7 @@ BuildRequires:	gpm-devel
 BuildRequires:	libatomic-devel
 %endif
 BuildRequires:	libstdc++-devel >= 6:8
-BuildRequires:	rpmbuild(macros) >= 2.025
+BuildRequires:	rpmbuild(macros) >= 2.042
 %{?with_js:BuildRequires:	sqlite3-devel}
 %{?with_brotli:BuildRequires:	libbrotli-devel}
 %if %{with js} || %{with libcss}
@@ -88,7 +89,7 @@ BuildRequires:	ninja >= 1.5
 %{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
 %{?with_python:BuildRequires:	python3-devel}
-%{?with_js:BuildRequires:	quickjs-devel >= 20210327-4}
+%{?with_js:BuildRequires:	quickjs-devel >= 20250426}
 %{?with_ruby:BuildRequires:	ruby-devel}
 BuildRequires:	sed
 BuildRequires:	tar >= 1:1.22
@@ -138,9 +139,10 @@ keepalive.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
-%meson build \
+%meson \
 	-Dapidoc=false \
 	-Dhtmldoc=true \
 	-Dpdfdoc=false \
@@ -183,11 +185,11 @@ keepalive.
 	%{!?with_curl:-Dlibcurl=false} \
 	%{!?with_libcss:-Dlibcss=false}
 
-%ninja_build -C build
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%ninja_install -C build
+%meson_install
 
 install -d $RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name} \
diff --git a/quickjs.patch b/quickjs.patch
new file mode 100644
index 0000000..7ff9dea
--- /dev/null
+++ b/quickjs.patch
@@ -0,0 +1,21 @@
+commit 5cc976da218e72ae268ac3e3a310c14700b8b513
+Author: Witold Filipczyk <witekfl at poczta.onet.pl>
+Date:   Fri May 16 15:07:28 2025 +0200
+
+    [quickjs] Compilation fix for quickjs-2025-04-26
+
+diff --git a/src/js/quickjs.h b/src/js/quickjs.h
+index 749af098a..34425de8f 100644
+--- a/src/js/quickjs.h
++++ b/src/js/quickjs.h
+@@ -14,6 +14,10 @@ inline int operator<(JSValueConst a, JSValueConst b)
+ extern "C" {
+ #endif
+ 
++#ifndef JS_VALUE_GET_STRING
++#define JS_VALUE_GET_STRING(v) ((JSString *)JS_VALUE_GET_PTR(v))
++#endif
++
+ #ifdef ECMASCRIPT_DEBUG
+ 
+ #define RETURN_JS(obj) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/elinks.git/commitdiff/2a1fb8a556c5b7b91c45f9849f5fe3a435d59593



More information about the pld-cvs-commit mailing list