1 |
commit: 88534051b733404af8dd28783a7e7d02ede98c4d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 22:40:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 22:40:23 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88534051 |
7 |
|
8 |
www-client/elinks: add missing patches |
9 |
|
10 |
Bug: https://bugs.gentoo.org/797427 |
11 |
Fixes: 032ff4acf3b23136f91f857252ff14abbf724aef |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/elinks-0.16.0-fix-build-mujs.patch | 47 ++++++++++++++++++++++ |
15 |
.../elinks/files/elinks-0.16.0-fix-tests.patch | 19 +++++++++ |
16 |
2 files changed, 66 insertions(+) |
17 |
|
18 |
diff --git a/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..030280c61f1e |
21 |
--- /dev/null |
22 |
+++ b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch |
23 |
@@ -0,0 +1,47 @@ |
24 |
+https://github.com/rkd77/elinks/issues/204 |
25 |
+https://github.com/rkd77/elinks/pull/205 |
26 |
+ |
27 |
+From 5cb602191830737531f8c715f47f7429959b2471 Mon Sep 17 00:00:00 2001 |
28 |
+From: Sam James <sam@g.o> |
29 |
+Date: Sat, 31 Dec 2022 21:06:57 +0000 |
30 |
+Subject: [PATCH] Fix build failures with mujs |
31 |
+ |
32 |
+Closes: https://github.com/rkd77/elinks/issues/204 |
33 |
+Signed-off-by: Sam James <sam@g.o> |
34 |
+--- a/src/document/html/parser/general.c |
35 |
++++ b/src/document/html/parser/general.c |
36 |
+@@ -41,6 +41,9 @@ |
37 |
+ /* Unsafe macros */ |
38 |
+ #include "document/html/internal.h" |
39 |
+ |
40 |
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) |
41 |
++#include "ecmascript/ecmascript.h" |
42 |
++#endif |
43 |
+ |
44 |
+ void |
45 |
+ html_span(struct html_context *html_context, char *a, |
46 |
+--- a/src/document/html/parser/stack.c |
47 |
++++ b/src/document/html/parser/stack.c |
48 |
+@@ -27,6 +27,10 @@ |
49 |
+ /* Unsafe macros */ |
50 |
+ #include "document/html/internal.h" |
51 |
+ |
52 |
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) |
53 |
++#include "ecmascript/ecmascript.h" |
54 |
++#endif |
55 |
++ |
56 |
+ #if 0 //def CONFIG_XML |
57 |
+ #include <libxml++/libxml++.h> |
58 |
+ #endif |
59 |
+--- a/src/ecmascript/ecmascript.h |
60 |
++++ b/src/ecmascript/ecmascript.h |
61 |
+@@ -5,6 +5,8 @@ |
62 |
+ /* In the future you will get DOM, a complete ECMAScript interface and free |
63 |
+ * plasm displays for everyone. */ |
64 |
+ |
65 |
++#include <stdbool.h> |
66 |
++ |
67 |
+ #ifdef HAVE_CONFIG_H |
68 |
+ #include "config.h" |
69 |
+ #endif |
70 |
+ |
71 |
|
72 |
diff --git a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch |
73 |
new file mode 100644 |
74 |
index 000000000000..6b46b63afcdd |
75 |
--- /dev/null |
76 |
+++ b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch |
77 |
@@ -0,0 +1,19 @@ |
78 |
+https://github.com/rkd77/elinks/issues/203 |
79 |
+https://github.com/rkd77/elinks/commit/aa8d7989815d48b6afdc3e321bd859f4453bacf2 |
80 |
+ |
81 |
+From aa8d7989815d48b6afdc3e321bd859f4453bacf2 Mon Sep 17 00:00:00 2001 |
82 |
+From: Witold Filipczyk <witekfl@×××××××××××.pl> |
83 |
+Date: Fri, 30 Dec 2022 09:35:41 +0100 |
84 |
+Subject: [PATCH] [test] Strange endif . Refs #203 |
85 |
+ |
86 |
+--- a/src/dom/test/meson.build |
87 |
++++ b/src/dom/test/meson.build |
88 |
+@@ -28,7 +28,6 @@ meson.source_root()+'/src/dom/sgml/xbel/xbel.c', |
89 |
+ testdeps, |
90 |
+ c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'], |
91 |
+ build_by_default:false) |
92 |
+-endif |
93 |
+ |
94 |
+ test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'}) |
95 |
+ |
96 |
+ |