diff options
Diffstat (limited to 'media-libs/gexiv2/files')
-rw-r--r-- | media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch | 29 | ||||
-rw-r--r-- | media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch | 49 |
2 files changed, 0 insertions, 78 deletions
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch deleted file mode 100644 index 03f0e4fd3162..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi - vapigen = find_program('vapigen', required: false) - vala = find_program('valac', required: false) - --introspection_available = gir.found() and not get_option('disable-introspection') --vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala') -+introspection_available = gir.found() and get_option('introspection') -+vapi_available = introspection_available and vapigen.found() and get_option('vapi') - - subdir('gexiv2') - --if get_option('enable-gtk-doc') -+if get_option('gtk_doc') - subdir('docs') - endif - ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,5 @@ --option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)') --option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection') --option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file') -+option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)') -+option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection') -+option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file') - option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)') - option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)') 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 deleted file mode 100644 index daf72ef3a85b..000000000000 --- a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 |