From 94503c1aca456b3aa728a11294c2a788eef628d2 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 6 Mar 2021 12:47:31 +0000
Subject: [PATCH 1/3] update for newer pandoc

"smart" extension is no longer supported for docbook
---
 doc/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 311dd4b8..dab77490 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -127,7 +127,7 @@ HTML_IMAGES = \
 # we have some files in markdown ... convert to docbook for gtk-doc
 # pandoc makes section headers, we want refsect3 for gtk-doc
 .md.xml:
-	pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook-smart -o $@ $<
+	pandoc -s --template="$(realpath pandoc-docbook-template.docbook)" --wrap=none -V title="$<" -f markdown+smart -t docbook -o $@ $<
 	sed -e s/section/refsect3/g < $@ > x && mv x $@
 
 # Our markdown source files

From ec16c761df0256026aaf4e05fef36b2c25e7a7f9 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 6 Mar 2021 12:56:35 +0000
Subject: [PATCH 2/3] revise changelog for clarity

---
 ChangeLog | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88717fe8..fc2821d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
 22/12/20 start 8.10.6
 - don't seek on bad file descriptors [kleisauke]
 - check for null memory sources [kleisauke]
-- revise ppmload, fixing a couple of small bugs
-- signal error on EOF in jpegload more reliably [bozaro]
-- better error detection in spngload [randy408]
+- improve ppmload, fixing a couple of small bugs
+- improve EOF detection in jpegload [bozaro]
+- improve error detection in spngload [randy408]
 - fix includes of glib headers in C++ [lovell]
 - fix build with more modern librsvg [lovell]
 - fix a possible segv with very wide images [f1ac]
-- revise premultiply, again [jjonesrs]
-- revise profile handling in vipsthumbnail
+- fix issue thumbnailing RGBA images in linear mode [jjonesrs]
+- improve vipsthumbnail profile handling
 - fix tiff deflate predictor setting [Adios]
 
 18/12/20 started 8.10.5

From 6666b941bfb8102d3038e369b63da17afe07fc06 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 6 Mar 2021 13:33:00 +0000
Subject: [PATCH 3/3] fix a ref leak in vipsthumbnail

from the previous refactoring
---
 libvips/resample/thumbnail.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libvips/resample/thumbnail.c b/libvips/resample/thumbnail.c
index 40826a43..a2a395b6 100644
--- a/libvips/resample/thumbnail.c
+++ b/libvips/resample/thumbnail.c
@@ -879,13 +879,13 @@ vips_thumbnail_build( VipsObject *object )
 				thumbnail->export_profile ); 
 			if( vips_colourspace( in, &t[7], 
 				VIPS_INTERPRETATION_XYZ, NULL ) || 
-				vips_icc_export( t[7], &t[8], 
+				vips_icc_export( t[7], &t[10], 
 					"output_profile", 
 						thumbnail->export_profile,
 					"intent", thumbnail->intent,
 					NULL ) )  
 				return( -1 ); 
-			in = t[8];
+			in = t[10];
 		}
 	}
 	else if( thumbnail->linear ) {