New upstream version 2.10.2

2018-05-20 22:48:19 -04:00
parent 07c3f6bee3 be7f9b433a
commit efdf9e63ac
469 changed files with 78752 additions and 46811 deletions
--- a/505
+++ b/505
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GIMP 2.10.0.
+# Generated by GNU Autoconf 2.69 for GIMP 2.10.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>.
 #
@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GIMP'
 PACKAGE_TARNAME='gimp'
-PACKAGE_VERSION='2.10.0'
-PACKAGE_STRING='GIMP 2.10.0'
+PACKAGE_VERSION='2.10.2'
+PACKAGE_STRING='GIMP 2.10.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
 PACKAGE_URL=''

@ -676,6 +676,9 @@ GTKDOC_MKPDF
 GTKDOC_REBASE
 GTKDOC_CHECK_PATH
 GTKDOC_CHECK
+HAVE_DESKTOP_FILE_VALIDATE_FALSE
+HAVE_DESKTOP_FILE_VALIDATE_TRUE
+DESKTOP_FILE_VALIDATE
 HAVE_APPSTREAM_UTIL_FALSE
 HAVE_APPSTREAM_UTIL_TRUE
 APPSTREAM_UTIL
@ -702,8 +705,6 @@ PLATFORM_OSX_QUARTZ_TRUE
 GTK_MAC_INTEGRATION_LIBS
 GTK_MAC_INTEGRATION_CFLAGS
 MAIL
-BUILD_SCRIPT_FU_FALSE
-BUILD_SCRIPT_FU_TRUE
 BUILD_PYTHON_FALSE
 BUILD_PYTHON_TRUE
 PYGIMP_EXTRA_CFLAGS
@ -774,6 +775,11 @@ MYPAINT_BRUSHES_LIBS
 MYPAINT_BRUSHES_CFLAGS
 LIBMYPAINT_LIBS
 LIBMYPAINT_CFLAGS
+HAVE_LIBHEIF_FALSE
+HAVE_LIBHEIF_TRUE
+FILE_HEIF
+LIBHEIF_LIBS
+LIBHEIF_CFLAGS
 HAVE_WEBP_FALSE
 HAVE_WEBP_TRUE
 WEBPDEMUX_LIBS
@ -866,6 +872,8 @@ GOBJECT_QUERY
 GLIB_GENMARSHAL
 GLIB_LIBS
 GLIB_CFLAGS
+GLIB_WIN_BUG_LIBS
+GLIB_WIN_BUG_CFLAGS
 ATK_LIBS
 ATK_CFLAGS
 GEGL_LIBS
@ -1026,6 +1034,7 @@ LT_VERSION_INFO
 GIMP_UNSTABLE_FALSE
 GIMP_UNSTABLE_TRUE
 XGETTEXT_RECOMMENDED_VERSION
+LIBHEIF_REQUIRED_VERSION
 WEBP_REQUIRED_VERSION
 PYTHON2_REQUIRED_VERSION
 PERL_REQUIRED_VERSION
@ -1048,6 +1057,7 @@ LIBPNG_REQUIRED_VERSION
 LCMS_REQUIRED_VERSION
 GEXIV2_REQUIRED_VERSION
 GEGL_REQUIRED_VERSION
+GEGL_MAJOR_MINOR_VERSION
 CAIRO_PDF_REQUIRED_VERSION
 CAIRO_REQUIRED_VERSION
 GTK_WIN32_RECOMMENDED_VERSION
@ -1172,6 +1182,7 @@ with_aa
 with_libxpm
 with_openexr
 with_webp
+with_libheif
 enable_bundled_mypaint_brushes
 with_webkit
 with_print
@ -1189,11 +1200,12 @@ with_gudev
 with_sendmail
 with_pdbgen
 enable_python
-with_script_fu
 with_desktop_dir
 enable_vector_icons
 with_xvfb_run
 with_appdata_test
+with_bug_report_url
+with_icc_directory
 with_html_dir
 enable_gtk_doc
 enable_gtk_doc_html
@ -1229,6 +1241,8 @@ GEGL_CFLAGS
 GEGL_LIBS
 ATK_CFLAGS
 ATK_LIBS
+GLIB_WIN_BUG_CFLAGS
+GLIB_WIN_BUG_LIBS
 GMODULE_NO_EXPORT_CFLAGS
 GMODULE_NO_EXPORT_LIBS
 GIO_CFLAGS
@ -1268,6 +1282,8 @@ WEBPMUX_CFLAGS
 WEBPMUX_LIBS
 WEBPDEMUX_CFLAGS
 WEBPDEMUX_LIBS
+LIBHEIF_CFLAGS
+LIBHEIF_LIBS
 LIBMYPAINT_CFLAGS
 LIBMYPAINT_LIBS
 MYPAINT_BRUSHES_CFLAGS
@ -1851,7 +1867,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures GIMP 2.10.0 to adapt to many kinds of systems.
+\`configure' configures GIMP 2.10.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1926,7 +1942,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of GIMP 2.10.0:";;
+     short | recursive ) echo "Configuration of GIMP 2.10.2:";;
   esac
  cat <<\_ACEOF

@ -1998,6 +2014,7 @@ Optional Packages:
  --without-libxpm        build without XPM support
  --without-openexr       build without OpenEXR support
  --without-webp       build without WebP support
+  --without-libheif       build without libheif support
  --without-webkit        don't build the help-browser and web-page plug-ins
  --without-print         build without print support
  --without-cairo-pdf     build without cairo-pdf support
@ -2012,10 +2029,11 @@ Optional Packages:
  --without-gudev         build without GUdev support
  --with-sendmail=DIR     use sendmail instead of xdg-email
  --with-pdbgen           use 'pdbgen' code generation tool
-  --without-script-fu     do not build the script-fu extension
  --with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)
  --without-xvfb-run      do not use xvfb-run for UI-dependent automatic tests
  --without-appdata-test  do not validate the appdata file
+  --with-bug-report-url   URL used by the debug dialog to report bugs
+  --with-icc-directory    Path to default color profiles for this system
  --with-html-dir=PATH    path to installed docs
  --with-gimpdir=DIR      change default gimpdir from $XDG_CONFIG_HOME/GIMP/2.10 to $XDG_CONFIG_HOME/DIR/2.10, or to DIR if DIR is an absolute path

@ -2046,6 +2064,10 @@ Some influential environment variables:
  GEGL_LIBS   linker flags for GEGL, overriding pkg-config
  ATK_CFLAGS  C compiler flags for ATK, overriding pkg-config
  ATK_LIBS    linker flags for ATK, overriding pkg-config
+  GLIB_WIN_BUG_CFLAGS
+              C compiler flags for GLIB_WIN_BUG, overriding pkg-config
+  GLIB_WIN_BUG_LIBS
+              linker flags for GLIB_WIN_BUG, overriding pkg-config
  GMODULE_NO_EXPORT_CFLAGS
              C compiler flags for GMODULE_NO_EXPORT, overriding pkg-config
  GMODULE_NO_EXPORT_LIBS
@ -2113,6 +2135,10 @@ Some influential environment variables:
              C compiler flags for WEBPDEMUX, overriding pkg-config
  WEBPDEMUX_LIBS
              linker flags for WEBPDEMUX, overriding pkg-config
+  LIBHEIF_CFLAGS
+              C compiler flags for LIBHEIF, overriding pkg-config
+  LIBHEIF_LIBS
+              linker flags for LIBHEIF, overriding pkg-config
  LIBMYPAINT_CFLAGS
              C compiler flags for LIBMYPAINT, overriding pkg-config
  LIBMYPAINT_LIBS
@ -2236,7 +2262,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-GIMP configure 2.10.0
+GIMP configure 2.10.2
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@ -2780,7 +2806,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by GIMP $as_me 2.10.0, which was
+It was created by GIMP $as_me 2.10.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@ -3649,7 +3675,7 @@ fi

 # Define the identity of the package.
 PACKAGE='gimp'
- VERSION='2.10.0'
+ VERSION='2.10.2'


 # Some tools Automake needs.
@ -3779,11 +3805,11 @@ AM_BACKSLASH='\'

 GIMP_MAJOR_VERSION=2
 GIMP_MINOR_VERSION=10
-GIMP_MICRO_VERSION=0
-GIMP_INTERFACE_AGE=0
-GIMP_BINARY_AGE=1000
-GIMP_VERSION=2.10.0
-GIMP_REAL_VERSION=2.10.0
+GIMP_MICRO_VERSION=2
+GIMP_INTERFACE_AGE=2
+GIMP_BINARY_AGE=1002
+GIMP_VERSION=2.10.2
+GIMP_REAL_VERSION=2.10.2
 GIMP_API_VERSION=2.0
 GIMP_APP_VERSION=2.10
 GIMP_PLUGIN_VERSION=2.0
@ -3820,14 +3846,15 @@ GTK_REQUIRED_VERSION=2.24.10
 GTK_WIN32_RECOMMENDED_VERSION=2.24.32
 CAIRO_REQUIRED_VERSION=1.12.2
 CAIRO_PDF_REQUIRED_VERSION=1.12.2
-GEGL_REQUIRED_VERSION=0.4.0
+GEGL_MAJOR_MINOR_VERSION=0.4
+GEGL_REQUIRED_VERSION=0.4.2
 GEXIV2_REQUIRED_VERSION=0.10.6
 LCMS_REQUIRED_VERSION=2.8
 LIBPNG_REQUIRED_VERSION=1.6.25
 LIBLZMA_REQUIRED_VERSION=5.0.0
 LIBMYPAINT_REQUIRED_VERSION=1.3.0
 PANGOCAIRO_REQUIRED_VERSION=1.29.4
-BABL_REQUIRED_VERSION=0.1.46
+BABL_REQUIRED_VERSION=0.1.50
 FONTCONFIG_REQUIRED_VERSION=2.12.4
 FREETYPE2_REQUIRED_VERSION=2.1.7
 HARFBUZZ_REQUIRED_VERSION=0.9.19
@ -3842,6 +3869,7 @@ INTLTOOL_REQUIRED_VERSION=0.40.1
 PERL_REQUIRED_VERSION=5.10.0
 PYTHON2_REQUIRED_VERSION=2.5.0
 WEBP_REQUIRED_VERSION=0.6.0
+LIBHEIF_REQUIRED_VERSION=1.1.0
 XGETTEXT_RECOMMENDED_VERSION=0.19


@ -3870,6 +3898,8 @@ XGETTEXT_RECOMMENDED_VERSION=0.19



+
+



@ -3895,7 +3925,7 @@ fi



-LT_VERSION_INFO="1000:0:1000"
+LT_VERSION_INFO="1000:2:1000"
 LT_CURRENT_MINUS_AGE=0


@ -21078,7 +21108,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 fi


-for ac_header in execinfo.h fcntl.h sys/param.h sys/prctl.h sys/time.h sys/times.h sys/wait.h unistd.h
+for ac_header in execinfo.h fcntl.h sys/param.h sys/prctl.h sys/thr.h sys/time.h sys/times.h sys/wait.h unistd.h
 do :
  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@ -21402,6 +21432,17 @@ _ACEOF
 fi
 done

+for ac_func in thr_self
+do :
+  ac_fn_c_check_func "$LINENO" "thr_self" "ac_cv_func_thr_self"
+if test "x$ac_cv_func_thr_self" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_THR_SELF 1
+_ACEOF
+
+fi
+done
+



@ -23013,12 +23054,12 @@ if test -n "$BABL_CFLAGS"; then
    pkg_cv_BABL_CFLAGS="$BABL_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.46\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "babl >= 0.1.46") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.50\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "babl >= 0.1.50") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_BABL_CFLAGS=`$PKG_CONFIG --cflags "babl >= 0.1.46" 2>/dev/null`
+  pkg_cv_BABL_CFLAGS=`$PKG_CONFIG --cflags "babl >= 0.1.50" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@ -23030,12 +23071,12 @@ if test -n "$BABL_LIBS"; then
    pkg_cv_BABL_LIBS="$BABL_LIBS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.46\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "babl >= 0.1.46") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"babl >= 0.1.50\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "babl >= 0.1.50") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_BABL_LIBS=`$PKG_CONFIG --libs "babl >= 0.1.46" 2>/dev/null`
+  pkg_cv_BABL_LIBS=`$PKG_CONFIG --libs "babl >= 0.1.50" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@ -23056,27 +23097,27 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-	        BABL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "babl >= 0.1.46" 2>&1`
+	        BABL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "babl >= 0.1.50" 2>&1`
        else
-	        BABL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "babl >= 0.1.46" 2>&1`
+	        BABL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "babl >= 0.1.50" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$BABL_PKG_ERRORS" >&5


-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.50" >&5
+$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.50" >&6;}
  required_deps="$required_deps
-  - Error: missing dependency babl >= 0.1.46"
+  - Error: missing dependency babl >= 0.1.50"

 elif test $pkg_failed = untried; then
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.46" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.50" >&5
+$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: babl >= 0.1.50" >&6;}
  required_deps="$required_deps
-  - Error: missing dependency babl >= 0.1.46"
+  - Error: missing dependency babl >= 0.1.50"

 else
 	BABL_CFLAGS=$pkg_cv_BABL_CFLAGS
@ -23094,12 +23135,12 @@ if test -n "$GEGL_CFLAGS"; then
    pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.2") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= 0.4.0" 2>/dev/null`
+  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= 0.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@ -23111,12 +23152,12 @@ if test -n "$GEGL_LIBS"; then
    pkg_cv_GEGL_LIBS="$GEGL_LIBS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4.2") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= 0.4.0" 2>/dev/null`
+  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= 0.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@ -23137,27 +23178,27 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= 0.4.0" 2>&1`
+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= 0.4.2" 2>&1`
        else
-	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= 0.4.0" 2>&1`
+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= 0.4.2" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEGL_PKG_ERRORS" >&5


-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.2" >&5
+$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.2" >&6;}
  required_deps="$required_deps
-  - Error: missing dependency gegl-0.4 >= 0.4.0"
+  - Error: missing dependency gegl-0.4 >= 0.4.2"

 elif test $pkg_failed = untried; then
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }

-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.0" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.2" >&5
+$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: gegl-0.4 >= 0.4.2" >&6;}
  required_deps="$required_deps
-  - Error: missing dependency gegl-0.4 >= 0.4.0"
+  - Error: missing dependency gegl-0.4 >= 0.4.2"

 else
 	GEGL_CFLAGS=$pkg_cv_GEGL_CFLAGS
@ -23248,6 +23289,10 @@ $as_echo "yes" >&6; }

 fi

+# glib 2.56.0 and 2.56.1 have a bad bug on Win32, breaking the file
+# chooser dialogs. This has been fixed, but no release made yet. When
+# 2.56.2 is released, the additional test for these broken versions can
+# be removed and we can bump the requirement to glib 2.56.2.
 # Check whether --enable-glibtest was given.
 if test "${enable_glibtest+set}" = set; then :
  enableval=$enable_glibtest;
@ -23535,7 +23580,84 @@ fi
  if test "x$no_glib" = x ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
 $as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
-     :
+     if test "x$platform_win32" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB_WIN_BUG" >&5
+$as_echo_n "checking for GLIB_WIN_BUG... " >&6; }
+
+if test -n "$GLIB_WIN_BUG_CFLAGS"; then
+    pkg_cv_GLIB_WIN_BUG_CFLAGS="$GLIB_WIN_BUG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_WIN_BUG_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB_WIN_BUG_LIBS"; then
+    pkg_cv_GLIB_WIN_BUG_LIBS="$GLIB_WIN_BUG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_WIN_BUG_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLIB_WIN_BUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2" 2>&1`
+        else
+	        GLIB_WIN_BUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.56.0 glib-2.0 < 2.56.2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_WIN_BUG_PKG_ERRORS" >&5
+
+	:
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	:
+else
+	GLIB_WIN_BUG_CFLAGS=$pkg_cv_GLIB_WIN_BUG_CFLAGS
+	GLIB_WIN_BUG_LIBS=$pkg_cv_GLIB_WIN_BUG_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: glib >= 2.54.2 except glib 2.56.0 and 2.56.1 (broken on Win32 - bug 795855)" >&5
+$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: glib >= 2.54.2 except glib 2.56.0 and 2.56.1 (broken on Win32 - bug 795855)" >&6;}
+  required_deps="$required_deps
+  - Error: missing dependency glib >= 2.54.2 except glib 2.56.0 and 2.56.1 (broken on Win32 - bug 795855)"
+
+fi
+                 fi
  else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@ -28855,6 +28977,108 @@ fi



+###################
+# Check for libheif
+###################
+
+
+# Check whether --with-libheif was given.
+if test "${with_libheif+set}" = set; then :
+  withval=$with_libheif;
+fi
+
+
+have_libheif=no
+if test "x$with_libheif" != xno; then
+  have_libheif=yes
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBHEIF" >&5
+$as_echo_n "checking for LIBHEIF... " >&6; }
+
+if test -n "$LIBHEIF_CFLAGS"; then
+    pkg_cv_LIBHEIF_CFLAGS="$LIBHEIF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libheif >= 1.1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBHEIF_CFLAGS=`$PKG_CONFIG --cflags "libheif >= 1.1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBHEIF_LIBS"; then
+    pkg_cv_LIBHEIF_LIBS="$LIBHEIF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif >= 1.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libheif >= 1.1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBHEIF_LIBS=`$PKG_CONFIG --libs "libheif >= 1.1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBHEIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libheif >= 1.1.0" 2>&1`
+        else
+	        LIBHEIF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libheif >= 1.1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBHEIF_PKG_ERRORS" >&5
+
+	have_libheif="no (libheif not found)"
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_libheif="no (libheif not found)"
+else
+	LIBHEIF_CFLAGS=$pkg_cv_LIBHEIF_CFLAGS
+	LIBHEIF_LIBS=$pkg_cv_LIBHEIF_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	FILE_HEIF='file-heif$(EXEEXT)'
+fi
+fi
+
+if test "x$have_libheif" = xyes; then
+  MIME_TYPES="$MIME_TYPES;image/heif;image/heic"
+fi
+
+
+ if test "x$have_libheif" = xyes; then
+  HAVE_LIBHEIF_TRUE=
+  HAVE_LIBHEIF_FALSE='#'
+else
+  HAVE_LIBHEIF_TRUE='#'
+  HAVE_LIBHEIF_FALSE=
+fi
+
+
+
 ######################
 # Check for libmypaint
 ######################
@ -31265,31 +31489,6 @@ fi



-#########################################
-# Check whether Script-Fu should be built
-#########################################
-
-have_script_fu=yes
-
-# Check whether --with-script-fu was given.
-if test "${with_script_fu+set}" = set; then :
-  withval=$with_script_fu;
-fi
-
-
-if test "x$with_script_fu" = "xno"; then
-  have_script_fu="no (script-fu extension disabled)"
-fi
- if test "x$with_script_fu" != "xno"; then
-  BUILD_SCRIPT_FU_TRUE=
-  BUILD_SCRIPT_FU_FALSE='#'
-else
-  BUILD_SCRIPT_FU_TRUE='#'
-  BUILD_SCRIPT_FU_FALSE=
-fi
-
-
-
 ###########################################################
 # Some plug-ins don't build on Win32, others are Win32-only
 ###########################################################
@ -31896,6 +32095,134 @@ if test "x$have_appstream_util" = "xyes"; then
 fi


+#################################
+# Check for desktop-file-validate
+#################################
+
+# Extract the first word of "desktop-file-validate", so it can be a program name with args.
+set dummy desktop-file-validate; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DESKTOP_FILE_VALIDATE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DESKTOP_FILE_VALIDATE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DESKTOP_FILE_VALIDATE="$DESKTOP_FILE_VALIDATE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DESKTOP_FILE_VALIDATE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_DESKTOP_FILE_VALIDATE" && ac_cv_path_DESKTOP_FILE_VALIDATE="no"
+  ;;
+esac
+fi
+DESKTOP_FILE_VALIDATE=$ac_cv_path_DESKTOP_FILE_VALIDATE
+if test -n "$DESKTOP_FILE_VALIDATE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DESKTOP_FILE_VALIDATE" >&5
+$as_echo "$DESKTOP_FILE_VALIDATE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "x$DESKTOP_FILE_VALIDATE" != "xno"; then
+  have_desktop_file_validate="yes"
+else
+  have_desktop_file_validate="no (desktop-file-validate not found)"
+fi
+ if test "x$DESKTOP_FILE_VALIDATE" != "xno"; then
+  HAVE_DESKTOP_FILE_VALIDATE_TRUE=
+  HAVE_DESKTOP_FILE_VALIDATE_FALSE='#'
+else
+  HAVE_DESKTOP_FILE_VALIDATE_TRUE='#'
+  HAVE_DESKTOP_FILE_VALIDATE_FALSE=
+fi
+
+
+####################
+# Set bug report URL
+####################
+
+# Allowing third-party packagers to set their own bugtracker URL, in
+# order to filter first packaging bugs from core bugs.
+
+
+# Check whether --with-bug-report-url was given.
+if test "${with_bug_report_url+set}" = set; then :
+  withval=$with_bug_report_url;
+else
+  with_bug_report_url="$PACKAGE_BUGREPORT"
+fi
+
+
+if test "x$with_bug_report_url" = "x"; then
+  with_bug_report_url="$PACKAGE_BUGREPORT"
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define BUG_REPORT_URL "$with_bug_report_url"
+_ACEOF
+
+
+override_bug_report_url=
+if test "x$with_bug_report_url" = "x$PACKAGE_BUGREPORT"; then
+override_bug_report_url="
+NOTE: if you plan on packaging GIMP for distribution, it is recommended
+      to override the bug report URL with option:
+        --with-bug-report-url=https://example.com/
+      so that you can filter packaging bugs from core bugs before
+      reporting upstream.
+"
+fi
+
+#########################
+# Default ICC directory #
+#########################
+
+# This is necessary because some Unix systems may have a different
+# standard path for color profiles. And in particular, sandbox builds
+# might mount the host system at a different root. This is for
+# instance the case of flatpak which mount the host root at /run/host/.
+if test "x$platform_osx" = "xno" &&
+   test "x$platform_win32" = "xno"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking default directory for color profiles" >&5
+$as_echo_n "checking default directory for color profiles... " >&6; }
+
+# Check whether --with-icc-directory was given.
+if test "${with_icc_directory+set}" = set; then :
+  withval=$with_icc_directory;
+else
+  with_icc_directory="/usr/share/color/icc"
+fi
+
+
+  if test "x$with_icc_directory" = "x"; then
+    with_icc_directory="/usr/share/color/icc"
+  fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define COLOR_PROFILE_DIRECTORY "$with_icc_directory"
+_ACEOF
+
+fi
+
 ######################################
 # Checks for gtk-doc and docbook-tools
 ######################################
@ -32554,6 +32881,7 @@ Optional Features:
  Vector icons:            $enable_vector_icons
  Dr. Mingw (Win32):       $enable_drmingw
  Bundled MyPaint Brushes: $enable_bundled_mypaint_brushes (at $mypaint_brushes_dir)
+  Default ICC directory:   $with_icc_directory

 Optional Plug-Ins:
  Ascii Art:               $have_libaa
@ -32563,10 +32891,10 @@ Optional Plug-Ins:
  MNG:                     $have_libmng
  OpenEXR:                 $have_openexr
  WebP:                    $have_webp
+  Heif:                    $have_libheif
  PDF (export):            $have_cairo_pdf
  Print:                   $enable_print
  Python 2:                $enable_python
-  Script-Fu:               $have_script_fu
  TWAIN (Win32):           $os_win32
  Webpage:                 $have_webkit
  WMF:                     $have_libwmf
@ -32582,7 +32910,10 @@ Optional Modules:
 Tests:
  Use xvfb-run             $have_xvfb_run
  Test appdata             $have_appstream_util
-$have_recommended_xgettext$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc"
+  Test desktop file        $have_desktop_file_validate
+
+Bug report URL: $with_bug_report_url
+$override_bug_report_url$have_recommended_xgettext$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc"

 if test "x$required_deps" = "x"; then
  cat >confcache <<\_ACEOF
@ -32786,6 +33117,10 @@ if test -z "${HAVE_WEBP_TRUE}" && test -z "${HAVE_WEBP_FALSE}"; then
  as_fn_error $? "conditional \"HAVE_WEBP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LIBHEIF_TRUE}" && test -z "${HAVE_LIBHEIF_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LIBHEIF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_WEBKIT_TRUE}" && test -z "${HAVE_WEBKIT_FALSE}"; then
  as_fn_error $? "conditional \"HAVE_WEBKIT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -32814,10 +33149,6 @@ if test -z "${BUILD_PYTHON_TRUE}" && test -z "${BUILD_PYTHON_FALSE}"; then
  as_fn_error $? "conditional \"BUILD_PYTHON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_SCRIPT_FU_TRUE}" && test -z "${BUILD_SCRIPT_FU_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SCRIPT_FU\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${PLATFORM_OSX_QUARTZ_TRUE}" && test -z "${PLATFORM_OSX_QUARTZ_FALSE}"; then
  as_fn_error $? "conditional \"PLATFORM_OSX_QUARTZ\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -32846,6 +33177,10 @@ if test -z "${HAVE_APPSTREAM_UTIL_TRUE}" && test -z "${HAVE_APPSTREAM_UTIL_FALSE
  as_fn_error $? "conditional \"HAVE_APPSTREAM_UTIL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_DESKTOP_FILE_VALIDATE_TRUE}" && test -z "${HAVE_DESKTOP_FILE_VALIDATE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_DESKTOP_FILE_VALIDATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -33291,7 +33626,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GIMP $as_me 2.10.0, which was
+This file was extended by GIMP $as_me 2.10.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -33357,7 +33692,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GIMP config.status 2.10.0
+GIMP config.status 2.10.2
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@ -33864,8 +34199,8 @@ fi

  gimp_major_ver=2
  gimp_minor_ver=10
-  gimp_micro_ver=0
-  gimp_ver=2.10.0
+  gimp_micro_ver=2
+  gimp_ver=2.10.2
  gimp_api_ver=2.0