Remove deprecated SoupGnome library

8 files changed, 1 insertions, 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/libsoup/soup-gnome-features.c b/libsoup/soup-gnome-features.c
deleted file mode 100644
index 4b40f34c..00000000
--- a/libsoup/soup-gnome-features.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * soup-gnome-features.c: GNOME-specific features
- *
- * Copyright (C) 2008 Red Hat, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "soup-gnome-features.h"
-
-GType
-soup_gnome_features_2_26_get_type (void)
-{
-	G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-	return SOUP_TYPE_PROXY_RESOLVER_GNOME;
-	G_GNUC_END_IGNORE_DEPRECATIONS;
-}
-
diff --git a/libsoup/soup-gnome-features.h b/libsoup/soup-gnome-features.h
deleted file mode 100644
index 031491c4..00000000
--- a/libsoup/soup-gnome-features.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Red Hat, Inc.
- */
-
-#ifndef __SOUP_GNOME_FEATURES_H__
-#define __SOUP_GNOME_FEATURES_H__ 1
-
-#include <libsoup/soup-types.h>
-
-G_BEGIN_DECLS
-
-SOUP_AVAILABLE_IN_2_26
-SOUP_DEPRECATED_IN_2_42_FOR(SoupSession:proxy-resolver)
-GType soup_proxy_resolver_gnome_get_type (void);
-#define SOUP_TYPE_PROXY_RESOLVER_GNOME (soup_proxy_resolver_gnome_get_type ())
-
-SOUP_AVAILABLE_IN_2_26
-SOUP_DEPRECATED_IN_2_42
-GType soup_gnome_features_2_26_get_type (void);
-#define SOUP_TYPE_GNOME_FEATURES_2_26 (soup_gnome_features_2_26_get_type ())
-
-SOUP_AVAILABLE_IN_2_28
-SOUP_DEPRECATED_IN_2_28
-GType soup_password_manager_gnome_get_type (void);
-#define SOUP_TYPE_PASSWORD_MANAGER_GNOME (soup_password_manager_gnome_get_type ())
-
-G_END_DECLS
-
-#endif /* __SOUP_GNOME_FEATURES_H__ */
diff --git a/libsoup/soup-gnome.h b/libsoup/soup-gnome.h
deleted file mode 100644
index da0fe934..00000000
--- a/libsoup/soup-gnome.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Red Hat, Inc.
- */
-
-#ifndef __SOUP_GNOME_H__
-#define __SOUP_GNOME_H__ 1
-
-#include <libsoup/soup.h>
-
-#include <libsoup/soup-cookie-jar-sqlite.h>
-#include <libsoup/soup-gnome-features.h>
-
-#endif /* __SOUP_GNOME_H__ */
diff --git a/libsoup/soup-password-manager-gnome.c b/libsoup/soup-password-manager-gnome.c
deleted file mode 100644
index 8101683d..00000000
--- a/libsoup/soup-password-manager-gnome.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * soup-password-manager-gnome.c: GNOME-keyring-based password manager
- *
- * Copyright (C) 2008 Red Hat, Inc.
- */
-
-/* This is just a stub now; eventually it will go away completely. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "soup-password-manager-gnome.h"
-#include "soup.h"
-
-G_DEFINE_TYPE_EXTENDED (SoupPasswordManagerGNOME, soup_password_manager_gnome, G_TYPE_OBJECT, 0,
-			G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, NULL))
-
-static void
-soup_password_manager_gnome_init (SoupPasswordManagerGNOME *manager_gnome)
-{
-}
-
-static void
-soup_password_manager_gnome_class_init (SoupPasswordManagerGNOMEClass *gnome_class)
-{
-}
diff --git a/libsoup/soup-password-manager-gnome.h b/libsoup/soup-password-manager-gnome.h
deleted file mode 100644
index 4a937c75..00000000
--- a/libsoup/soup-password-manager-gnome.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 Red Hat, Inc.
- */
-
-#ifndef __SOUP_PASSWORD_MANAGER_GNOME_H__
-#define __SOUP_PASSWORD_MANAGER_GNOME_H__ 1
-
-#include "soup-password-manager.h"
-#include "soup-gnome-features.h"
-
-#define SOUP_PASSWORD_MANAGER_GNOME(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_PASSWORD_MANAGER_GNOME, SoupPasswordManagerGNOME))
-#define SOUP_PASSWORD_MANAGER_GNOME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_PASSWORD_MANAGER_GNOME, SoupPasswordManagerGNOMEClass))
-#define SOUP_IS_PASSWORD_MANAGER_GNOME(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOUP_TYPE_PASSWORD_MANAGER_GNOME))
-#define SOUP_IS_PASSWORD_MANAGER_GNOME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SOUP_TYPE_PASSWORD_MANAGER_GNOME))
-#define SOUP_PASSWORD_MANAGER_GNOME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_PASSWORD_MANAGER_GNOME, SoupPasswordManagerGNOMEClass))
-
-typedef struct {
-	GObject parent;
-
-} SoupPasswordManagerGNOME;
-
-typedef struct {
-	GObjectClass parent_class;
-
-} SoupPasswordManagerGNOMEClass;
-
-#endif /* __SOUP_PASSWORD_MANAGER_GNOME_H__ */
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',