[libsoup] Remove deprecated SoupGnome library
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] Remove deprecated SoupGnome library
- Date: Sat, 19 Sep 2020 22:41:55 +0000 (UTC)
commit 3fcaa882c4eb29fd754cdb6dd06195632cb4b52a
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue Jan 28 22:44:16 2020 -0800
Remove deprecated SoupGnome library
libsoup/meson.build | 78 +----------------------------------
libsoup/soup-gnome-features.c | 21 ----------
libsoup/soup-gnome-features.h | 30 --------------
libsoup/soup-gnome.h | 14 -------
libsoup/soup-password-manager-gnome.c | 28 -------------
libsoup/soup-password-manager-gnome.h | 28 -------------
meson.build | 5 ---
meson_options.txt | 6 ---
8 files changed, 1 insertion(+), 209 deletions(-)
---
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 432e294d..87713875 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -182,27 +182,6 @@ soup_installed_headers = soup_introspection_headers + [
'soup.h'
]
-soup_gnome_sources = [
- 'soup-cookie-jar-sqlite.c',
- 'soup-gnome-features.c',
- 'soup-password-manager-gnome.c',
- 'soup-proxy-resolver-gnome.c'
-]
-
-soup_gnome_headers = [
- 'soup-proxy-resolver-gnome.h',
- 'soup-password-manager-gnome.h'
-]
-
-soup_gnome_introspection_headers = [
- 'soup-cookie-jar-sqlite.h',
- 'soup-gnome-features.h'
-]
-
-soup_gnome_installed_headers = soup_gnome_introspection_headers + [
- 'soup-gnome.h'
-]
-
if brotlidec_dep.found()
soup_sources += 'soup-brotli-decompressor.c'
soup_headers += 'soup-brotli-decompressor.h'
@@ -224,10 +203,7 @@ soup_version_h = configure_file(input : 'soup-version.h.in',
enum_types = 'soup-enum-types'
soup_enums = gnome.mkenums('soup-enum-types',
- sources : [
- soup_installed_headers,
- soup_gnome_installed_headers
- ],
+ sources : soup_installed_headers,
h_template : enum_types + '.h.template',
c_template : enum_types + '.c.template',
install_header : true,
@@ -277,36 +253,6 @@ libsoup_dep = declare_dependency(link_with : libsoup,
sources : soup_enum_h,
dependencies : [ platform_deps, glib_deps ])
-if enable_gnome
- soup_gnome_api_name = 'soup-gnome-' + apiversion
- libsoup_gnome_api_name = 'lib' + soup_gnome_api_name
-
- includedir = join_paths(libsoup_gnome_api_name, meson.project_name())
- install_headers(
- soup_gnome_installed_headers,
- subdir : includedir)
-
- libsoup_gnome = library(soup_gnome_api_name,
- soup_gnome_sources + soup_gnome_headers,
- version : libversion,
- soversion : soversion,
- darwin_versions: darwin_versions,
- c_args : libsoup_c_args + hidden_visibility_flag,
- include_directories : configinc,
- install : true,
- dependencies : deps + [libsoup_dep])
-
- pkg.generate(
- libraries : libsoup_gnome,
- version : soup_version,
- name : meson.project_name(),
- description : 'A glib-based HTTP library',
- filebase : libsoup_gnome_api_name,
- requires : libsoup_api_name,
- subdirs: libsoup_gnome_api_name,
- variables: 'exec_prefix=${prefix}')
-endif
-
if enable_introspection or enable_vapi
soup_gir_args = libsoup_c_args + ['-DLIBSOUP_USE_UNSTABLE_REQUEST_API']
@@ -347,26 +293,4 @@ if enable_introspection or enable_vapi
install : true,
)
endif
-
- if enable_gnome
- soup_gnome_gir_args = libsoup_c_args + [
- '--include-uninstalled=' + soup_gir_gen_sources[0].full_path()
- ]
-
- gnome.generate_gir(libsoup_gnome,
- sources : [
- soup_gnome_sources,
- soup_gnome_introspection_headers
- ],
- nsversion : apiversion,
- namespace : 'SoupGNOME',
- symbol_prefix : soup_ns.to_lower(),
- identifier_prefix : soup_ns,
- export_packages : libsoup_gnome_api_name,
- extra_args : soup_gnome_gir_args,
- dependencies : soup_gir_gen_dep,
- install : true,
- header: join_paths(meson.project_name(), 'soup-gnome.h'),
- )
- endif
endif
diff --git a/meson.build b/meson.build
index b7c8b29d..d13a630d 100644
--- a/meson.build
+++ b/meson.build
@@ -347,11 +347,6 @@ if host_machine.system() != 'windows'
endif
endif
-#################
-# GNOME support #
-#################
-enable_gnome = get_option('gnome')
-
#########################
# GObject introspection #
#########################
diff --git a/meson_options.txt b/meson_options.txt
index 57b098c1..6eab71ac 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,12 +34,6 @@ option('tls_check',
description : 'Enable TLS support through glib-networking. If you are building a package, you can disable
this to allow building libsoup anyway (since glib-networking is not actually required at compile time), but
you should be sure to add a runtime dependency on it.'
)
-option('gnome',
- type : 'boolean',
- value : true,
- description : 'Build libsoup with GNOME support'
-)
-
option('introspection',
type : 'feature',
value : 'auto',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]