From 366e7e3a5e838f83b04a18db8daaf2724bf3fd9d Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 24 Dec 2014 10:10:14 +0000
Subject: [PATCH] add gobject to Requires: line

vips C and C++ programs can link directly against things in gobject
without appearing to, for example:

	a = VIPS_OBJECT( b );

the macro will expand to include a g_type_check_instance_is_a(). So we
have to have gobject-2.0 in the link line of things like:

	g++ -g -Wall hello8.cc `pkg-config vips-cpp --cflags --libs`

see also

	https://github.com/jcupitt/libvips/issues/196
---
 ChangeLog      | 3 +++
 configure.ac   | 4 ++--
 vips-cpp.pc.in | 2 +-
 vips.pc.in     | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ab79127..248433c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+24/12/14 started 7.42.1
+- add gobject-2.0 to Requires: in vips and vips-cpp .pc files
+
 4/11/14 started 7.42.0
 - better default resolution for png load
 - better pbm (one bit) load, better pfm (float) load/save
diff --git a/configure.ac b/configure.ac
index 32725dcd..85aa29b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-AC_INIT([vips], [7.42.0], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [7.42.1], [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], [7])
 m4_define([vips_minor_version], [42])
-m4_define([vips_micro_version], [0])
+m4_define([vips_micro_version], [1])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
 
diff --git a/vips-cpp.pc.in b/vips-cpp.pc.in
index 5df9baf2..16453a4c 100644
--- a/vips-cpp.pc.in
+++ b/vips-cpp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: vips-cpp
 Description: C++ API for vips8 image processing library
 Version: @VERSION@
-Requires: vips = @VERSION@
+Requires: vips gobject-2.0
 Libs: -L${libdir} -lvips-cpp
diff --git a/vips.pc.in b/vips.pc.in
index 9dbc14b2..ef8d62e8 100644
--- a/vips.pc.in
+++ b/vips.pc.in
@@ -7,6 +7,7 @@ Name: vips
 Description: Image processing library
 Version: @VERSION@
 Requires.private: @PACKAGES_USED@
+Requires: gobject-2.0
 Libs: -L${libdir} -lvips 
 Libs.private: @EXTRA_LIBS_USED@
 Cflags: -I${includedir}