From 4d71825fde2a85f6b59884b86bf800a8aeccd343 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 18 Mar 2018 17:27:15 -0700
Subject: [PATCH] cairo: Increment version.

---
 src/cairo/NEWS             |  6 ++++++
 src/cairo/cairo.pkg        | 16 +++++++++++++---
 src/cairo/cairo.texi       |  8 ++++++++
 src/cairo/configure.ac     |  2 +-
 src/cairo/debian/changelog |  7 +++++++
 src/cairo/make.scm         |  2 +-
 6 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/cairo/NEWS b/src/cairo/NEWS
index 0a802d8aa..0dc8a1cf9 100644
--- a/src/cairo/NEWS
+++ b/src/cairo/NEWS
@@ -19,6 +19,12 @@ You should have received a copy of the GNU General Public License
 along with this plugin; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+mit-scheme-pucked-cairo 0.6 - Matt Birkholz, 2018-03-16
+=======================================================
+
+Bindings should now be found in the (cairo) package; they are not
+exported to the global package.
+
 mit-scheme-pucked-cairo 0.5 - Matt Birkholz, 2016-06-12
 =======================================================
 
diff --git a/src/cairo/cairo.pkg b/src/cairo/cairo.pkg
index 83cc46910..fedd620b4 100644
--- a/src/cairo/cairo.pkg
+++ b/src/cairo/cairo.pkg
@@ -29,11 +29,21 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 (global-definitions pango/)
 
 (define-package (cairo)
-  (parent (glib))
+  (parent ()))
+
+(define-package (cairo internal)
+  (parent (cairo))
   (files "cairo")
+  (import (glib)
+	  add-glib-cleanup
+	  assert-without-interruption
+	  execute-glib-cleanup
+	  gobject-alien)
   (import (pango)
+	  ->color color-red color-green color-blue color-alpha
+	  guarantee-color
 	  guarantee-pango-layout)
-  (export ()
+  (export (cairo)
 	  cairo-image-surface-create
 	  cairo-surface-destroy
 	  cairo-surface-write-to-png
@@ -72,7 +82,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  cairo-matrix))
 
 (define-package (cairo graphics)
-  (parent (cairo))
+  (parent (cairo internal))
   (files "cairo-graphics")
   (export ()
 	  cairo-graphics/set-background-color
diff --git a/src/cairo/cairo.texi b/src/cairo/cairo.texi
index b464c318e..ddb55d87c 100644
--- a/src/cairo/cairo.texi
+++ b/src/cairo/cairo.texi
@@ -82,6 +82,14 @@ collector.  When Scheme's representative of a toolkit resource is
 dropped and collected, the toolkit resource is freed, just as the
 C/Unix FFI's malloced aliens are automatically freed.
 
+The Cairo library is thread-safe assuming threads do not operate
+simultaneously on the same objects (contexts, patterns, surfaces).
+@emph{Implicit} global state is protected by mutexes.  Some Cairo
+procedures involve GLib objects like PangoLayouts, which should
+@emph{not} be used unless GLib is locked, else many warning lines will
+be written to stderr.
+@xref{with-glib-lock, , , glib, GLib Plugin Manual}.
+
 @node API Reference, GNU Free Documentation License, Introduction, Top
 @chapter API Reference
 
diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index 5cf8d7a96..f39db3a67 100644
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
 AC_INIT([MIT/GNU Scheme Pucked cairo plugin],
-        [0.5],
+        [0.6],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-cairo])
 AC_CONFIG_SRCDIR([cairo.pkg])
diff --git a/src/cairo/debian/changelog b/src/cairo/debian/changelog
index 4edc4c070..45ad43e72 100644
--- a/src/cairo/debian/changelog
+++ b/src/cairo/debian/changelog
@@ -1,3 +1,10 @@
+mit-scheme-pucked-cairo (0.6) birchwood; urgency=low
+
+  * Bindings should now be found in the (cairo) package; they are not
+    exported to the global package.
+
+ -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 16 Mar 2018 00:00:00 -0700
+
 mit-scheme-pucked-cairo (0.5) birchwood; urgency=low
 
   * Initial Debianization.
diff --git a/src/cairo/make.scm b/src/cairo/make.scm
index f3dbadcaf..9380a7d1c 100644
--- a/src/cairo/make.scm
+++ b/src/cairo/make.scm
@@ -6,4 +6,4 @@ Load the Cairo option. |#
 (with-loader-base-uri (system-library-uri "cairo/")
   (lambda ()
     (load-package-set "cairo")))
-(add-subsystem-identification! "Cairo" '(0 5))
\ No newline at end of file
+(add-subsystem-identification! "Cairo" '(0 6))
\ No newline at end of file
-- 
2.25.1