From d4bd8c4c0b2ef4c9ae253e09102ab074ba27ce5c Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 16 Sep 2019 16:59:52 +0100
Subject: [PATCH 1/3] fix make dist for 8.8.3

---
 configure.ac                        | 1 +
 libvips/colour/Makefile.am          | 3 ++-
 libvips/colour/profiles/Makefile.am | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 libvips/colour/profiles/Makefile.am

diff --git a/configure.ac b/configure.ac
index 19e87735..9ff10adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1324,6 +1324,7 @@ AC_OUTPUT([
 	libvips/Makefile 
 	libvips/arithmetic/Makefile 
 	libvips/colour/Makefile 
+	libvips/colour/profiles/Makefile 
 	libvips/conversion/Makefile 
 	libvips/convolution/Makefile 
 	libvips/deprecated/Makefile 
diff --git a/libvips/colour/Makefile.am b/libvips/colour/Makefile.am
index 52a4f594..b8ced977 100644
--- a/libvips/colour/Makefile.am
+++ b/libvips/colour/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LTLIBRARIES = libcolour.la
 
+SUBDIRS = profiles
+
 libcolour_la_SOURCES = \
 	profiles.c \
 	profiles.h \
@@ -42,7 +44,6 @@ profiles.c:
 	./wrap-profiles.sh profiles profiles.c
 
 EXTRA_DIST = \
-	profiles \
 	wrap-profiles.sh
 
 AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ 
diff --git a/libvips/colour/profiles/Makefile.am b/libvips/colour/profiles/Makefile.am
new file mode 100644
index 00000000..fc8f9734
--- /dev/null
+++ b/libvips/colour/profiles/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = \
+	cmyk.icm \
+	sRGB.icm

From f2319da762186c00056899f17664ea6607dfadda Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 17 Sep 2019 16:26:23 +0100
Subject: [PATCH 2/3] remove svg test from test_formats.sh

It was very unreliable -- the output of librsvg varies too much between
librsvg versions.

This is still tested by the Python test suite.
---
 test/test_formats.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/test_formats.sh b/test/test_formats.sh
index 60a4cccc..80cc0f15 100755
--- a/test/test_formats.sh
+++ b/test/test_formats.sh
@@ -12,10 +12,6 @@ set -e
 poppler=$test_images/blankpage.pdf
 poppler_ref=$test_images/blankpage.pdf.png
 
-# rsvg / svgload reference image
-rsvg=$test_images/blankpage.svg
-rsvg_ref=$test_images/blankpage.svg.png
-
 # giflib / gifload reference image
 giflib=$test_images/trans-x.gif
 giflib_ref=$test_images/trans-x.png
@@ -234,10 +230,7 @@ if test_supported pdfload; then
 	test_loader $poppler_ref $poppler pdfload 0
 fi
 
-if test_supported svgload; then
-	# librsvg can give small differences on some platforms
-	test_loader $rsvg_ref $rsvg svgload 10
-fi
+# don't test SVG --- the output varies too much between librsvg versions
 
 if test_supported gifload; then
 	test_loader $giflib_ref $giflib gifload 0

From c9a7b92eebdb628c54a27b0a7e56c21991c8b987 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 17 Sep 2019 17:16:26 +0100
Subject: [PATCH 3/3] version bump

---
 ChangeLog    | 2 ++
 configure.ac | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9e05a6f..778e5f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+17/9/19 started 8.8.4
+
 31/8/19 started 8.8.3
 - revert sharpen restoring the input colourspace
 - xres/yres tiffsave params were in pixels/cm [f--f]
diff --git a/configure.ac b/configure.ac
index 9ff10adc..6d43b009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-AC_INIT([vips], [8.8.3], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [8.8.4], [vipsip@jiscmail.ac.uk])
 # required for gobject-introspection
 AC_PREREQ(2.62)
 
@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # user-visible library versioning
 m4_define([vips_major_version], [8])
 m4_define([vips_minor_version], [8])
-m4_define([vips_micro_version], [3])
+m4_define([vips_micro_version], [4])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
 
@@ -38,7 +38,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog`
 #   binary interface changes not backwards compatible?: reset age to 0
 
 LIBRARY_CURRENT=53
-LIBRARY_REVISION=2
+LIBRARY_REVISION=3
 LIBRARY_AGE=11
 
 # patched into include/vips/version.h