cairo 1.12.6-x86-mingw32 → 1.12.7-x86-mingw32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 685cd64f3c076547197ef4d371d4e445ed7118df
+  data.tar.gz: b4c99facf5e03a4d8c6732acec6d72f3f911d346
+SHA512:
+  metadata.gz: a69eaae6f8a34cbdf511a957c1d9a9a8bc6544601f50ab33155af0f280983a264546d4fb82667d8af118abad0dc5d10fce4cad5f6242ee832307573eb94f1acc
+  data.tar.gz: 51e83f7705958947a3c22e2c7c7ce3c0714d0d22c228988895c3fa14ac218442e272f92d991255db38f370ff8412e45cf14a9205c0104c6c4e08629a846efc7a

data/Gemfile

@@ -1,5 +1,5 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
-source "http://rubygems.org/"
+source "https://rubygems.org/"
 
 gemspec

data/NEWS

@@ -1,3 +1,27 @@
+Release 1.12.7 (2013-12-23) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Added paper sizes of ISO B series and JIS B series.
+    [Patch by 5.5]
+  * Added Windows binary for Ruby 2.1.0.
+  * Updated bundled cairo to 1.12.16 from 1.12.14 for Windows.
+
+Fixes
+-----
+
+  * Fixed a bug that Cairo::ImageSurface.new(cloned_data, ...)
+    changes both the original data and the cloned data.
+    [Patch by Naoyuki Hirayama]
+
+Thanks
+------
+
+  * 5.5
+  * Naoyuki Hirayama
+
 Release 1.12.6 (2013-05-24) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/README.rdoc

@@ -12,7 +12,7 @@ http://cairographics.org/
 
 == Dependencies
 
-* ruby >= 1.8 (1.9.2 also supported!)
+* ruby >= 1.9.3 (2.0.0 also supported!)
 * cairo >= 1.2.0 (1.12.0 also supported!)
 
 == Install

data/Rakefile

@@ -36,16 +36,27 @@ end
 
 binary_dir = File.join("vendor", "local")
 Rake::ExtensionTask.new("cairo", spec) do |ext|
+  ext.cross_platform = ["x86-mingw32"]
   ext.cross_compile = true
-  ext.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
+  ext.cross_compiling do |_spec|
+    if /mingw|mswin/ =~ _spec.platform.to_s
       binary_files = []
       Find.find(binary_dir) do |name|
         next unless File.file?(name)
         next if /\.zip\z/i =~ name
         binary_files << name
       end
-      spec.files += binary_files
+      _spec.files += binary_files
+
+      stage_path = "#{ext.tmp_dir}/#{_spec.platform}/stage"
+      binary_files.each do |binary_file|
+        stage_binary_file = "#{stage_path}/#{binary_file}"
+        stage_binary_dir = File.dirname(stage_binary_file)
+        directory stage_binary_dir
+        file stage_binary_file => [stage_binary_dir, binary_file] do
+          cp(binary_file, stage_binary_file)
+        end
+      end
     end
   end
 end
@@ -158,10 +169,32 @@ class WindowsTask
 
   private
   def define_download_task
+    define_gcc_task
     define_source_download_task
     define_build_task
   end
 
+  def define_gcc_task
+    namespace :windows do
+      namespace :gcc do
+        namespace :dll do
+          desc "Bundle GCC related DLLs"
+          task :bundle do
+            dll_names = ["libgcc_s_sjlj-1.dll"]
+            dll_names.each do |dll_name|
+              cp(absolete_gcc_dll_path(dll_name), install_dir + "bin")
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def absolete_gcc_dll_path(dll_name)
+    build_host = @packages.first.windows.build_host
+    `#{build_host}-gcc -print-file-name=#{dll_name}`.strip
+  end
+
   def define_source_download_task
     namespace :source do
       tasks = []
@@ -175,7 +208,7 @@ class WindowsTask
 
           desc "Download #{package.name} source"
           task :download => archive_path.to_s
-          tasks << (Rake.application.current_scope + ["download"]).join(":")
+          tasks << join_task_name(Rake.application.current_scope, "download")
         end
       end
       desc "Download sources"
@@ -212,15 +245,24 @@ class WindowsTask
 
           desc "Build #{package.label} package"
           task :build => built_file.to_s
-          tasks << (Rake.application.current_scope + ["build"]).join(":")
+          tasks << join_task_name(Rake.application.current_scope, "build")
         end
       end
       desc "Build packages"
-      task :build => tasks
+      task :build => ["windows:gcc:dll:bundle"] + tasks
+    end
+  end
+
+  def join_task_name(current_scope, task_name)
+    if Rake.const_defined?(:Scope)
+      current_scope.path_with_task_name(task_name)
+    else
+      (current_scope + [task_name]).join(":")
     end
   end
 
   def build(package)
+    ENV["PATH"] = ["#{install_dir}/bin", ENV["PATH"]].join(File::PATH_SEPARATOR)
     ENV["PKG_CONFIG_LIBDIR"] = "#{install_dir}/lib/pkgconfig"
     ENV["PKG_CONFIG_PATH"] = [
       ruby_glib2_pkg_config_path,
@@ -371,16 +413,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.2",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.2",
+      :version => "1.6.8",
+      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.8",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.4.12",
-      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.4.12",
+      :version => "2.5.2",
+      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.2",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-6.dll",
@@ -400,7 +442,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "fontconfig",
-      :version => "2.10.92",
+      :version => "2.11.0",
       :download_base_url => "http://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -410,14 +452,15 @@ windows_task = WindowsTask.new(spec) do |task|
           "--disable-docs",
         ],
         :patches => [
-          "fontconfig-2.10.92-disable-mktemp-s.diff",
+          "fontconfig-2.11.0-disable-mktemp-s.diff",
+          "fontconfig-2.11.0-disable-test.diff",
         ],
         :need_autoreconf => true,
       },
     },
     {
       :name => "pixman",
-      :version => "0.30.0",
+      :version => "0.32.4",
       :download_site => :cairo,
       :compression_method => "gz",
       :windows => {
@@ -426,7 +469,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.12.14",
+      :version => "1.12.16",
       :download_site => :cairo,
       :windows => {
         :built_file => "bin/libcairo-2.dll",

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 12
-#define RB_CAIRO_VERSION_MICRO 6
+#define RB_CAIRO_VERSION_MICRO 7
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_surface.c

@@ -935,6 +935,8 @@ cr_image_surface_create_for_data (VALUE self, VALUE rb_data, VALUE format,
 {
   unsigned char *data;
 
+  rb_data = StringValue (rb_data);
+  rb_str_modify (rb_data);
   data = (unsigned char *)StringValuePtr (rb_data);
 
   return cairo_image_surface_create_for_data (data,

data/lib/cairo/papers.rb

@@ -15,6 +15,30 @@ module Cairo
      [37, 52, "A9"],
      [26, 37, "A10"],
 
+     [1000, 1414 , "ISO_B0"],
+     [707, 1000 , "ISO_B1"],
+     [500, 707 , "ISO_B2"],
+     [353, 500 , "ISO_B3"],
+     [250, 353 , "ISO_B4"],
+     [176, 250 , "ISO_B5"],
+     [125, 176 , "ISO_B6"],
+     [88, 125 , "ISO_B7"],
+     [62, 88 , "ISO_B8"],
+     [44, 62 , "ISO_B9"],
+     [31, 44 , "ISO_B10"],
+
+     [1030, 1456, "JIS_B0"],
+     [728, 1030, "JIS_B1"],
+     [515, 728, "JIS_B2"],
+     [364, 515, "JIS_B3"],
+     [257, 364, "JIS_B4"],
+     [182, 257, "JIS_B5"],
+     [128, 182, "JIS_B6"],
+     [91, 128, "JIS_B7"],
+     [64, 91, "JIS_B8"],
+     [45, 64, "JIS_B9"],
+     [32, 45, "JIS_B10"],
+
      [1030, 1456, "B0"],
      [728, 1030, "B1"],
      [515, 728, "B2"],

data/test/test_image_surface.rb

@@ -0,0 +1,28 @@
+require 'cairo'
+
+class ImageSurfaceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def test_cloned_data
+    width = 10
+    height = 10
+    original_surface = Cairo::ImageSurface.new(:a1, width, height)
+
+    original_data = original_surface.data
+    cloned_data = original_data.clone
+
+    cloned_surface = Cairo::ImageSurface.new(cloned_data,
+                                             :a1, width, height,
+                                             original_surface.stride)
+
+    Cairo::Context.new(cloned_surface) do |context|
+      context.set_source_rgb(255, 255, 255)
+      context.scale(width, height)
+      context.move_to(0, 0)
+      context.line_to(1, 1)
+      context.stroke
+    end
+
+    assert_not_equal(original_data, cloned_data)
+  end
+end

data/vendor/local/bin/freetype-config

@@ -73,7 +73,7 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 16.1.10
+    echo 17.1.11
     exit 0
     ;;
   --ftversion)
@@ -119,13 +119,13 @@ else
 fi
 
 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_MAJOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_MINOR \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
          | grep FREETYPE_PATCH \
          | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
   echo $major.$minor.$patch
@@ -133,15 +133,11 @@ fi
 
 if test "$echo_cflags" = "yes" ; then
   cflags="-I${SYSROOT}$includedir/freetype2"
-  if test "${SYSROOT}$includedir" != "/usr/include" ; then
-    echo $cflags -I${SYSROOT}$includedir
-  else
-    echo $cflags
-  fi
+  echo $cflags
 fi
 
 if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype -lz  "
+  libs="-lfreetype -lz  -lpng16 "
   if test "${SYSROOT}$libdir" != "/usr/lib"  &&
      test "${SYSROOT}$libdir" != "/usr/lib64"; then
     echo -L${SYSROOT}$libdir $libs

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.2"
+version="1.6.8"
 prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.2"
+version="1.6.8"
 prefix="/home/kou/work/ruby/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/etc/fonts/conf.d/30-metric-aliases.conf

@@ -2,57 +2,46 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-	<!-- Alias similar/metric-compatible families from various sources:
-
-		PostScript fonts:
-			Helvetica
-			Times
-			Courier
-		URW fonts:
-			Nimbus Sans L
-			Nimbus Roman No9 L
-			Nimbus Mono L
-
-		Microsoft fonts:
-			Arial
-			Arial Narrow
-			Times New Roman
-			Courier New
-		Liberation fonts:
-			Liberation Sans
-			Liberation Sans Narrow
-			Liberation Serif
-			Liberation Mono
-		StarOffice fonts:
-			Albany
-			Thorndale
-			Cumberland
-		AMT fonts:
-			Albany AMT
-			Thorndale AMT
-			Cumberland AMT
-		Google CrOS Core fonts:
-			Arimo
-			Cousine
-			Tinos
-
-	     Of these, URW fonts are design compatible with PostScrict fonts,
-	     and the Liberation, StarOffice, AMT and CrOS Core ones are
-	     compatible with Microsoft fonts.
-
-	     We want for each of them to fallback to any of these
-	     available, but in an order preferring similar designs
-	     first.  We do this in three steps:
-
-		1) Alias each specific to it's generic family.
-		   eg. Liberation Sans to Arial
-
-		2) Weak alias each generic to the other generic of its family.
-		   eg. Arial to Helvetica
-
-		3) Alias each generic to its specifics.
-		   eg. Arial to Liberation Sans, Albany, and Albany AMT
-	-->
+<!--
+
+Alias similar/metric-compatible families from various sources:
+
+PostScript fonts:       URW fonts:            GUST fonts:        Windows fonts:
+======================  ====================  =================  ==================
+Helvetica               Nimbus Sans L         TeX Gyre Heros
+Helvetica Condensed                           TeX Gyre Heros Cn
+Times                   Nimbus Roman No9 L    TeX Gyre Termes
+Courier                 Nimbus Mono L         TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic L          TeX Gyre Adventor
+ITC Bookman             URW Bookman L         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       URW Chancery L        TeX Gyre Chorus
+Palatino                URW Palladio L        TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  Century Schoolbook L  TeX Gyre Schola    Century Schoolbook
+
+Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
+================  ======================  =======================  =================  ==============
+Arial             Liberation Sans         Arimo                    Albany             Albany AMT
+Arial Narrow      Liberation Sans Narrow
+Times New Roman   Liberation Serif        Cousine                  Thorndale          Thorndale AMT
+Courier New       Liberation Mono         Tinos                    Cumberland         Cumberland AMT
+
+Microsoft fonts:  Other fonts:
+================  ============
+Georgia           Gelasio
+
+We want for each of them to fallback to any of these available,
+but in an order preferring similar designs first.  We do this in three steps:
+
+1) Alias each specific to its generic family.
+   e.g. Liberation Sans to Arial
+
+2) Weak alias each generic to the other generic of its family.
+   e.g. Arial to Helvetica
+
+3) Alias each generic to its specifics.
+   e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
+
+-->
 
 <!-- Map specifics to generics -->
 
@@ -64,6 +53,20 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Heros</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Heros Cn</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Nimbus Roman No9 L</family>
 	  <default>
@@ -71,6 +74,13 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Termes</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Nimbus Mono L</family>
 	  <default>
@@ -78,6 +88,125 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>TeX Gyre Cursor</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Gothic L</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Adventor</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Bookman L</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Bonum</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman Old Style</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Zapf Chancery</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Chancery L</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Chorus</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Palladio L</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Pagella</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino Linotype</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook L</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Schola</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -171,11 +300,17 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Gelasio</family>
+	  <default>
+	  <family>Georgia</family>
+	  </default>
+	</alias>
+
 
 
 <!-- Accept the other group as fallback -->
 
-
 	<!-- PostScript -->
 	<alias>
 	  <family>Helvetica</family>
@@ -184,6 +319,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Helvetica Condensed</family>
+	  <default>
+	  <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times</family>
 	  <default>
@@ -207,6 +349,13 @@
 	  </default>
 	</alias>
 
+	<alias>
+	  <family>Arial Narrow</family>
+	  <default>
+	  <family>Helvetica Condensed</family>
+	  </default>
+	</alias>
+
 	<alias>
 	  <family>Times New Roman</family>
 	  <default>
@@ -225,18 +374,26 @@
 
 <!-- Map generics to specifics -->
 
-
 	<!-- PostScript -->
 	<alias binding="same">
 	  <family>Helvetica</family>
 	  <accept>
+	  <family>TeX Gyre Heros</family>
 	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Helvetica Condensed</family>
+	  <accept>
+	  <family>TeX Gyre Heros Cn</family>
+	  </accept>
+	</alias>
+
 	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
+	  <family>TeX Gyre Termes</family>
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
@@ -244,10 +401,53 @@
 	<alias binding="same">
 	  <family>Courier</family>
 	  <accept>
+	  <family>TeX Gyre Cursor</family>
 	  <family>Nimbus Mono L</family>
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>ITC Avant Garde Gothic</family>
+	  <accept>
+	  <family>TeX Gyre Adventor</family>
+	  <family>URW Gothic L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Bookman</family>
+	  <accept>
+	  <family>Bookman Old Style</family>
+	  <family>TeX Gyre Bonum</family>
+	  <family>URW Bookman L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Zapf Chancery</family>
+	  <accept>
+	  <family>TeX Gyre Chorus</family>
+	  <family>URW Chancery L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept>
+	  <family>Palatino Linotype</family>
+	  <family>TeX Gyre Pagella</family>
+	  <family>URW Palladio L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept>
+	  <family>Century Schoolbook</family>
+	  <family>TeX Gyre Schola</family>
+	  <family>Century Schoolbook L</family>
+	  </accept>
+	</alias>
 
 	<!-- Microsoft -->
 	<alias binding="same">
@@ -287,5 +487,11 @@
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Georgia</family>
+	  <accept>
+	    <family>Gelasio</family>
+	  </accept>
+	</alias>
 
 </fontconfig>