diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2019-01-16 14:19:56 -0600 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-16 22:00:11 +0100 |
| commit | c6c1f1cbd103caf0cceaa21bb4af2e92b4f195b6 (patch) | |
| tree | 2c2824809cc5dec5bc1782e94e6c5e50ffa8b86a /media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | |
| parent | media-plugins/kodi-pvr-nextpvr: 3.3.12 version bump (diff) | |
| download | gentoo-c6c1f1cbd103caf0cceaa21bb4af2e92b4f195b6.tar.gz gentoo-c6c1f1cbd103caf0cceaa21bb4af2e92b4f195b6.tar.bz2 gentoo-c6c1f1cbd103caf0cceaa21bb4af2e92b4f195b6.zip | |
media-libs/gexiv2: fix vapi file generation and install
Bug: https://bugs.gentoo.org/675294
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10850
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch')
| -rw-r--r-- | media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch new file mode 100644 index 000000000000..daf72ef3a85b --- /dev/null +++ b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch @@ -0,0 +1,49 @@ +From: "Marty E. Plummer" <hanetzer@startmail.com> +Date: Sun, 13 Jan 2019 13:33:32 -0600 +Subject: [PATCH] meson.build: improve handling of vapi + +As it currently stands the vapi files are not generatable on linux +distros which do not provide unversioned valac/vapigen. Use instead +meson's add_languages function to handle detection of existing vala +toolchain, which will check the VALAC and VAPIGEN env vars. + +Signed-off-by: Marty E. Plummer <hanetzer@startmail.com> + +--- a/meson.build ++++ b/meson.build +@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '> + gobject = dependency('gobject-2.0', version : '>= 2.38.0') + + gir = find_program('g-ir-scanner', required: false) +-vapigen = find_program('vapigen', required: false) +-vala = find_program('valac', required: false) + + introspection_available = gir.found() and get_option('introspection') +-vapi_available = introspection_available and vapigen.found() and get_option('vapi') ++vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi') + + subdir('gexiv2') + +--- a/test/meson.build ++++ b/test/meson.build +@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg + test('regression', regression_test, env : test_env) + + if vapi_available +- valac = find_program('valac') +- if valac.found() +- add_languages('vala') +- executable('gexiv2-dump', +- 'gexiv2-dump.vala', +- include_directories : include_directories('..'), +- dependencies : [gobject, vapi], +- link_with : gexiv2) +- endif ++ executable('gexiv2-dump', ++ 'gexiv2-dump.vala', ++ include_directories : include_directories('..'), ++ dependencies : [gobject, vapi], ++ link_with : gexiv2) + endif + + if python2_available |