diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2022-06-24 14:38:36 +0000 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2022-06-24 14:38:36 +0000 |
| commit | 09d62e4af0a6827069ea74349ccf93b13e1848c7 (patch) | |
| tree | c235a7d30dd251c1a799258cc5cfabfba05f4823 | |
| parent | dbfe1f54c75543cf485bf6ed01c3f781ede18494 (diff) | |
| parent | 2b393e1463e4a0b8ae7f49de3c77443c6a4a3bb2 (diff) | |
| download | gcr-09d62e4af0a6827069ea74349ccf93b13e1848c7.tar.gz | |
Merge branch 'nielsdg/conflicting-files' into 'master'
Fix some conflicts between gcr3 and gcr4
Closes #99
See merge request GNOME/gcr!96
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | schema/meson.build | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 0f14a69..d50575d 100644 --- a/meson.build +++ b/meson.build @@ -105,7 +105,7 @@ conf = configuration_data() conf.set_quoted('VERSION', meson.project_version()) conf.set_quoted('LIBEXECDIR', libexecbindir) conf.set_quoted('LOCALEDIR', gcr_prefix / get_option('localedir')) -conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +conf.set_quoted('GETTEXT_PACKAGE', gcr_basename) conf.set('HAVE_GETTEXT', true) conf.set('HAVE_LOCALE_H', cc.has_header('locale.h')) conf.set('HAVE_TIMEGM', cc.has_function('timegm')) diff --git a/schema/meson.build b/schema/meson.build index 81572a3..4fd22d8 100644 --- a/schema/meson.build +++ b/schema/meson.build @@ -2,12 +2,3 @@ compiled_schemas = gnome.compile_schemas() install_data('org.gnome.crypto.pgp.gschema.xml', install_dir: gcr_prefix / get_option('datadir') / 'glib-2.0' / 'schemas', ) - -# GConf files (legacy) -gconf_convert_files = [ - 'org.gnome.crypto.pgp.convert', - 'org.gnome.crypto.pgp_keyservers.convert', -] -install_data(gconf_convert_files, - install_dir: get_option('datadir') / 'GConf' / 'gsettings', -) |