1
1
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00

Issue #5349: meson build with -Dpoppler=false has no effect.

Poppler has not been an optional dependency for years now, because it
was decided that PDF import was considered a granted feature by most
people. So removing the option in the meson build. This option should
not have existed in the first place.
This commit is contained in:
Jehan
2020-07-05 11:28:10 +02:00
parent 47afc8170d
commit fae85e704a
2 changed files with 4 additions and 9 deletions

View File

@@ -781,14 +781,10 @@ conf.set('HAVE_WEBKIT', webkit.found())
poppler_minver = '0.69.0'
poppler_data_minver = '0.4.9'
if get_option('poppler')
poppler = [
dependency('poppler-glib', version: '>='+poppler_minver),
dependency('poppler-data', version: '>='+poppler_data_minver),
]
else
poppler = no_dep
endif
poppler = [
dependency('poppler-glib', version: '>='+poppler_minver),
dependency('poppler-data', version: '>='+poppler_data_minver),
]
cairopdf_minver = '1.12.2'
cairopdf = dependency('cairo-pdf', version: '>='+cairopdf_minver,

View File

@@ -57,7 +57,6 @@ option('gtk-doc', type: 'boolean', value: true, description: 'Build
option('gtk-doc-app', type: 'boolean', value: false, description: 'Build developer documentation for app')
option('linux-input', type: 'feature', value: 'auto', description: 'Linux input event controller module')
option('poppler', type: 'boolean', value: true, description: 'Poppler support')
option('vec-icons', type: 'boolean', value: true, description: 'Use vector icons rather than raster ones')
option('javascript', type: 'combo', value:'error', description: 'Install Javascript plug-ins',