aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[meson] Removed CONFIG_XML

Browse Source
This commit is contained in:
Witold Filipczyk 2023-05-05 20:48:14 +02:00
parent a445c6507a
commit c96f4c7177
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -99,7 +99,6 @@ conf_data.set('CONFIG_OPENSSL', get_option('openssl'))
conf_data.set('CONFIG_LIBEV', get_option('libev')) conf_data.set('CONFIG_LIBEV', get_option('libev'))
conf_data.set('CONFIG_LIBEVENT', get_option('libevent')) conf_data.set('CONFIG_LIBEVENT', get_option('libevent'))
conf_data.set('CONFIG_X', get_option('x')) conf_data.set('CONFIG_X', get_option('x'))
conf_data.set('CONFIG_XML', get_option('xml'))
conf_data.set('CONFIG_QUICKJS', get_option('quickjs')) conf_data.set('CONFIG_QUICKJS', get_option('quickjs'))
conf_data.set('CONFIG_MUJS', get_option('mujs')) conf_data.set('CONFIG_MUJS', get_option('mujs'))
conf_data.set('CONFIG_CODEPOINT', get_option('codepoint')) conf_data.set('CONFIG_CODEPOINT', get_option('codepoint'))
@ -405,7 +404,6 @@ endif
if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or conf_data.get('CONFIG_MUJS') if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or conf_data.get('CONFIG_MUJS')
sqlite3deps = dependency('sqlite3', static: st) sqlite3deps = dependency('sqlite3', static: st)
deps += sqlite3deps deps += sqlite3deps
conf_data.set('CONFIG_XML', true)
endif endif
if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or conf_data.get('CONFIG_MUJS') if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_QUICKJS') or conf_data.get('CONFIG_MUJS')
@ -447,11 +445,6 @@ if conf_data.get('CONFIG_GPM')
deps += libgpmdeps deps += libgpmdeps
endif endif
if conf_data.get('CONFIG_XML')
xmlplusplusdeps = dependency('libxml++-5.0', static: st)
deps += xmlplusplusdeps
endif
if conf_data.get('CONFIG_SCRIPTING_PYTHON') if conf_data.get('CONFIG_SCRIPTING_PYTHON')
python3deps = dependency('python3-embed', static: st) python3deps = dependency('python3-embed', static: st)
deps += python3deps deps += python3deps

1
meson_options.txt
View File

@ -60,7 +60,6 @@ option('openssl', type: 'boolean', value: true, description: 'OpenSSL support')
option('libev', type: 'boolean', value: false, description: 'compile with libev (libevent compatibility mode)') option('libev', type: 'boolean', value: false, description: 'compile with libev (libevent compatibility mode)')
option('libevent', type: 'boolean', value: false, description: 'compile with libevent. Note that libev has precedence') option('libevent', type: 'boolean', value: false, description: 'compile with libevent. Note that libev has precedence')
option('x', type: 'boolean', value: false, description: 'use the X Window System') option('x', type: 'boolean', value: false, description: 'use the X Window System')
option('xml', type: 'boolean', value: false, description: 'libxml++')
option('gemini', type: 'boolean', value: false, description: 'gemini protocol support') option('gemini', type: 'boolean', value: false, description: 'gemini protocol support')
option('gettext', type: 'boolean', value: false, description: 'use external gettext library') option('gettext', type: 'boolean', value: false, description: 'use external gettext library')
option('quickjs', type: 'boolean', value: false, description: 'use quickjs library') option('quickjs', type: 'boolean', value: false, description: 'use quickjs library')

11
src/document/document.cpp
View File

@ -68,9 +68,8 @@
#include "ecmascript/spidermonkey.h" #include "ecmascript/spidermonkey.h"
#endif #endif
#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS) #ifdef CONFIG_LIBDOM
#include <libxml++/libxml++.h> #include "document/libdom/mapa.h"
#include <map>
#endif #endif
#include "main/module.h" #include "main/module.h"
@ -385,10 +384,10 @@ done_document(struct document *document)
free_document(document->dom); free_document(document->dom);
if (document->element_map) { if (document->element_map) {
std::map<int, xmlpp::Element *> *mapa = (std::map<int, xmlpp::Element *> *)document->element_map; void *mapa = document->element_map;
mapa->clear(); clear_map(mapa);
delete mapa; delete_map(mapa);
} }
#endif #endif

7
src/document/libdom/mapa.cpp
View File

@ -30,6 +30,13 @@ clear_map(void *m)
mapa->clear(); mapa->clear();
} }
void
delete_map(void *m)
{
std::map<int, void *> *mapa = static_cast<std::map<int, void *> *>(m);
delete mapa;
}
void * void *
find_in_map(void *m, int offset) find_in_map(void *m, int offset)
{ {

2
src/document/libdom/mapa.h
View File

@ -8,6 +8,8 @@ extern "C" {
void save_in_map(void *m, void *node, int length); void save_in_map(void *m, void *node, int length);
void *create_new_element_map(void); void *create_new_element_map(void);
void clear_map(void *m); void clear_map(void *m);
void delete_map(void *m);
void *find_in_map(void *m, int offset); void *find_in_map(void *m, int offset);
#ifdef __cplusplus #ifdef __cplusplus