[gimp] Try to reenable Print plugin on Windows. Let's see if the CI passes.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Try to reenable Print plugin on Windows. Let's see if the CI passes.
- Date: Mon, 6 Jul 2020 18:22:45 +0000 (UTC)
commit 1a19ac6a3a33349531a972d2d83be5dadfbc6346
Author: Félix Piédallu <fpiedallu kalrayinc com>
Date: Mon Jul 6 11:03:21 2020 +0200
Try to reenable Print plugin on Windows. Let's see if the CI passes.
meson.build | 10 ++--------
meson_options.txt | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index cd7569a6c2..f698334619 100644
--- a/meson.build
+++ b/meson.build
@@ -613,18 +613,12 @@ conf.set('HAVE_X11_XMU_WINUTIL_H',
x11_target and cc.has_header('X11/Xmu/WinUtil.h'))
+have_print = get_option('print')
+
# Features requiring x11
have_doc_shooter= x11_target
-if get_option('print').disabled()
- have_print = false
-elif get_option('print').enabled() and not x11_target
- error('Printing requires x libs')
-else
- have_print = x11_target
-endif
-
if get_option('screenshot').disabled()
have_screenshot = false
elif get_option('screenshot').enabled() and not x11_target
diff --git a/meson_options.txt b/meson_options.txt
index c274caf7e8..8b50e9ffc8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -42,7 +42,7 @@ option('jpeg2000', type: 'feature', value: 'auto', description: 'Jpeg-2
option('mng', type: 'feature', value: 'auto', description: 'Mng support')
option('openexr', type: 'feature', value: 'auto', description: 'Openexr support')
option('png', type: 'feature', value: 'auto', description: 'PNG support')
-option('print', type: 'feature', value: 'auto', description: 'Print support')
+option('print', type: 'boolean', value: true, description: 'Print support')
option('screenshot', type: 'feature', value: 'auto', description: 'Screensh')
option('tiff', type: 'feature', value: 'auto', description: 'TIFF support')
option('vala-plugins', type: 'feature', value: 'auto', description: 'Build VAPI and Vala plugins')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]