GNOME.org
 

[gcr/main: 8/38] gcr: Remove gcr-base-3 and make gcr-3 independent of GTK


commit f6c18ca557f745515f73d184573195b8b2de0429
Author: Corentin Noël <corentin noel collabora com>
Date:   Tue Nov 23 15:20:00 2021 +0100

    gcr: Remove gcr-base-3 and make gcr-3 independent of GTK
    
    Also remove the post-install symlinks

 docs/gcr/{gcr-base.toml.in => gcr.toml.in} |   0
 docs/gcr/meson.build                       |  12 ++--
 docs/meson.build                           |   2 +-
 gcr/frob-certificate-request.c             |   2 +-
 gcr/frob-openpgp.c                         |   2 +-
 gcr/frob-parser.c                          |   2 +-
 gcr/gcr-base.h                             |  65 ------------------
 gcr/gcr-certificate-chain.c                |   2 +-
 gcr/gcr-certificate-request.c              |   2 +-
 gcr/gcr-ssh-agent-service.c                |   2 +-
 gcr/gcr-system-prompter.c                  |   2 +-
 gcr/gcr.h                                  |  31 ++++++++-
 gcr/{gcr-base.symbols => gcr.symbols}      |   0
 gcr/{libgcr-base.map => libgcr.map}        |   0
 gcr/meson.build                            | 103 ++++++++++++++---------------
 gcr/test-certificate-chain.c               |   2 +-
 gcr/test-certificate.c                     |   2 +-
 gcr/test-fingerprint.c                     |   2 +-
 gcr/test-gnupg-collection.c                |   2 +-
 gcr/test-gnupg-process.c                   |   2 +-
 gcr/test-openpgp.c                         |   2 +-
 gcr/test-openssh.c                         |   2 +-
 gcr/test-parser.c                          |   2 +-
 gcr/test-pkcs11-certificate.c              |   2 +-
 gcr/test-secret-exchange.c                 |   2 +-
 gcr/test-simple-certificate.c              |   2 +-
 gcr/test-ssh-askpass.c                     |   2 +-
 gcr/test-subject-public-key.c              |   2 +-
 gcr/test-system-prompt.c                   |   2 +-
 gcr/test-trust.c                           |   2 +-
 gcr/test-util.c                            |   2 +-
 meson.build                                |   3 -
 meson_post_install.py                      |  23 -------
 ui/frob-certificate.c                      |   1 +
 ui/frob-combo-selector.c                   |   1 +
 ui/frob-key.c                              |   1 +
 ui/frob-prompt.c                           |   2 +-
 ui/frob-tree-selector.c                    |   1 +
 ui/frob-unlock-options.c                   |   1 +
 ui/gcr-prompter-tool.c                     |   1 +
 ui/gcr-ui.h                                |   2 +-
 ui/gcr-viewer-window.h                     |   1 +
 ui/meson.build                             |  15 ++---
 43 files changed, 121 insertions(+), 190 deletions(-)
---
diff --git a/docs/gcr/gcr-base.toml.in b/docs/gcr/gcr.toml.in
similarity index 100%
rename from docs/gcr/gcr-base.toml.in
rename to docs/gcr/gcr.toml.in
diff --git a/docs/gcr/meson.build b/docs/gcr/meson.build
index d80b7c75..b7a33fbc 100644
--- a/docs/gcr/meson.build
+++ b/docs/gcr/meson.build
@@ -1,11 +1,11 @@
-gcr_base_content_files = [
+gcr_content_files = [
   'non-pageable-memory.md',
   'pkcs11-configuration.md',
   'trust-store.md',
 ]
 
-gcr_base_toml = configure_file(
-  input: 'gcr-base.toml.in',
+gcr_toml = configure_file(
+  input: 'gcr.toml.in',
   output: '@BASENAME@',
   configuration: {
     'GCR_VERSION': gcr_api_version,
@@ -13,7 +13,7 @@ gcr_base_toml = configure_file(
   },
 )
 
-gcr_base_docs = custom_target('gcr-docs',
+gcr_docs = custom_target('gcr-docs',
   input: gcr_gir[0],
   output: gcr_basename,
   command: [
@@ -22,13 +22,13 @@ gcr_base_docs = custom_target('gcr-docs',
     '--quiet',
     '--fatal-warnings',
     '--add-include-path=@0@'.format(build_root / 'gck'),
-    '--config', gcr_base_toml,
+    '--config', gcr_toml,
     '--output-dir=@OUTPUT@',
     '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT@',
   ],
-  depend_files: [ gcr_base_toml, gcr_base_content_files ],
+  depend_files: [ gcr_toml, gcr_content_files ],
   depends: [ gck_gir[0] ],
   build_by_default: true,
   install: true,
diff --git a/docs/meson.build b/docs/meson.build
index b90095c6..9cdebc30 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -7,6 +7,6 @@ subdir('ui')
 # Create a pseudo target that build all docs at once
 alias_target('docs',
   gck_docs,
-  gcr_base_docs,
+  gcr_docs,
   gcr_ui_docs,
 )
diff --git a/gcr/frob-certificate-request.c b/gcr/frob-certificate-request.c
index 6801b8ce..459f391e 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 433056bc..7846f294 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 1abf2e9a..f071eb50 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-certificate-chain.c b/gcr/gcr-certificate-chain.c
index f34eae82..c5cb8b8f 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 dd58d421..452d1e1d 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 b7e89286..beae47bc 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 dbb51b03..ef22e299 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"
diff --git a/gcr/gcr.h b/gcr/gcr.h
index 966163a0..c9e0be51 100644
--- a/gcr/gcr.h
+++ b/gcr/gcr.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
similarity index 100%
rename from gcr/gcr-base.symbols
rename to gcr/gcr.symbols
diff --git a/gcr/libgcr-base.map b/gcr/libgcr.map
similarity index 100%
rename from gcr/libgcr-base.map
rename to gcr/libgcr.map
diff --git a/gcr/meson.build b/gcr/meson.build
index d2f548de..24074e5e 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 a0bc45f3..6cb8ee49 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 6603ad42..2fed913a 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 417d3382..49325604 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 e65900a5..b12c399f 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 d6cedd01..827cfe03 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 afba1395..897be022 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 3161736a..e3ad367d 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 13cbc2bc..76960b5d 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 e1858cef..1b11b7a4 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 27d77757..b5336704 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 9353c5e1..945768ea 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 cd58fcee..936f48dd 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 4d16a7b5..a95c38e1 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 7b3b2e7e..e1d472e4 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 fb3dca91..08e4a359 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 6e7610f4..8532c3eb 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>
diff --git a/meson.build b/meson.build
index 4fc71587..42f7c6f1 100644
--- a/meson.build
+++ b/meson.build
@@ -118,7 +118,4 @@ endif
 # Post-install scripts
 meson.add_install_script('meson_post_install.py',
   get_option('datadir'),
-  get_option('libdir'),
-  gcr_major_version.to_string(),
-  gcr_soversion,
 )
diff --git a/meson_post_install.py b/meson_post_install.py
index 01668148..9e5cbdf4 100755
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -9,9 +9,6 @@ install_prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX']
 
 # Args
 datadir = sys.argv[1]
-libdir = sys.argv[2]
-gcr_major_version = sys.argv[3]
-gcr_soversion = sys.argv[4]
 
 icondir = os.path.join(install_prefix, datadir, 'icons', 'hicolor')
 schemadir = os.path.join(install_prefix, datadir, 'glib-2.0', 'schemas')
@@ -29,23 +26,3 @@ subprocess.call(['glib-compile-schemas', schemadir])
 
 print('Updating MIME database...')
 subprocess.call(['update-mime-database', mimedatabasedir])
-
-# FIXME: after a major version bump, just drop this
-print('Creating symlink for libgcr-{}.so'.format(gcr_major_version))
-
-def _get_path_for_lib(basename):
-    return os.path.join(install_prefix, libdir, basename)
-
-libgcr_ui_basename = 'libgcr-ui-{}.so'.format(gcr_major_version)
-libgcr_basename = 'libgcr-{}.so'.format(gcr_major_version)
-
-subprocess.call(['ln', '-f', '-s', libgcr_ui_basename, _get_path_for_lib(libgcr_basename)])
-
-for v in gcr_soversion.split('.'):
-    libgcr_ui_basename += '.{}'.format(v)
-    libgcr_basename += '.{}'.format(v)
-
-    if not os.path.exists(_get_path_for_lib(libgcr_ui_basename)):
-        continue
-
-    subprocess.call(['ln', '-f', '-s', libgcr_ui_basename, _get_path_for_lib(libgcr_basename)])
diff --git a/ui/frob-certificate.c b/ui/frob-certificate.c
index f9cc259f..f476ea5c 100644
--- a/ui/frob-certificate.c
+++ b/ui/frob-certificate.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #include "egg/egg-hex.h"
 
diff --git a/ui/frob-combo-selector.c b/ui/frob-combo-selector.c
index 8263b94e..8a467f6b 100644
--- a/ui/frob-combo-selector.c
+++ b/ui/frob-combo-selector.c
@@ -2,6 +2,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/frob-key.c b/ui/frob-key.c
index 97d216b6..2d8079a4 100644
--- a/ui/frob-key.c
+++ b/ui/frob-key.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/frob-prompt.c b/ui/frob-prompt.c
index 20f54824..bf8c5099 100644
--- a/ui/frob-prompt.c
+++ b/ui/frob-prompt.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
-#include "gcr/gcr-base.h"
+#include "ui/gcr-ui.h"
 
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
diff --git a/ui/frob-tree-selector.c b/ui/frob-tree-selector.c
index f2a7ef8d..a7df3983 100644
--- a/ui/frob-tree-selector.c
+++ b/ui/frob-tree-selector.c
@@ -2,6 +2,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/frob-unlock-options.c b/ui/frob-unlock-options.c
index b9e5b092..d5bc7d58 100644
--- a/ui/frob-unlock-options.c
+++ b/ui/frob-unlock-options.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #include <gtk/gtk.h>
 
diff --git a/ui/gcr-prompter-tool.c b/ui/gcr-prompter-tool.c
index 2d3f71ea..238e4233 100644
--- a/ui/gcr-prompter-tool.c
+++ b/ui/gcr-prompter-tool.c
@@ -24,6 +24,7 @@
 
 #include "gcr/gcr.h"
 #include "gcr/gcr-dbus-constants.h"
+#include "ui/gcr-ui.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/ui/gcr-ui.h b/ui/gcr-ui.h
index cbec5b38..2d0c1f7d 100644
--- a/ui/gcr-ui.h
+++ b/ui/gcr-ui.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <gcr/gcr-base.h>
+#include <gcr/gcr.h>
 
 #define __GCR_INSIDE_HEADER__
 
diff --git a/ui/gcr-viewer-window.h b/ui/gcr-viewer-window.h
index de42926b..ea60ab0a 100644
--- a/ui/gcr-viewer-window.h
+++ b/ui/gcr-viewer-window.h
@@ -28,6 +28,7 @@
 #ifndef GCR_DISABLE_DEPRECATED
 
 #include "gcr/gcr.h"
+#include "ui/gcr-ui.h"
 
 #define GCR_TYPE_VIEWER_WINDOW               (gcr_viewer_window_get_type ())
 #define GCR_VIEWER_WINDOW(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_VIEWER_WINDOW, 
GcrViewerWindow))
diff --git a/ui/meson.build b/ui/meson.build
index 69144cee..dbfeec6e 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -1,6 +1,6 @@
 subdir('icons')
 
-gcr_ui_headers_install_dir = gcr_base_headers_subdir / 'ui'
+gcr_ui_headers_install_dir = gcr_headers_subdir / 'ui'
 
 gcr_ui_public_sources = files(
   'gcr-certificate-renderer.c',
@@ -82,7 +82,7 @@ gcr_ui_deps = [
   p11kit_dep,
   libegg_dep,
   gck_dep,
-  gcr_base_dep,
+  gcr_dep,
   gtk_dep,
 ]
 
@@ -116,18 +116,11 @@ gcr_ui_pkgconf_deps = [
   gio_dep,
   gobject_dep,
   gck_lib,
-  gcr_base_lib,
+  gcr_lib,
   gtk_dep,
 ]
 pkgconfig.generate(gcr_ui_lib,
-  subdirs: gcr_base_headers_subdir,
-  requires: gcr_ui_pkgconf_deps,
-  description: 'GObject and GUI library for high level crypto parsing and display',
-)
-pkgconfig.generate(gcr_ui_lib,
-  filebase: gcr_basename,
-  name: gcr_basename,
-  subdirs: gcr_base_headers_subdir,
+  subdirs: gcr_headers_subdir,
   requires: gcr_ui_pkgconf_deps,
   description: 'GObject and GUI library for high level crypto parsing and display',
 )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]