[libsoup/wip/meson: 93/93] Add support for libpsl
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/meson: 93/93] Add support for libpsl
- Date: Wed, 11 Apr 2018 10:47:07 +0000 (UTC)
commit 6d5923cf08a441961801f5ae081b621f68a08137
Author: Tomas Popela <tpopela redhat com>
Date: Wed Apr 11 12:09:47 2018 +0200
Add support for libpsl
https://bugzilla.gnome.org/show_bug.cgi?id=769650
docs/reference/meson.build | 1 -
libsoup/meson.build | 10 ++--------
meson.build | 3 +++
3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 4b1acec..1daf1e1 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -31,7 +31,6 @@ ignore_headers = [
'soup-filter-input-stream.h',
'soup-cookie-jar-sqlite.h',
'soup-requester.h',
- 'soup-tld-private.h',
'soup-misc-private.h',
'soup-proxy-uri-resolver.h',
'soup-proxy-resolver-wrapper.h',
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 6a120fe..4ead22f 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -175,13 +175,6 @@ soup_enums = gnome.mkenums('soup-enum-types',
soupenum_h = soup_enums[1]
soupenum_c = soup_enums[0]
-tldparser = find_program(join_paths(meson.current_source_dir(), 'tld-parser.py'))
-tlddata = custom_target('tlddata',
- output : 'tld_data.inc',
- input : join_paths(meson.source_root(), 'data', 'effective_tld_names.dat'),
- install : false,
- command : [tldparser, '@INPUT@', '@OUTPUT@'])
-
libsoup_c_args = [
'-DHAVE_CONFIG_H',
'-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()),
@@ -192,11 +185,12 @@ deps = [
glib_dep,
libxml_dep,
sqlite_dep,
+ libpsl_dep,
platform_deps
]
libsoup = shared_library('soup-@0@'.format(apiversion), soup_sources,
- soup_enums, tlddata,
+ soup_enums,
version : libversion,
soversion : soversion,
c_args : libsoup_c_args,
diff --git a/meson.build b/meson.build
index 687e727..ed9e082 100644
--- a/meson.build
+++ b/meson.build
@@ -78,6 +78,9 @@ if host_machine.system() == 'windows'
cdata.set('DLL_EXPORT', 1)
endif
+libpsl_required_version = '>= 0.20'
+libpsl_dep = dependency('libpsl', version : libpsl_required_version)
+
###################
# GIO TLS support #
###################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]