From 1de810f6de73ecf10eed01390f14aa4b3df43e0d Mon Sep 17 00:00:00 2001 From: Jehan Date: Sat, 20 Feb 2021 18:47:43 +0100 Subject: [PATCH] configure, meson: missing OpenRaster MIME type in desktop file. Adding support for .ora files when Python plug-ins are installed. --- configure.ac | 11 +++++------ meson.build | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 4ec183c227..4944a2f6ee 100644 --- a/configure.ac +++ b/configure.ac @@ -2287,12 +2287,10 @@ GOAT_EXERCISES="goat-exercise-c$BUILD_EXEEXT" # By default, we want packagers to install Python plug-ins to get the # optimum experience. --with-python=yes will check for a Python 3 -# interpreter and PyGObject, and fails without. -# --with-python=force will install the plug-ins even though the -# dependencies are not found at build time. It is up to the packager to -# ensure they are available at run time. This can be useful in -# particular when cross-compiling since anyway the interpreter is not -# useful at build time. +# interpreter and PyGObject, but still succeeds without, simply +# outputting a warning (these are runtime not build dependencies). +# This can be useful in particular when cross-compiling since anyway the +# interpreter is not useful at build time. # --with-python=no won't install Python plug-ins. It is discouraged. AC_ARG_WITH(python, [ --with-python=no|yes install Python 3 plug-ins (default=yes)], , @@ -2324,6 +2322,7 @@ WARNING: ${warning_python} AC_SUBST(PYBIN_PATH) GOAT_EXERCISES="$GOAT_EXERCISES:goat-exercise-py3.py" + MIME_TYPES="$MIME_TYPES;image/openraster" else with_python="no (disabled)" fi diff --git a/meson.build b/meson.build index 4ca630274d..688a5abb59 100644 --- a/meson.build +++ b/meson.build @@ -959,6 +959,8 @@ if have_python warning(python_warning) warnings += python_warning endif + + MIMEtypes += 'image/openraster' endif ## Javascript