From 3fa4f8a72b37ce6a0b5c87d71805f4734b627493 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Fri, 4 Oct 2024 12:33:06 +0100
Subject: [PATCH 1/2] Revert "Use release version for C++ shared library
 SONAME"

This reverts commit 13ceb78db12ae2fd48796655d85815d5d637fcd6.
---
 cplusplus/meson.build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cplusplus/meson.build b/cplusplus/meson.build
index 1d7758dfaf..a47ad6ccf4 100644
--- a/cplusplus/meson.build
+++ b/cplusplus/meson.build
@@ -8,9 +8,8 @@ libvips_cpp_lib = library('vips-cpp',
     'VError.cpp',
     dependencies: libvips_dep,
     include_directories: libvips_cpp_includedir,
-    version: meson.project_version(),
-    darwin_versions: meson.project_version(),
-    soversion: (library_current - library_age).to_string() + '.' + meson.project_version(),
+    version: library_version,
+    darwin_versions: darwin_versions,
     gnu_symbol_visibility: 'hidden',
     install: true,
 )

From 9721dd3b68c17fcc5b8c9dc1551d2c2cddbc94a1 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 5 Oct 2024 12:22:41 +0100
Subject: [PATCH 2/2] version bump

fixing the C++ soname issue
---
 ChangeLog   | 4 ++++
 meson.build | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62228cc574..717dbb7f89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+4/10/24 8.15.5
+
+- version bump, revise C++ soname
+
 3/10/24 8.15.4
 
 - fix an off-by-one error in vips__token_get()
diff --git a/meson.build b/meson.build
index 70270fa81e..f3a7294d72 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('vips', 'c', 'cpp',
-    version: '8.15.4',
+    version: '8.15.5',
     meson_version: '>=0.55',
     default_options: [
         # this is what glib uses (one of our required deps), so we use it too
@@ -23,7 +23,7 @@ version_patch = version_parts[2]
 # binary interface changed: increment current, reset revision to 0
 #   binary interface changes backwards compatible?: increment age
 #   binary interface changes not backwards compatible?: reset age to 0
-library_revision = 4
+library_revision = 5
 library_current = 59
 library_age = 17
 library_version = '@0@.@1@.@2@'.format(library_current - library_age, library_age, library_revision)