pango 2.0.0 → 2.0.1

data/Rakefile

@@ -6,24 +6,50 @@ require "gnome2/rake/package-task"
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/Pango is a Ruby binding of pango-1.x."
   package.description = "Ruby/Pango is a Ruby binding of pango-1.x."
-  package.dependency.gem.runtime = [["cairo", ">= 1.10.0"], "glib2"]
+  package.dependency.gem.runtime = [["cairo", ">= 1.12.5"], "glib2"]
   package.windows.packages = []
   package.windows.dependencies = []
   package.windows.build_dependencies = ["glib2", "gobject-introspection"]
   package.external_packages = [
+    {
+      :name => "harfbuzz",
+      :download_base_url => "http://www.freedesktop.org/software/harfbuzz/release",
+      :label => "HarfBuzz",
+      :version => "0.9.17",
+      :compression_method => "bz2",
+    },
     {
       :name => "pango",
       :download_site => :gnome,
       :label => "pango",
-      :version => "1.34.0",
+      :version => "1.34.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
         ],
+        :patches => [
+          "pango-1.34.0-enable-fc-font.diff",
+        ],
       },
-    }
+    },
   ]
 end
 package_task.define
 
+namespace :gcc do
+  namespace :dll do
+    desc "Bundle GCC related DLLs"
+    task(:bundle) do
+      dlls = ["libgcc_s_sjlj-1.dll", "libstdc++-6.dll"]
+      dlls.each do |dll|
+        host = package_task.windows.build_host
+        binary_dir = package_task.windows.absolute_binary_dir
+        full_path = `#{host}-g++ -print-file-name=#{dll}`.strip
+        cp(full_path, (binary_dir + "bin").to_s)
+      end
+    end
+  end
+end
+
+task "win32:builder:build:harfbuzz:after" => "gcc:dll:bundle"

data/ext/pango/extconf.rb

@@ -67,6 +67,13 @@ unless required_pkg_config_package(package_id,
 end
 PKGConfig.have_package('pangocairo')
 
+if PKGConfig.have_package("pangowin32")
+  $defs << " -DHAVE_PANGO_WIN32"
+end
+if PKGConfig.have_package("pangoft2")
+  $defs << " -DHAVE_PANGO_FT2"
+end
+
 pango_header = "pango/pango.h"
 have_func("pango_layout_iter_get_type", pango_header)
 have_func("pango_layout_set_ellipsize", pango_header)

data/ext/pango/rbpangocairo.c

@@ -39,6 +39,15 @@ rg_s_default(G_GNUC_UNUSED VALUE klass)
     return GOBJ2RVAL(pango_cairo_font_map_get_default());
 }
 
+#  if PANGO_CHECK_VERSION(1, 22, 0)
+static VALUE
+rg_s_set_default(VALUE klass, VALUE font_map)
+{
+    pango_cairo_font_map_set_default(RVAL2GOBJ(font_map));
+    return klass;
+}
+#  endif
+
 static VALUE
 rg_set_resolution(VALUE self, VALUE dpi)
 {
@@ -71,6 +80,9 @@ Init_pango_cairo(VALUE mPango)
 
     RG_DEF_SMETHOD(create, 0);
     RG_DEF_SMETHOD(default, 0);
+#  if PANGO_CHECK_VERSION(1, 22, 0)
+    RG_DEF_SMETHOD(set_default, 1);
+#  endif
 
     RG_DEF_METHOD(set_resolution, 1);
     RG_DEF_METHOD(resolution, 0);

data/ext/pango/rbpangofontmap.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -24,6 +24,18 @@
 #define RG_TARGET_NAMESPACE cFontMap
 #define _SELF(self) (RVAL2PANGOFONTMAP(self))
 
+#ifdef CAIRO_AVAILABLE
+#  ifdef HAVE_PANGO_FT2
+#    define PANGO_TYPE_CAIRO_FC_FONT_MAP \
+    (pango_cairo_fc_font_map_get_type())
+#  endif
+
+#  ifdef HAVE_PANGO_WIN32
+#    define PANGO_TYPE_CAIRO_WIN32_FONT_MAP \
+      (pango_cairo_win32_font_map_get_type())
+#  endif
+#endif
+
 /*
 static VALUE
 rg_initialize(VALUE self)
@@ -99,9 +111,16 @@ Init_pango_font_map(VALUE mPango)
     G_DEF_CLASS3("PangoFT2FontMap", "FT2FontMap", mPango);
     G_DEF_CLASS3("PangoXFontMap", "XFontMap", mPango);
     G_DEF_CLASS3("PangoWin32FontMap", "Win32FontMap", mPango);
+    G_DEF_CLASS3("PangoCoreTextFontMap", "CoreTextFontMap", mPango);
+#ifdef PANGO_TYPE_CAIRO_FC_FONT_MAP
+    G_DEF_CLASS(PANGO_TYPE_CAIRO_FC_FONT_MAP, "CairoFcFontMap", mPango);
+#else
     G_DEF_CLASS3("PangoCairoFcFontMap", "CairoFcFontMap", mPango);
+#endif
+#ifdef PANGO_TYPE_CAIRO_WIN32_FONT_MAP
+    G_DEF_CLASS(PANGO_TYPE_CAIRO_WIN32_FONT_MAP, "CairoWin32FontMap", mPango);
+#else
     G_DEF_CLASS3("PangoCairoWin32FontMap", "CairoWin32FontMap", mPango);
-#if PANGO_CHECK_VERSION(1,12,0)
-    G_DEF_CLASS3("PangoATSUIFontMap", "ATSUIFontMap", mPango);
 #endif
+    G_DEF_CLASS3("PangoCairoCoreTextFontMap", "CairoCoreTextFontMap", mPango);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pango
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: glib2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 description: Ruby/Pango is a Ruby binding of pango-1.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []