From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Mon, 19 Mar 2018 00:25:07 +0000 (-0700)
Subject: pango: Increment version.  Use a (pango internal) package.
X-Git-Tag: mit-scheme-pucked-x11-0.2.2~17
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=021811a4a8b26c95195c51f2eb6a04e4555c6aa4;p=mit-scheme.git

pango: Increment version.  Use a (pango internal) package.
---

diff --git a/src/pango/NEWS b/src/pango/NEWS
index 37e5db5c5..e357897f5 100644
--- a/src/pango/NEWS
+++ b/src/pango/NEWS
@@ -19,6 +19,13 @@ 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-pango 0.6 - Matt Birkholz, 2018-03-16
+=======================================================
+
+Require the use of with-glib-lock.  Bindings should now be found in
+the (pango) package; they are not exported to the global package.
+Color procedures formerly in (glib) are now gathered here.
+
 mit-scheme-pucked-pango 0.5 - Matt Birkholz, 2016-06-12
 =======================================================
 
diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index ffcac50ff..fe6749c2f 100644
--- a/src/pango/configure.ac
+++ b/src/pango/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 pango plugin],
-        [0.5],
+        [0.6],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-pango])
 AC_CONFIG_SRCDIR([pango.pkg])
diff --git a/src/pango/debian/changelog b/src/pango/debian/changelog
index 1e7a27273..0bab4df02 100644
--- a/src/pango/debian/changelog
+++ b/src/pango/debian/changelog
@@ -1,3 +1,12 @@
+mit-scheme-pucked-pango (0.6) birchwood; urgency=low
+
+  * Require the use of with-glib-lock.  Bindings should now be found
+    in the (pango) package; they are not exported to the global
+    package.  Color procedures formerly in (glib) are now gathered
+    here.
+
+ -- Matt Birkholz <matt@birchwood-abbey.net>  Fri, 16 Mar 2018 00:00:00 -0700
+
 mit-scheme-pucked-pango (0.5) birchwood; urgency=low
 
   * Initial Debianization.
diff --git a/src/pango/make.scm b/src/pango/make.scm
index 7b86c41f4..f6224fb47 100644
--- a/src/pango/make.scm
+++ b/src/pango/make.scm
@@ -6,4 +6,4 @@ Load the Pango option. |#
 (with-loader-base-uri (system-library-uri "pango/")
   (lambda ()
     (load-package-set "pango")))
-(add-subsystem-identification! "Pango" '(0 5))
\ No newline at end of file
+(add-subsystem-identification! "Pango" '(0 6))
\ No newline at end of file
diff --git a/src/pango/pango.pkg b/src/pango/pango.pkg
index 2a1d2bb2b..ea6c89502 100644
--- a/src/pango/pango.pkg
+++ b/src/pango/pango.pkg
@@ -28,15 +28,18 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 (global-definitions glib/)
 
 (define-package (pango)
-  (parent (glib))
+  (parent (glib)))
+
+(define-package (pango internal)
+  (parent (pango))
   (files "pango")
   ;;(depends-on "../glib/glib.ext")
-  (export ()
+  (export (pango)
 	  color? make-color color-red color-green color-blue color-alpha
 	  set-color-red! set-color-green! set-color-blue! set-color-alpha!
 	  make-rgba-color guarantee-color
 	  ->color pango-color-parse
-	  <pango-layout>
+	  <pango-layout> guarantee-pango-layout
 	  pango-layout-get-context
 	  pango-layout-context-changed
 	  pango-layout-get-font-description
diff --git a/src/pango/pango.texi b/src/pango/pango.texi
index 88660bace..cd25a648b 100644
--- a/src/pango/pango.texi
+++ b/src/pango/pango.texi
@@ -82,11 +82,17 @@ 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 Pango library is built ``on top'' of GLib, which is not ready for
+multiple threads.  To ensure that just one Scheme thread is ``in'' the
+toolkits, the @code{with-glib-lock} procedure should be used, else
+every callout will write a warning line to stderr.
+@xref{with-glib-lock, , , glib, GLib Plugin Manual}.
+
 @node API Reference, GNU Free Documentation License, Introduction, Top
 @chapter API Reference
 
-All of the Pango system's public bindings are exported to the global
-environment and are described here.
+All of the Pango system's public bindings can be found in the
+@code{(pango)} package and are described here.
 
 PangoLayouts are GObjects and so are represented by instances of a new
 subclass of @code{<gobject>}: @code{<pango-layout>}s.  Other Pango