From a8dd8379ac57b170ac6b7f9649f89bf2b1a2baf8 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Mon, 8 Feb 2021 20:20:47 +0000
Subject: [PATCH 1/4] svgload: remove deprecated librsvg include

librsvg >= 2.40.3 includes it for you

librsvg >= 2.51.0 removes it entirely
---
 libvips/foreign/svgload.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libvips/foreign/svgload.c b/libvips/foreign/svgload.c
index fd8eb721..3211967a 100644
--- a/libvips/foreign/svgload.c
+++ b/libvips/foreign/svgload.c
@@ -80,13 +80,6 @@
  */
 #define RSVG_MAX_WIDTH (32767)
 
-/* Old librsvg versions don't include librsvg-features.h by default.
- * Newer versions deprecate direct inclusion.
- */
-#ifndef LIBRSVG_FEATURES_H
-#include <librsvg/librsvg-features.h>
-#endif
-
 /* A handy #define for we-will-handle-svgz.
  */
 #if LIBRSVG_CHECK_FEATURE(SVGZ) && defined(HAVE_ZLIB)

From e1f22095a08f5cdee2abbd23dec4dd154b3d9085 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:07:51 +0000
Subject: [PATCH 2/4] don't put glib includes inside extern "C" blocks

see https://github.com/libvips/libvips/issues/1987
---
 libvips/include/vips/dispatch.h | 3 ++-
 libvips/include/vips/vips.h     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libvips/include/vips/dispatch.h b/libvips/include/vips/dispatch.h
index 457c2cd4..c859e78b 100644
--- a/libvips/include/vips/dispatch.h
+++ b/libvips/include/vips/dispatch.h
@@ -33,11 +33,12 @@
 #ifndef IM_DISPATCH_H
 #define IM_DISPATCH_H
 
+#include <glib-object.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
 
-#include <glib-object.h>
 #include <vips/vips.h>
 #include <vips/util.h>
 
diff --git a/libvips/include/vips/vips.h b/libvips/include/vips/vips.h
index 20d77a43..4c161c43 100644
--- a/libvips/include/vips/vips.h
+++ b/libvips/include/vips/vips.h
@@ -80,10 +80,6 @@
 #ifndef VIPS_VIPS_H
 #define VIPS_VIPS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus*/
-
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gmodule.h>
@@ -93,6 +89,10 @@ extern "C" {
  */
 #include <gio/gio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /*__cplusplus*/
+
 /* If we're being parsed by SWIG, remove gcc attributes.
  */
 #ifdef SWIG

From b30a90e3bc6ed78af79abcc9e644569e95c718cf Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:21:56 +0000
Subject: [PATCH 3/4] fix includes of glib headers in C++

see https://github.com/libvips/libvips/issues/1987
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index a23f7114..f502c7df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 - revise ppmload, fixing a couple of small bugs
 - signal error on EOF in jpegload more reliably [bozaro]
 - better error detection in spngload [randy408]
+- fix includes of glib headers in C++ [lovell]
 
 18/12/20 started 8.10.5
 - fix potential /0 in animated webp load [lovell]

From 75959ece6a1f257dc60a881e83478fce8962c72b Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:23:13 +0000
Subject: [PATCH 4/4] note librsvg change

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f502c7df..c02d3a47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 - signal error on EOF in jpegload more reliably [bozaro]
 - better error detection in spngload [randy408]
 - fix includes of glib headers in C++ [lovell]
+- fix build with more modern librsvg [lovell]
 
 18/12/20 started 8.10.5
 - fix potential /0 in animated webp load [lovell]