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

[Jehan <jehanp src gnome org>]

commit fae85e704a77a867b7863018e15fdc20224b6f77
Author: Jehan <jehan girinstud io>
Date:   Sun Jul 5 11:28:10 2020 +0200

    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.

 meson.build       | 12 ++++--------
 meson_options.txt |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index 41270de00e..01bb79441e 100644
--- a/meson.build
+++ b/meson.build
@@ -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,
diff --git a/meson_options.txt b/meson_options.txt
index 87ba670917..c274caf7e8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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',