diff --git a/libmypaint-1.3.0-gegl04.patch b/libmypaint-1.3.0-gegl04.patch
deleted file mode 100644
index 18ec736..0000000
--- a/libmypaint-1.3.0-gegl04.patch
+++ /dev/null
@@ -1,1090 +0,0 @@
-diff -up libmypaint-1.3.0/configure.ac.gegl04 libmypaint-1.3.0/configure.ac
---- libmypaint-1.3.0/configure.ac.gegl04	2018-05-02 13:55:18.298317757 +0200
-+++ libmypaint-1.3.0/configure.ac	2018-05-02 13:57:51.382240488 +0200
-@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
-           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
- 
- # Dependencies.
--m4_define([gegl_required_version], [0.3])
-+m4_define([gegl_required_version], [0.4])
- m4_define([introspection_required_version], [1.32.0])
- 
- AC_INIT([libmypaint],
-@@ -312,7 +312,7 @@ AC_ARG_ENABLE(gegl,
- )
- 
- if eval "test x$enable_gegl = xyes"; then
--  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
-+  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
- fi
- AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
- 
-diff -up libmypaint-1.3.0/configure.gegl04 libmypaint-1.3.0/configure
---- libmypaint-1.3.0/configure.gegl04	2018-05-02 13:55:18.294317759 +0200
-+++ libmypaint-1.3.0/configure	2018-05-02 13:58:45.983212928 +0200
-@@ -15387,12 +15387,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.3 >= 0.3\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4") 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.3 >= 0.3" 2>/dev/null`
-+  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= 0.4" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -15404,12 +15404,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.3 >= 0.3\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= 0.3") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= 0.4\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= 0.4") 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.3 >= 0.3" 2>/dev/null`
-+  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= 0.4" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -15430,14 +15430,14 @@ 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.3 >= 0.3" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= 0.4" 2>&1`
-         else
--	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= 0.3" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= 0.4" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GEGL_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (gegl-0.3 >= 0.3) were not met:
-+	as_fn_error $? "Package requirements (gegl-0.4 >= 0.4) were not met:
- 
- $GEGL_PKG_ERRORS
- 
-diff -up libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in.gegl04 libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in
---- libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in.gegl04	2018-05-02 13:55:18.288317762 +0200
-+++ libmypaint-1.3.0/gegl/libmypaint-gegl.pc.in	2018-05-02 13:56:20.011286608 +0200
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libmypaint
- Description: MyPaint brush engine library, with GEGL integration.
- Version: @LIBMYPAINT_VERSION@
--Requires: gegl-0.3 libmypaint
-+Requires: gegl-0.4 libmypaint
- Cflags: -I${includedir}/libmypaint-gegl
- Libs: -L${libdir} -lmypaint-gegl
-diff -up libmypaint-1.3.0/gegl/Makefile.am.gegl04 libmypaint-1.3.0/gegl/Makefile.am
---- libmypaint-1.3.0/gegl/Makefile.am.gegl04	2018-05-02 13:55:18.281317765 +0200
-+++ libmypaint-1.3.0/gegl/Makefile.am	2018-05-02 13:59:22.211194642 +0200
-@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ARGS = \
-     --warn-all \
--    --pkg="gegl-0.3" \
-+    --pkg="gegl-0.4" \
-     --pkg="glib-2.0" \
-     --namespace="MyPaintGegl" \
-     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
-@@ -38,7 +38,7 @@ introspection_sources = \
- 	mypaint-gegl-surface.c
- 
- MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
--MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
-+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
-diff -up libmypaint-1.3.0/gegl/Makefile.in.gegl04 libmypaint-1.3.0/gegl/Makefile.in
---- libmypaint-1.3.0/gegl/Makefile.in.gegl04	2018-05-02 13:55:18.285317763 +0200
-+++ libmypaint-1.3.0/gegl/Makefile.in	2018-05-02 13:59:11.535200030 +0200
-@@ -416,7 +416,7 @@ top_srcdir = @top_srcdir@
- @ENABLE_GEGL_TRUE@INTROSPECTION_GIRS = $(am__append_1)
- @ENABLE_GEGL_TRUE@INTROSPECTION_SCANNER_ARGS = \
- @ENABLE_GEGL_TRUE@    --warn-all \
--@ENABLE_GEGL_TRUE@    --pkg="gegl-0.3" \
-+@ENABLE_GEGL_TRUE@    --pkg="gegl-0.4" \
- @ENABLE_GEGL_TRUE@    --pkg="glib-2.0" \
- @ENABLE_GEGL_TRUE@    --namespace="MyPaintGegl" \
- @ENABLE_GEGL_TRUE@    --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
-@@ -441,7 +441,7 @@ top_srcdir = @top_srcdir@
- @ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@	../glib/mypaint-gegl-glib.c	\
- @ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@	mypaint-gegl-surface.c
- 
--@ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
-+@ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
- @ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
- @ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
- @ENABLE_GEGL_TRUE@@HAVE_INTROSPECTION_TRUE@MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
-diff -ur libmypaint-1.3.0/aclocal.m4.gegl04 libmypaint-1.3.0/aclocal.m4
---- libmypaint-1.3.0/aclocal.m4.gegl04	2016-12-02 00:18:14.000000000 +0100
-+++ libmypaint-1.3.0/aclocal.m4	2018-05-02 14:04:44.122033228 +0200
-@@ -1,6 +1,6 @@
--# generated automatically by aclocal 1.15 -*- Autoconf -*-
-+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
- 
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
- 
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -47,7 +47,10 @@
- #
- # Modified to require ngettext
- # Matthias Clasen <mclasen@redhat.com> 08/06/2004
--#
-+
-+# Increment this whenever this file is changed.
-+#serial 1
-+
- # We need this here as well, since someone might use autoconf-2.5x
- # to configure GLib then an older version to configure a package
- # using AM_GLIB_GNU_GETTEXT
-@@ -119,6 +122,51 @@
- AC_SUBST($1)dnl
- ])
- 
-+dnl Checks for special options needed on Mac OS X.
-+dnl Defines INTL_MACOSX_LIBS.
-+dnl
-+dnl Copied from intlmacosx.m4 in gettext, GPL.
-+dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
-+glib_DEFUN([glib_gt_INTL_MACOSX],
-+[
-+  dnl Check for API introduced in Mac OS X 10.2.
-+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-+    [gt_cv_func_CFPreferencesCopyAppValue],
-+    [gt_save_LIBS="$LIBS"
-+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+     AC_LINK_IFELSE(
-+       [AC_LANG_PROGRAM(
-+          [[#include <CoreFoundation/CFPreferences.h>]],
-+          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-+       [gt_cv_func_CFPreferencesCopyAppValue=no])
-+     LIBS="$gt_save_LIBS"])
-+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-+  fi
-+  dnl Check for API introduced in Mac OS X 10.3.
-+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-+    [gt_save_LIBS="$LIBS"
-+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+     AC_LINK_IFELSE(
-+       [AC_LANG_PROGRAM(
-+          [[#include <CoreFoundation/CFLocale.h>]],
-+          [[CFLocaleCopyCurrent();]])],
-+       [gt_cv_func_CFLocaleCopyCurrent=yes],
-+       [gt_cv_func_CFLocaleCopyCurrent=no])
-+     LIBS="$gt_save_LIBS"])
-+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-+      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-+  fi
-+  INTL_MACOSX_LIBS=
-+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-+  fi
-+  AC_SUBST([INTL_MACOSX_LIBS])
-+])
-+
- # GLIB_WITH_NLS
- #-----------------
- glib_DEFUN([GLIB_WITH_NLS],
-@@ -132,6 +180,8 @@
-     XGETTEXT=:
-     INTLLIBS=
- 
-+    glib_gt_INTL_MACOSX
-+
-     AC_CHECK_HEADER(libintl.h,
-      [gt_cv_func_dgettext_libintl="no"
-       libintl_extra_libs=""
-@@ -215,7 +265,7 @@
-       fi
-   
-       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
--        INTLLIBS="-lintl $libintl_extra_libs"
-+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
-       fi
-   
-       if test "$gt_cv_have_gettext" = "yes"; then
-@@ -1371,6 +1421,7 @@
-     cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # Generated automatically by $as_me ($PACKAGE) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- 
- # Provide generalized library-building support services.
-@@ -3507,6 +3558,9 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # Ideally, we could use ldconfig to report *all* directores which are
-   # searched for libraries, however this is still not possible.  Aside from not
-   # being certain /sbin/ldconfig is available, command
-@@ -3515,7 +3569,7 @@
-   # appending ld.so.conf contents (and includes) to the search path.
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3527,18 +3581,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -4198,7 +4240,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -5076,7 +5118,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd* | netbsdelf*-gnu)
-+      netbsd*)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -5588,9 +5630,6 @@
-       ;;
-     esac
-     ;;
--  linux* | k*bsd*-gnu | gnu*)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--    ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-     ;;
-@@ -5653,9 +5692,6 @@
-   openbsd* | bitrig*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu | gnu*)
--    _LT_TAGVAR(link_all_deplibs, $1)=no
--    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5910,7 +5946,7 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -6431,7 +6467,6 @@
- 	if test yes = "$lt_cv_irix_exported_symbol"; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
- 	fi
--	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-@@ -6453,7 +6488,7 @@
-       esac
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -9727,9 +9762,9 @@
-   AC_SUBST([USE_NLS])
- ])
- 
--dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
--dnl serial 11 (pkg-config-0.29)
--dnl
-+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-+# serial 11 (pkg-config-0.29.1)
-+
- dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
- dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
- dnl
-@@ -9770,7 +9805,7 @@
- dnl See the "Since" comment for each macro you use to see what version
- dnl of the macros you require.
- m4_defun([PKG_PREREQ],
--[m4_define([PKG_MACROS_VERSION], [0.29])
-+[m4_define([PKG_MACROS_VERSION], [0.29.1])
- m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
- ])dnl PKG_PREREQ
-@@ -10003,7 +10038,75 @@
- AS_VAR_IF([$1], [""], [$5], [$4])dnl
- ])dnl PKG_CHECK_VAR
- 
--# Copyright (C) 2002-2014 Free Software Foundation, Inc.
-+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-+dnl   [DESCRIPTION], [DEFAULT])
-+dnl ------------------------------------------
-+dnl
-+dnl Prepare a "--with-" configure option using the lowercase
-+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
-+dnl PKG_CHECK_MODULES in a single macro.
-+AC_DEFUN([PKG_WITH_MODULES],
-+[
-+m4_pushdef([with_arg], m4_tolower([$1]))
-+
-+m4_pushdef([description],
-+           [m4_default([$5], [build with ]with_arg[ support])])
-+
-+m4_pushdef([def_arg], [m4_default([$6], [auto])])
-+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-+
-+m4_case(def_arg,
-+            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
-+            [m4_pushdef([with_without],[--with-]with_arg)])
-+
-+AC_ARG_WITH(with_arg,
-+     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
-+    [AS_TR_SH([with_]with_arg)=def_arg])
-+
-+AS_CASE([$AS_TR_SH([with_]with_arg)],
-+            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
-+            [auto],[PKG_CHECK_MODULES([$1],[$2],
-+                                        [m4_n([def_action_if_found]) $3],
-+                                        [m4_n([def_action_if_not_found]) $4])])
-+
-+m4_popdef([with_arg])
-+m4_popdef([description])
-+m4_popdef([def_arg])
-+
-+])dnl PKG_WITH_MODULES
-+
-+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-+dnl   [DESCRIPTION], [DEFAULT])
-+dnl -----------------------------------------------
-+dnl
-+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
-+dnl check._[VARIABLE-PREFIX] is exported as make variable.
-+AC_DEFUN([PKG_HAVE_WITH_MODULES],
-+[
-+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-+
-+AM_CONDITIONAL([HAVE_][$1],
-+               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-+])dnl PKG_HAVE_WITH_MODULES
-+
-+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-+dnl   [DESCRIPTION], [DEFAULT])
-+dnl ------------------------------------------------------
-+dnl
-+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
-+dnl and preprocessor variable.
-+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-+[
-+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-+
-+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
-+        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-+])dnl PKG_HAVE_DEFINE_WITH_MODULES
-+
-+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10018,7 +10121,7 @@
- [am__api_version='1.15'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.15], [],
-+m4_if([$1], [1.15.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -10034,12 +10137,12 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.15])dnl
-+[AM_AUTOMAKE_VERSION([1.15.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
- 
--# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10101,7 +10204,7 @@
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10153,7 +10256,7 @@
- 
- # AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10184,7 +10287,7 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10375,7 +10478,7 @@
- 
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10451,7 +10554,7 @@
- 
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10648,7 +10751,7 @@
- done
- echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10669,7 +10772,7 @@
- fi
- AC_SUBST([install_sh])])
- 
--# Copyright (C) 2003-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10691,7 +10794,7 @@
- # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
- # From Jim Meyering
- 
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10726,7 +10829,7 @@
- 
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10776,7 +10879,7 @@
- 
- # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10815,7 +10918,7 @@
- 
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10844,7 +10947,7 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--# Copyright (C) 1999-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10891,7 +10994,7 @@
- # For backward compatibility.
- AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10910,7 +11013,7 @@
- 
- # Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -10991,7 +11094,7 @@
- rm -f conftest.file
- ])
- 
--# Copyright (C) 2009-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -11051,7 +11154,7 @@
- _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
- ])
- 
--# Copyright (C) 2001-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -11079,7 +11182,7 @@
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# Copyright (C) 2006-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -11098,7 +11201,7 @@
- 
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
--# Copyright (C) 2004-2014 Free Software Foundation, Inc.
-+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-Only in libmypaint-1.3.0: autom4te.cache
-Only in libmypaint-1.3.0: autom4te.cache
-diff -ur libmypaint-1.3.0/config.h.in.gegl04 libmypaint-1.3.0/config.h.in
---- libmypaint-1.3.0/config.h.in.gegl04	2016-12-02 00:18:15.000000000 +0100
-+++ libmypaint-1.3.0/config.h.in	2018-05-02 14:08:45.000000000 +0200
-@@ -21,6 +21,14 @@
- /* Define to 1 if you have the `bind_textdomain_codeset' function. */
- #undef HAVE_BIND_TEXTDOMAIN_CODESET
- 
-+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-+   CoreFoundation framework. */
-+#undef HAVE_CFLOCALECOPYCURRENT
-+
-+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
-+   the CoreFoundation framework. */
-+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-+
- /* Define to 1 if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
- 
-Only in libmypaint-1.3.0: config.h.in~
-diff -ur libmypaint-1.3.0/configure.gegl04 libmypaint-1.3.0/configure
---- libmypaint-1.3.0/configure.gegl04	2018-05-02 14:08:23.829926504 +0200
-+++ libmypaint-1.3.0/configure	2018-05-02 14:08:45.134916155 +0200
-@@ -668,6 +668,7 @@
- CATOBJEXT
- CATALOGS
- MSGFMT_OPTS
-+INTL_MACOSX_LIBS
- ALL_LINGUAS
- INTLTOOL_PERL
- GMSGFMT
-@@ -834,7 +835,6 @@
- docdir
- oldincludedir
- includedir
--runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -938,7 +938,6 @@
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -1191,15 +1190,6 @@
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
- 
--  -runstatedir | --runstatedir | --runstatedi | --runstated \
--  | --runstate | --runstat | --runsta | --runst | --runs \
--  | --run | --ru | --r)
--    ac_prev=runstatedir ;;
--  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
--  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
--  | --run=* | --ru=* | --r=*)
--    runstatedir=$ac_optarg ;;
--
-   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -1337,7 +1327,7 @@
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
--		libdir localedir mandir runstatedir
-+		libdir localedir mandir
- do
-   eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-@@ -1490,7 +1480,6 @@
-   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
--  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
-   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-@@ -5708,7 +5697,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
-+netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -9690,9 +9679,6 @@
-   openbsd* | bitrig*)
-     with_gnu_ld=no
-     ;;
--  linux* | k*bsd*-gnu | gnu*)
--    link_all_deplibs=no
--    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -9947,7 +9933,7 @@
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -10617,7 +10603,6 @@
- 	if test yes = "$lt_cv_irix_exported_symbol"; then
-           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
- 	fi
--	link_all_deplibs=no
-       else
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
- 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-@@ -10639,7 +10624,7 @@
-       esac
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
-+    netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -11734,6 +11719,9 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # Ideally, we could use ldconfig to report *all* directores which are
-   # searched for libraries, however this is still not possible.  Aside from not
-   # being certain /sbin/ldconfig is available, command
-@@ -11742,7 +11730,7 @@
-   # appending ld.so.conf contents (and includes) to the search path.
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11754,18 +11742,6 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--netbsdelf*-gnu)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  dynamic_linker='NetBSD ld.elf_so'
--  ;;
--
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14434,6 +14410,82 @@
-     XGETTEXT=:
-     INTLLIBS=
- 
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  gt_save_LIBS="$LIBS"
-+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <CoreFoundation/CFPreferences.h>
-+int
-+main ()
-+{
-+CFPreferencesCopyAppValue(NULL, NULL)
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gt_cv_func_CFPreferencesCopyAppValue=yes
-+else
-+  gt_cv_func_CFPreferencesCopyAppValue=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LIBS="$gt_save_LIBS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
-+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-+
-+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
-+
-+  fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  gt_save_LIBS="$LIBS"
-+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <CoreFoundation/CFLocale.h>
-+int
-+main ()
-+{
-+CFLocaleCopyCurrent();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gt_cv_func_CFLocaleCopyCurrent=yes
-+else
-+  gt_cv_func_CFLocaleCopyCurrent=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LIBS="$gt_save_LIBS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+
-+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-+
-+  fi
-+  INTL_MACOSX_LIBS=
-+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-+  fi
-+
-+
-+
-     ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
- if test "x$ac_cv_header_libintl_h" = xyes; then :
-   gt_cv_func_dgettext_libintl="no"
-@@ -14774,7 +14826,7 @@
-       fi
- 
-       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
--        INTLLIBS="-lintl $libintl_extra_libs"
-+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
-       fi
- 
-       if test "$gt_cv_have_gettext" = "yes"; then
-@@ -17262,6 +17314,7 @@
-     cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # Generated automatically by $as_me ($PACKAGE) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- 
- # Provide generalized library-building support services.
-diff -ur libmypaint-1.3.0/doc/Makefile.in.gegl04 libmypaint-1.3.0/doc/Makefile.in
---- libmypaint-1.3.0/doc/Makefile.in.gegl04	2016-12-02 00:18:16.000000000 +0100
-+++ libmypaint-1.3.0/doc/Makefile.in	2018-05-02 14:08:45.800915832 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -176,6 +176,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -293,7 +294,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff -ur libmypaint-1.3.0/gegl/Makefile.in.gegl04 libmypaint-1.3.0/gegl/Makefile.in
---- libmypaint-1.3.0/gegl/Makefile.in.gegl04	2018-05-02 14:08:23.830926504 +0200
-+++ libmypaint-1.3.0/gegl/Makefile.in	2018-05-02 14:08:45.831915817 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -281,6 +281,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -398,7 +399,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff -ur libmypaint-1.3.0/m4macros/Makefile.in.gegl04 libmypaint-1.3.0/m4macros/Makefile.in
---- libmypaint-1.3.0/m4macros/Makefile.in.gegl04	2016-12-02 00:18:16.000000000 +0100
-+++ libmypaint-1.3.0/m4macros/Makefile.in	2018-05-02 14:08:45.846915810 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -176,6 +176,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -293,7 +294,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff -ur libmypaint-1.3.0/Makefile.in.gegl04 libmypaint-1.3.0/Makefile.in
---- libmypaint-1.3.0/Makefile.in.gegl04	2016-12-02 00:18:16.000000000 +0100
-+++ libmypaint-1.3.0/Makefile.in	2018-05-02 14:08:45.784915840 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -340,6 +340,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -457,7 +458,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -995,7 +995,7 @@
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- 	|| chmod -R a+r "$(distdir)"
- dist-gzip: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
- 	$(am__post_remove_distdir)
- 
- dist-bzip2: distdir
-@@ -1020,7 +1020,7 @@
- 	@echo WARNING: "Support for shar distribution archives is" \
- 	               "deprecated." >&2
- 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
--	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
- 	$(am__post_remove_distdir)
- 
- dist-zip: distdir
-@@ -1038,7 +1038,7 @@
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lz*) \
-@@ -1048,7 +1048,7 @@
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-diff -ur libmypaint-1.3.0/tests/gegl/Makefile.in.gegl04 libmypaint-1.3.0/tests/gegl/Makefile.in
---- libmypaint-1.3.0/tests/gegl/Makefile.in.gegl04	2016-12-02 00:18:16.000000000 +0100
-+++ libmypaint-1.3.0/tests/gegl/Makefile.in	2018-05-02 14:08:45.916915776 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -445,6 +445,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -562,7 +563,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff -ur libmypaint-1.3.0/tests/Makefile.in.gegl04 libmypaint-1.3.0/tests/Makefile.in
---- libmypaint-1.3.0/tests/Makefile.in.gegl04	2016-12-02 00:18:16.000000000 +0100
-+++ libmypaint-1.3.0/tests/Makefile.in	2018-05-02 14:08:45.888915789 +0200
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.15.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -520,6 +520,7 @@
- INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
- INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
- INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
- INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
- INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-@@ -637,7 +638,6 @@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
diff --git a/libmypaint-1.3.0.tar.xz b/libmypaint-1.3.0.tar.xz
deleted file mode 100644
index 484dc38..0000000
Binary files a/libmypaint-1.3.0.tar.xz and /dev/null differ
diff --git a/libmypaint-1.6.1.tar.xz b/libmypaint-1.6.1.tar.xz
new file mode 100644
index 0000000..5e674a3
Binary files /dev/null and b/libmypaint-1.6.1.tar.xz differ
diff --git a/libmypaint.spec b/libmypaint.spec
index c56b22d..49d4c01 100644
--- a/libmypaint.spec
+++ b/libmypaint.spec
@@ -1,14 +1,13 @@
 Name:          libmypaint
-Version:       1.3.0
-Release:       10
+Version:       1.6.1
+Release:       1
 Summary:       Rush library used by MyPaint
 License:       ISC
 URL:           https://github.com/mypaint/libmypaint
 Source0:       https://github.com/mypaint/libmypaint/releases/download/v%{version}/libmypaint-%{version}.tar.xz
-Patch0:        libmypaint-1.3.0-gegl04.patch
 
-BuildRequires: babl-devel, breathe, doxygen, gegl04-devel, glib2-devel, gobject-introspection-devel
-BuildRequires: intltool, json-c-devel, python-sphinx
+BuildRequires: babl-devel gcc doxygen glib2-devel gobject-introspection-devel
+BuildRequires: intltool json-c-devel python3-breathe python3-sphinx
 Conflicts:     mypaint < 1.3.0
 
 %description
@@ -23,9 +22,10 @@ This package includes development files for %{name}.
 
 %prep
 %autosetup -p1
+sed -i -e 's/python -c/python3 -c/g' configure
 
 %build
-%configure --enable-docs --enable-introspection=yes --enable-gegl
+%configure --enable-docs --enable-introspection=yes --disable-gegl
 %make_build
 
 %install
@@ -40,8 +40,7 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -print
 %doc README.md
 %{_libdir}/*.so.*
 %dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/MyPaint-1.3.typelib
-%{_libdir}/girepository-1.0/MyPaintGegl-1.3.typelib
+%{_libdir}/girepository-1.0/MyPaint-1.6.typelib
 
 %files devel
 %doc doc/build/*
@@ -49,9 +48,12 @@ find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete -print
 %{_includedir}/%{name}*
 %{_libdir}/pkgconfig/*.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/MyPaint*-1.3.gir
+%{_datadir}/gir-1.0/MyPaint*-1.6.gir
 
 %changelog
+* Tue Aug 11 2020 lingsheng <lingsheng@huawei.com> - 1.6.1-1
+- Update to 1.6.1
+
 * Fri Dec 13 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.3.0-10
 - Package init