pango 2.1.0-x86-mingw32 → 2.2.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb8db8cd8a4cd23645a27b6cbe92b850b3343e5
-  data.tar.gz: e15dd8d970dbcc44845a11d16254f12fa317a8ae
+  metadata.gz: e8d08aa37e786779cd1fda015457e13b5474afe2
+  data.tar.gz: 15fb8884c741f66c8f17cc705e1e8b2bd5a11ad3
 SHA512:
-  metadata.gz: 69a68823c87e936c9b2eb8e2b739eecaa4d16d6d954274837b765672f88eecc06d3894a36a5ac43bc184f04866fd2077dca1e45991c1968e19924903a121b5f9
-  data.tar.gz: 4abfe34efd449ad079951b854034375c7174fbbb0455f366931c079f6ed96d538cd38e76aedce2cff51a32249b4ef5f1896931d2ba9ce067329aa8c91ea72329
+  metadata.gz: 4e29ff8c3d1b47ad787922a66960c9d05c9347e901c34f788898ffb553c351b31358faae35f1fe4eb01dd1aa95cc3f0567d5b5892d6b9d48dd03affdbe40cbbe
+  data.tar.gz: 4435466d651c48ceb589af3320e4d3ad78a2a4b945ea8a4d377f0e3e6e94b2772871bd3c97ce78f7aa92611a060dbc151b197d1bfc16bc8188f78f5e53c50927

data/Rakefile

@@ -15,7 +15,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "harfbuzz",
       :download_base_url => "http://www.freedesktop.org/software/harfbuzz/release",
       :label => "HarfBuzz",
-      :version => "0.9.25",
+      :version => "0.9.26",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [
@@ -29,7 +29,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "pango",
       :download_site => :gnome,
       :label => "pango",
-      :version => "1.36.1",
+      :version => "1.36.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/pango/rbpangocairo.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2006-2013  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Kouhei Sutou
  *
  *  This library is free software; you can redistribute it and/or
@@ -34,6 +34,7 @@ rg_s_create(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
     if (NIL_P(rb_font_type)) {
         font_map = pango_cairo_font_map_new();
     } else {
+#if PANGO_CHECK_VERSION(1, 18, 0)
         cairo_font_type_t font_type = CAIRO_FONT_TYPE_USER;
         if (rbgutil_key_equal(rb_font_type, "ft") ||
             rbgutil_key_equal(rb_font_type, "freetype")) {
@@ -49,6 +50,11 @@ rg_s_create(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
                      RBG_INSPECT(rb_font_type));
         }
         font_map = pango_cairo_font_map_new_for_font_type(font_type);
+#else
+        rb_raise(rb_eArgError,
+                 "Pango::CairoFontMap.create with font type "
+                 "requires Pango 1.18.0 or later");
+#endif
     }
 
     return GOBJ2RVAL(font_map);

data/vendor/local/include/harfbuzz/hb-common.h

@@ -94,6 +94,7 @@ typedef uint32_t hb_tag_t;
 #define HB_UNTAG(tag)   ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag))
 
 #define HB_TAG_NONE HB_TAG(0,0,0,0)
+#define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff)
 
 /* len=-1 means str is NUL-terminated. */
 hb_tag_t
@@ -270,7 +271,12 @@ typedef enum
   /*6.1*/ HB_SCRIPT_TAKRI			= HB_TAG ('T','a','k','r'),
 
   /* No script set. */
-  /*---*/ HB_SCRIPT_INVALID			= HB_TAG_NONE
+  /*---*/ HB_SCRIPT_INVALID			= HB_TAG_NONE,
+
+  /* Dummy value to ensure any hb_tag_t value can be passed/stored as hb_script_t
+   * without risking undefined behavior. */
+  /*---*/ _HB_SCRIPT_MAX_VALUE			= HB_TAG_MAX
+
 } hb_script_t;
 
 /* These are moved out of hb_script_t because glib-mkenums chokes otherwise. */

data/vendor/local/include/harfbuzz/hb-ot-layout.h

@@ -193,11 +193,6 @@ hb_ot_layout_collect_lookups (hb_face_t      *face,
 			      const hb_tag_t *features,
 			      hb_set_t       *lookup_indexes /* OUT */);
 
-void
-hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
-				  hb_tag_t         table_tag,
-				  hb_set_t        *lookup_indexes /* OUT */);
-
 void
 hb_ot_layout_lookup_collect_glyphs (hb_face_t    *face,
 				    hb_tag_t      table_tag,

data/vendor/local/include/harfbuzz/hb-ot-shape.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2013  Red Hat, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Red Hat Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_H
+#define HB_OT_SHAPE_H
+#define HB_OT_SHAPE_H_IN
+
+#include "hb.h"
+
+#include "hb-ot-layout.h"
+#include "hb-ot-tag.h"
+
+HB_BEGIN_DECLS
+
+/* TODO port to shape-plan / set. */
+void
+hb_ot_shape_glyphs_closure (hb_font_t          *font,
+                hb_buffer_t        *buffer,
+                const hb_feature_t *features,
+                unsigned int        num_features,
+                hb_set_t           *glyphs);
+
+void
+hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
+                hb_tag_t         table_tag,
+                hb_set_t        *lookup_indexes /* OUT */);
+
+HB_END_DECLS
+
+#undef HB_OT_SHAPE_H_IN
+#endif /* HB_OT_SHAPE_H */

data/vendor/local/include/harfbuzz/hb-ot.h

@@ -32,17 +32,10 @@
 
 #include "hb-ot-layout.h"
 #include "hb-ot-tag.h"
+#include "hb-ot-shape.h"
 
 HB_BEGIN_DECLS
 
-/* TODO remove */
-void
-hb_ot_shape_glyphs_closure (hb_font_t          *font,
-			    hb_buffer_t        *buffer,
-			    const hb_feature_t *features,
-			    unsigned int        num_features,
-			    hb_set_t           *glyphs);
-
 HB_END_DECLS
 
 #undef HB_OT_H_IN

data/vendor/local/include/harfbuzz/hb-version.h

@@ -38,9 +38,9 @@ HB_BEGIN_DECLS
 
 #define HB_VERSION_MAJOR 0
 #define HB_VERSION_MINOR 9
-#define HB_VERSION_MICRO 25
+#define HB_VERSION_MICRO 26
 
-#define HB_VERSION_STRING "0.9.25"
+#define HB_VERSION_STRING "0.9.26"
 
 #define HB_VERSION_CHECK(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) >= \

data/vendor/local/include/pango-1.0/pango/pango-features.h

@@ -4,9 +4,9 @@
 
 #define PANGO_VERSION_MAJOR 1
 #define PANGO_VERSION_MINOR 36
-#define PANGO_VERSION_MICRO 1
+#define PANGO_VERSION_MICRO 2
 
-#define PANGO_VERSION_STRING "1.36.1"
+#define PANGO_VERSION_STRING "1.36.2"
 
 
 #endif

data/vendor/local/lib/libharfbuzz.la

@@ -23,8 +23,8 @@ dependency_libs=' -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib
 weak_library_names=''
 
 # Version information for libharfbuzz.
-current=925
-age=925
+current=926
+age=926
 revision=0
 
 # Is this an already installed library?

data/vendor/local/lib/libpango-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpango-1.0.
 current=3600
 age=3600
-revision=1
+revision=2
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangocairo-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangocairo-1.0.
 current=3600
 age=3600
-revision=1
+revision=2
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangoft2-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangoft2-1.0.
 current=3600
 age=3600
-revision=1
+revision=2
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/libpangowin32-1.0.la

@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libpangowin32-1.0.
 current=3600
 age=3600
-revision=1
+revision=2
 
 # Is this an already installed library?
 installed=yes

data/vendor/local/lib/pkgconfig/harfbuzz.pc

@@ -5,7 +5,7 @@ includedir=/home/kou/work/ruby/ruby-gnome2.win32/pango/vendor/local/include
 
 Name: harfbuzz
 Description: HarfBuzz text shaping library
-Version: 0.9.25
+Version: 0.9.26
 
 Libs: -L${libdir} -lharfbuzz
 Cflags: -I${includedir}/harfbuzz

data/vendor/local/lib/pkgconfig/pango.pc

@@ -7,7 +7,7 @@ pango_module_version=1.8.0
 
 Name: Pango
 Description: Internationalized text handling
-Version: 1.36.1
+Version: 1.36.2
 Requires: glib-2.0 gobject-2.0
 Requires.private: gmodule-no-export-2.0
 Libs: -L${libdir} -lpango-1.0 -lm

data/vendor/local/lib/pkgconfig/pangocairo.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Cairo
 Description: Cairo rendering support for Pango
-Version: 1.36.1
+Version: 1.36.2
 Requires: pango cairo  pangoft2 pangowin32
 Libs: -L${libdir} -lpangocairo-1.0
 Cflags: -I${includedir}/pango-1.0

data/vendor/local/lib/pkgconfig/pangoft2.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango FT2 and Pango Fc
 Description: Freetype 2.0 and fontconfig font support for Pango
-Version: 1.36.1
+Version: 1.36.2
 Requires: pango freetype2 fontconfig
 Requires.private: harfbuzz
 Libs: -L${libdir} -lpangoft2-1.0

data/vendor/local/lib/pkgconfig/pangowin32.pc

@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: Pango Win32
 Description: Win32 GDI font support for Pango
-Version: 1.36.1
+Version: 1.36.2
 Requires: pango
 Libs: -L${libdir} -lpangowin32-1.0 -lgdi32
 Cflags: -I${includedir}/pango-1.0

data/vendor/local/share/gtk-doc/html/harfbuzz/ch01.html

@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp8350848"></a>[Insert title here]</h2></div></div></div>
+<a name="idp190624"></a>[Insert title here]</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="harfbuzz-hb.html">hb</a></span><span class="refpurpose"></span>

data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html

@@ -425,7 +425,11 @@ typedef             <a class="link" href="harfbuzz-hb-common.html#hb-tag-t" titl
   /*6.1*/ HB_SCRIPT_TAKRI			= HB_TAG ('T','a','k','r'),
 
   /* No script set. */
-  /*---*/ HB_SCRIPT_INVALID			= HB_TAG_NONE
+  /*---*/ HB_SCRIPT_INVALID			= HB_TAG_NONE,
+
+  /* Dummy value to ensure any hb_tag_t value can be passed/stored as hb_script_t
+   * without risking undefined behavior. */
+  /*---*/ _HB_SCRIPT_MAX_VALUE			= HB_TAG_MAX
 } hb_script_t;
 </pre>
 <p>
@@ -953,6 +957,10 @@ typedef             <a class="link" href="harfbuzz-hb-common.html#hb-tag-t" titl
 <td>
 </td>
 </tr>
+<tr>
+<td><p><a name="HB-SCRIPT-MAX-VALUE:CAPS"></a><span class="term"><code class="literal">_HB_SCRIPT_MAX_VALUE</code></span></p></td>
+<td></td>
+</tr>
 </tbody>
 </table></div>
 </div>

data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html

@@ -74,7 +74,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="harfb
 <hr>
 <div class="refsect2">
 <a name="HB-VERSION-MICRO:CAPS"></a><h3>HB_VERSION_MICRO</h3>
-<pre class="programlisting">#define HB_VERSION_MICRO 24
+<pre class="programlisting">#define HB_VERSION_MICRO 26
 </pre>
 <p>
 </p>
@@ -90,7 +90,7 @@ const <span class="returnvalue">char</span> *        <a class="link" href="harfb
 <hr>
 <div class="refsect2">
 <a name="HB-VERSION-STRING:CAPS"></a><h3>HB_VERSION_STRING</h3>
-<pre class="programlisting">#define HB_VERSION_STRING "0.9.24"
+<pre class="programlisting">#define HB_VERSION_STRING "0.9.26"
 </pre>
 <p>
 </p>

data/vendor/local/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2

@@ -477,6 +477,7 @@
     <keyword type="constant" name="HB_SCRIPT_SORA_SOMPENG" link="harfbuzz-hb-common.html#HB-SCRIPT-SORA-SOMPENG:CAPS"/>
     <keyword type="constant" name="HB_SCRIPT_TAKRI" link="harfbuzz-hb-common.html#HB-SCRIPT-TAKRI:CAPS"/>
     <keyword type="constant" name="HB_SCRIPT_INVALID" link="harfbuzz-hb-common.html#HB-SCRIPT-INVALID:CAPS"/>
+    <keyword type="constant" name="_HB_SCRIPT_MAX_VALUE" link="harfbuzz-hb-common.html#HB-SCRIPT-MAX-VALUE:CAPS"/>
     <keyword type="constant" name="HB_UNICODE_COMBINING_CLASS_NOT_REORDERED" link="harfbuzz-hb-unicode.html#HB-UNICODE-COMBINING-CLASS-NOT-REORDERED:CAPS"/>
     <keyword type="constant" name="HB_UNICODE_COMBINING_CLASS_OVERLAY" link="harfbuzz-hb-unicode.html#HB-UNICODE-COMBINING-CLASS-OVERLAY:CAPS"/>
     <keyword type="constant" name="HB_UNICODE_COMBINING_CLASS_NUKTA" link="harfbuzz-hb-unicode.html#HB-UNICODE-COMBINING-CLASS-NUKTA:CAPS"/>

data/vendor/local/share/gtk-doc/html/harfbuzz/index.html

@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">HarfBuzz Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for HarfBuzz 0.9.25
+      for HarfBuzz 0.9.26
 .
       
     </p></div>

data/vendor/local/share/gtk-doc/html/harfbuzz/index.sgml

@@ -136,6 +136,7 @@
 <ANCHOR id="HB-SCRIPT-SORA-SOMPENG:CAPS" href="harfbuzz/harfbuzz-hb-common.html#HB-SCRIPT-SORA-SOMPENG:CAPS">
 <ANCHOR id="HB-SCRIPT-TAKRI:CAPS" href="harfbuzz/harfbuzz-hb-common.html#HB-SCRIPT-TAKRI:CAPS">
 <ANCHOR id="HB-SCRIPT-INVALID:CAPS" href="harfbuzz/harfbuzz-hb-common.html#HB-SCRIPT-INVALID:CAPS">
+<ANCHOR id="HB-SCRIPT-MAX-VALUE:CAPS" href="harfbuzz/harfbuzz-hb-common.html#HB-SCRIPT-MAX-VALUE:CAPS">
 <ANCHOR id="hb-script-to-iso15924-tag" href="harfbuzz/harfbuzz-hb-common.html#hb-script-to-iso15924-tag">
 <ANCHOR id="hb-tag-from-string" href="harfbuzz/harfbuzz-hb-common.html#hb-tag-from-string">
 <ANCHOR id="hb-tag-t" href="harfbuzz/harfbuzz-hb-common.html#hb-tag-t">