diff options
author | Corentin Noël <corentin.noel@collabora.com> | 2021-11-23 15:20:00 +0100 |
---|---|---|
committer | Corentin Noël <tintou@noel.tf> | 2022-04-09 00:10:36 +0200 |
commit | f6c18ca557f745515f73d184573195b8b2de0429 (patch) | |
tree | 88dd74f2f873e89e2202cdf72d028ab973bc57bd /gcr | |
parent | 36cadb9580d5135f8dd50ea63d1bd5d19893ebcc (diff) | |
download | gcr-f6c18ca557f745515f73d184573195b8b2de0429.tar.gz |
gcr: Remove gcr-base-3 and make gcr-3 independent of GTK
Also remove the post-install symlinks
Diffstat (limited to 'gcr')
28 files changed, 101 insertions, 144 deletions
diff --git a/gcr/frob-certificate-request.c b/gcr/frob-certificate-request.c index 6801b8c..459f391 100644 --- a/gcr/frob-certificate-request.c +++ b/gcr/frob-certificate-request.c @@ -23,7 +23,7 @@ #include "console-interaction.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "egg/egg-armor.h" diff --git a/gcr/frob-openpgp.c b/gcr/frob-openpgp.c index 433056b..7846f29 100644 --- a/gcr/frob-openpgp.c +++ b/gcr/frob-openpgp.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-openpgp.h" #include "gcr/gcr-record.h" diff --git a/gcr/frob-parser.c b/gcr/frob-parser.c index 1abf2e9..f071eb5 100644 --- a/gcr/frob-parser.c +++ b/gcr/frob-parser.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include <unistd.h> #include <string.h> diff --git a/gcr/gcr-base.h b/gcr/gcr-base.h deleted file mode 100644 index ea80d8e..0000000 --- a/gcr/gcr-base.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * gnome-keyring - * - * Copyright (C) 2010 Collabora Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see <http://www.gnu.org/licenses/>. - * - * Author: Stef Walter <stefw@collabora.co.uk> - */ - -#ifndef __GI_SCANNER__ -#ifndef GCR_API_SUBJECT_TO_CHANGE -#error <gcr/This API has not yet reached stability.> -#endif -#endif - -#ifndef __GCR_BASE_H__ -#define __GCR_BASE_H__ - -#include <glib.h> - -#define __GCR_INSIDE_HEADER__ - -#include <gcr/gcr-types.h> - -#include <gcr/gcr-certificate.h> -#include <gcr/gcr-certificate-chain.h> -#include <gcr/gcr-certificate-request.h> -#include <gcr/gcr-column.h> -#include <gcr/gcr-deprecated-base.h> -#include <gcr/gcr-enum-types-base.h> -#include <gcr/gcr-filter-collection.h> -#include <gcr/gcr-icons.h> -#include <gcr/gcr-importer.h> -#include <gcr/gcr-library.h> -#include <gcr/gcr-mock-prompter.h> -#include <gcr/gcr-parser.h> -#include <gcr/gcr-pkcs11-certificate.h> -#include <gcr/gcr-prompt.h> -#include <gcr/gcr-secret-exchange.h> -#include <gcr/gcr-secure-memory.h> -#include <gcr/gcr-simple-certificate.h> -#include <gcr/gcr-simple-collection.h> -#include <gcr/gcr-ssh-askpass.h> -#include <gcr/gcr-system-prompt.h> -#include <gcr/gcr-system-prompter.h> -#include <gcr/gcr-trust.h> -#include <gcr/gcr-union-collection.h> -#include <gcr/gcr-unlock-options.h> -#include <gcr/gcr-version.h> - -#undef __GCR_INSIDE_HEADER__ - -#endif /* __GCR_BASE_H__ */ diff --git a/gcr/gcr-certificate-chain.c b/gcr/gcr-certificate-chain.c index f34eae8..c5cb8b8 100644 --- a/gcr/gcr-certificate-chain.c +++ b/gcr/gcr-certificate-chain.c @@ -28,7 +28,7 @@ #include "gcr-simple-certificate.h" #include "gcr-trust.h" -#include "gcr/gcr-enum-types-base.h" +#include "gcr/gcr-enum-types.h" #include "egg/egg-error.h" diff --git a/gcr/gcr-certificate-request.c b/gcr/gcr-certificate-request.c index dd58d42..452d1e1 100644 --- a/gcr/gcr-certificate-request.c +++ b/gcr/gcr-certificate-request.c @@ -23,7 +23,7 @@ #include "gcr-key-mechanisms.h" #include "gcr-subject-public-key.h" -#include "gcr/gcr-enum-types-base.h" +#include "gcr/gcr-enum-types.h" #include "gcr/gcr-oids.h" #include <egg/egg-armor.h> diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c index b7e8928..beae47b 100644 --- a/gcr/gcr-ssh-agent-service.c +++ b/gcr/gcr-ssh-agent-service.c @@ -37,7 +37,7 @@ #include <gio/gunixsocketaddress.h> #include <glib/gstdio.h> -#include <gcr/gcr-base.h> +#include <gcr/gcr.h> #if WITH_SYSTEMD #include <systemd/sd-daemon.h> diff --git a/gcr/gcr-system-prompter.c b/gcr/gcr-system-prompter.c index dbb51b0..ef22e29 100644 --- a/gcr/gcr-system-prompter.c +++ b/gcr/gcr-system-prompter.c @@ -30,7 +30,7 @@ #include "gcr-system-prompt.h" #include "gcr/gcr-dbus-generated.h" -#include "gcr/gcr-enum-types-base.h" +#include "gcr/gcr-enum-types.h" #include "gcr/gcr-marshal.h" #include "egg/egg-error.h" @@ -28,8 +28,35 @@ #include <glib.h> -#include "gcr/gcr-base.h" -#include "ui/gcr-ui.h" +#define __GCR_INSIDE_HEADER__ + +#include <gcr/gcr-types.h> + +#include <gcr/gcr-certificate.h> +#include <gcr/gcr-certificate-chain.h> +#include <gcr/gcr-certificate-request.h> +#include <gcr/gcr-column.h> +#include <gcr/gcr-deprecated-base.h> +#include <gcr/gcr-enum-types.h> +#include <gcr/gcr-filter-collection.h> +#include <gcr/gcr-icons.h> +#include <gcr/gcr-importer.h> +#include <gcr/gcr-library.h> +#include <gcr/gcr-mock-prompter.h> +#include <gcr/gcr-parser.h> +#include <gcr/gcr-pkcs11-certificate.h> +#include <gcr/gcr-prompt.h> +#include <gcr/gcr-secret-exchange.h> +#include <gcr/gcr-secure-memory.h> +#include <gcr/gcr-simple-certificate.h> +#include <gcr/gcr-simple-collection.h> +#include <gcr/gcr-ssh-askpass.h> +#include <gcr/gcr-system-prompt.h> +#include <gcr/gcr-system-prompter.h> +#include <gcr/gcr-trust.h> +#include <gcr/gcr-union-collection.h> +#include <gcr/gcr-unlock-options.h> +#include <gcr/gcr-version.h> #undef __GCR_INSIDE_HEADER__ diff --git a/gcr/gcr-base.symbols b/gcr/gcr.symbols index 7a97e9a..7a97e9a 100644 --- a/gcr/gcr-base.symbols +++ b/gcr/gcr.symbols diff --git a/gcr/libgcr-base.map b/gcr/libgcr.map index 4a16138..4a16138 100644 --- a/gcr/libgcr-base.map +++ b/gcr/libgcr.map diff --git a/gcr/meson.build b/gcr/meson.build index d2f548d..24074e5 100644 --- a/gcr/meson.build +++ b/gcr/meson.build @@ -1,7 +1,7 @@ -gcr_base_headers_subdir = 'gcr-@0@'.format(gcr_api_version) -gcr_base_headers_install_dir = gcr_base_headers_subdir / 'gcr' +gcr_headers_subdir = 'gcr-@0@'.format(gcr_api_version) +gcr_headers_install_dir = gcr_headers_subdir / 'gcr' -gcr_base_public_sources = files( +gcr_public_sources = files( 'gcr-certificate.c', 'gcr-certificate-chain.c', 'gcr-certificate-request.c', @@ -28,7 +28,7 @@ gcr_base_public_sources = files( 'gcr-union-collection.c', ) -gcr_base_private_sources = files( +gcr_private_sources = files( 'gcr-callback-output-stream.c', 'gcr-certificate-extensions.c', 'gcr-column.c', @@ -49,8 +49,8 @@ gcr_base_private_sources = files( 'gcr-util.c', ) -gcr_base_headers = files( - 'gcr-base.h', +gcr_headers = files( + 'gcr.h', 'gcr-certificate.h', 'gcr-certificate-chain.h', 'gcr-certificate-request.h', @@ -92,12 +92,12 @@ gcr_version_h = configure_file(input: 'gcr-version.h.in', configuration: gcr_version_conf, ) -gcr_base_headers += gcr_version_h +gcr_headers += gcr_version_h -gcr_enums_gen = gnome.mkenums_simple('gcr-enum-types-base', - sources: gcr_base_headers, +gcr_enums_gen = gnome.mkenums_simple('gcr-enum-types', + sources: gcr_headers, install_header: true, - install_dir: get_option('includedir') / gcr_base_headers_install_dir, + install_dir: get_option('includedir') / gcr_headers_install_dir, ) gcr_marshal_gen = gnome.genmarshal('gcr-marshal', @@ -125,23 +125,23 @@ gcr_oids = custom_target('gcr-oids', ] ) -gcr_base_sources = [ - gcr_base_private_sources, - gcr_base_public_sources, +gcr_sources = [ + gcr_private_sources, + gcr_public_sources, gcr_enums_gen, gcr_marshal_gen, gcr_dbus_gen, gcr_oids, ] -gcr_base_deps = [ +gcr_deps = [ glib_deps, p11kit_dep, libegg_dep, gck_dep, ] -gcr_base_cflags = [ +gcr_cflags = [ '-DG_LOG_DOMAIN="Gcr"', '-DGCR_COMPILATION', '-DGCR_API_SUBJECT_TO_CHANGE', @@ -150,34 +150,29 @@ gcr_base_cflags = [ '-D_XOPEN_SOURCE', # Needed for strptime() ] -gcr_base_symbolmap = meson.current_source_dir() / 'libgcr-base.map' -gcr_base_linkflags = cc.get_supported_link_arguments( - '-Wl,--version-script,@0@'.format(gcr_base_symbolmap), +gcr_symbolmap = meson.current_source_dir() / 'libgcr.map' +gcr_linkflags = cc.get_supported_link_arguments( + '-Wl,--version-script,@0@'.format(gcr_symbolmap), ) -gcr_base_lib = shared_library(gcr_base_basename, - gcr_base_sources, - dependencies: gcr_base_deps, - c_args: gcr_base_cflags, - link_args: gcr_base_linkflags, - link_depends: gcr_base_symbolmap, +gcr_lib = shared_library(gcr_basename, + gcr_sources, + dependencies: gcr_deps, + c_args: gcr_cflags, + link_args: gcr_linkflags, + link_depends: gcr_symbolmap, include_directories: config_h_dir, - version: gcr_soversion, + version: gcr_version, + soversion: gcr_soversion, install: true, ) -install_headers(gcr_base_headers, - subdir: gcr_base_headers_install_dir, +install_headers(gcr_headers, + subdir: gcr_headers_install_dir, ) -if get_option('gtk') - install_headers('gcr.h', - subdir: gcr_base_headers_install_dir, - ) -endif - -gcr_base_dep = declare_dependency( - link_with: gcr_base_lib, +gcr_dep = declare_dependency( + link_with: gcr_lib, include_directories: include_directories('..'), sources: [ gcr_enums_gen[1], @@ -187,17 +182,17 @@ gcr_base_dep = declare_dependency( ) if get_option('introspection') - gcr_gir = gnome.generate_gir(gcr_base_lib, - sources: [ gcr_base_public_sources, gcr_base_headers ], + gcr_gir = gnome.generate_gir(gcr_lib, + sources: [ gcr_public_sources, gcr_headers ], namespace: 'Gcr', nsversion: gcr_api_version, - export_packages: gcr_base_basename, + export_packages: gcr_basename, includes: [ 'GObject-2.0', 'Gio-2.0', gck_gir[0], ], - header: 'gcr/gcr-base.h', + header: 'gcr/gcr.h', extra_args: [ '-DGCR_COMPILATION', '-DGCR_API_SUBJECT_TO_CHANGE', @@ -220,8 +215,8 @@ if get_option('introspection') endif # pkg-config file -pkgconfig.generate(gcr_base_lib, - subdirs: gcr_base_headers_subdir, +pkgconfig.generate(gcr_lib, + subdirs: gcr_headers_subdir, requires: [ glib_dep, gio_dep, gobject_dep, p11kit_dep, gck_lib ], description: 'GObject and GUI library for high level crypto parsing and display', ) @@ -251,7 +246,7 @@ if get_option('ssh_agent') gcr_ssh_agent = executable('gcr-ssh-agent', gcr_ssh_agent_lib_sources + [ 'gcr-ssh-agent.c' ], - dependencies: [ gcr_base_deps, gcr_base_dep, libsecret_dep, libsystemd_deps ], + dependencies: [ gcr_deps, gcr_dep, libsecret_dep, libsystemd_deps ], c_args: [ '-DGCR_COMPILATION', '-DGCR_API_SUBJECT_TO_CHANGE', @@ -281,7 +276,7 @@ if get_option('ssh_agent') gcr_ssh_agent_test_lib = static_library('gcr-ssh-agent-test', sources: gcr_ssh_agent_lib_sources + [ 'gcr-ssh-agent-test.c' ], - dependencies: [ gcr_base_deps, gcr_base_dep, libsecret_dep, libsystemd_deps ], + dependencies: [ gcr_deps, gcr_dep, libsecret_dep, libsystemd_deps ], c_args: [ '-DGCR_COMPILATION', '-DGCR_API_SUBJECT_TO_CHANGE', @@ -299,9 +294,9 @@ if get_option('ssh_agent') foreach _test : gcr_ssh_agent_test_names test_bin = executable('test-ssh-agent-'+_test, 'test-ssh-agent-@0@.c'.format(_test), - dependencies: [ gcr_base_deps, gcr_base_dep ], + dependencies: [ gcr_deps, gcr_dep ], link_with: [ gcr_ssh_agent_test_lib, egg_test_lib ], - c_args: [ gcr_base_cflags, gcr_ssh_agent_test_cflags ], + c_args: [ gcr_cflags, gcr_ssh_agent_test_cflags ], include_directories: config_h_dir, ) @@ -362,14 +357,14 @@ gcr_test_cflags = [ foreach _test : gcr_test_names test_bin = executable('test-'+_test, 'test-@0@.c'.format(_test), - dependencies: [ gcr_base_deps, gcr_base_dep ], + dependencies: [ gcr_deps, gcr_dep ], link_with: [ gck_test_lib, egg_test_lib ], - c_args: [ gcr_base_cflags, gcr_test_cflags ], + c_args: [ gcr_cflags, gcr_test_cflags ], include_directories: config_h_dir, ) test(_test, test_bin, - suite: 'gcr-base', + suite: 'gcr', depends: gcr_ssh_askpass, ) endforeach @@ -377,18 +372,18 @@ endforeach # Example frob programs frob_certificate_request = executable('frob-certificate-request', files('frob-certificate-request.c', 'console-interaction.c'), - dependencies: [ gcr_base_dep, gcr_base_deps ], - c_args: gcr_base_cflags, + dependencies: [ gcr_dep, gcr_deps ], + c_args: gcr_cflags, ) frob_openpgp = executable('frob-openpgp', files('frob-openpgp.c'), - dependencies: [ gcr_base_dep, gcr_base_deps ], - c_args: gcr_base_cflags, + dependencies: [ gcr_dep, gcr_deps ], + c_args: gcr_cflags, ) frob_parser = executable('frob-parser', files('frob-parser.c'), - dependencies: [ gcr_base_dep, gcr_base_deps ], - c_args: gcr_base_cflags, + dependencies: [ gcr_dep, gcr_deps ], + c_args: gcr_cflags, ) diff --git a/gcr/test-certificate-chain.c b/gcr/test-certificate-chain.c index a0bc45f..6cb8ee4 100644 --- a/gcr/test-certificate-chain.c +++ b/gcr/test-certificate-chain.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "egg/egg-asn1x.h" diff --git a/gcr/test-certificate.c b/gcr/test-certificate.c index 6603ad4..2fed913 100644 --- a/gcr/test-certificate.c +++ b/gcr/test-certificate.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "gcr/gcr-certificate-extensions.h" diff --git a/gcr/test-fingerprint.c b/gcr/test-fingerprint.c index 417d338..4932560 100644 --- a/gcr/test-fingerprint.c +++ b/gcr/test-fingerprint.c @@ -22,7 +22,7 @@ #include "config.h" #define GCR_COMPILATION 1 -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "gcr/gcr-fingerprint.h" diff --git a/gcr/test-gnupg-collection.c b/gcr/test-gnupg-collection.c index e65900a..b12c399 100644 --- a/gcr/test-gnupg-collection.c +++ b/gcr/test-gnupg-collection.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-gnupg-collection.h" #include "gcr/gcr-gnupg-key.h" #include "gcr/gcr-record.h" diff --git a/gcr/test-gnupg-process.c b/gcr/test-gnupg-process.c index d6cedd0..827cfe0 100644 --- a/gcr/test-gnupg-process.c +++ b/gcr/test-gnupg-process.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-callback-output-stream.h" #include "gcr/gcr-gnupg-process.h" diff --git a/gcr/test-openpgp.c b/gcr/test-openpgp.c index afba139..897be02 100644 --- a/gcr/test-openpgp.c +++ b/gcr/test-openpgp.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-openpgp.h" #include "gcr/gcr-record.h" diff --git a/gcr/test-openssh.c b/gcr/test-openssh.c index 3161736..e3ad367 100644 --- a/gcr/test-openssh.c +++ b/gcr/test-openssh.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-openssh.h" #include "egg/egg-testing.h" diff --git a/gcr/test-parser.c b/gcr/test-parser.c index 13cbc2b..76960b5 100644 --- a/gcr/test-parser.c +++ b/gcr/test-parser.c @@ -26,7 +26,7 @@ #include "egg/egg-secure-memory.h" #include "egg/egg-testing.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "gck/gck.h" diff --git a/gcr/test-pkcs11-certificate.c b/gcr/test-pkcs11-certificate.c index e1858ce..1b11b7a 100644 --- a/gcr/test-pkcs11-certificate.c +++ b/gcr/test-pkcs11-certificate.c @@ -24,7 +24,7 @@ #include "egg/egg-asn1x.h" #include "egg/egg-asn1-defs.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "egg/egg-testing.h" diff --git a/gcr/test-secret-exchange.c b/gcr/test-secret-exchange.c index 27d7775..b533670 100644 --- a/gcr/test-secret-exchange.c +++ b/gcr/test-secret-exchange.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "egg/egg-testing.h" diff --git a/gcr/test-simple-certificate.c b/gcr/test-simple-certificate.c index 9353c5e..945768e 100644 --- a/gcr/test-simple-certificate.c +++ b/gcr/test-simple-certificate.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "gck/gck-test.h" diff --git a/gcr/test-ssh-askpass.c b/gcr/test-ssh-askpass.c index cd58fce..936f48d 100644 --- a/gcr/test-ssh-askpass.c +++ b/gcr/test-ssh-askpass.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "egg/egg-testing.h" #include "egg/mock-interaction.h" diff --git a/gcr/test-subject-public-key.c b/gcr/test-subject-public-key.c index 4d16a7b..a95c38e 100644 --- a/gcr/test-subject-public-key.c +++ b/gcr/test-subject-public-key.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-subject-public-key.h" #include "gck/gck-mock.h" diff --git a/gcr/test-system-prompt.c b/gcr/test-system-prompt.c index 7b3b2e7..e1d472e 100644 --- a/gcr/test-system-prompt.c +++ b/gcr/test-system-prompt.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-mock-prompter.h" #include "egg/egg-testing.h" diff --git a/gcr/test-trust.c b/gcr/test-trust.c index fb3dca9..08e4a35 100644 --- a/gcr/test-trust.c +++ b/gcr/test-trust.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-internal.h" #include "gck/gck-mock.h" diff --git a/gcr/test-util.c b/gcr/test-util.c index 6e7610f..8532c3e 100644 --- a/gcr/test-util.c +++ b/gcr/test-util.c @@ -21,7 +21,7 @@ #include "config.h" -#include "gcr/gcr-base.h" +#include "gcr/gcr.h" #include "gcr/gcr-util.h" #include <errno.h> |