cairo 1.12.8-x86-mingw32 → 1.12.9-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b04f850e93e5c53cf9fcefd1676a5fae30f535
-  data.tar.gz: ab13f9e5d3a5615929e037d2387f90e3357fead2
+  metadata.gz: 95cad002f4b037e88d556ed364319b036ab73774
+  data.tar.gz: e311b379d3cca8ae09290f6a6853160f0b6b84ac
 SHA512:
-  metadata.gz: 7ba953a0cf48df0419119d71534c550043c6bf67c62520fd1437e437b3e0de2aece0967a4ddc29041c35c2a31eadf9e46f072c584e1b971bd8aaeefaab699d7f
-  data.tar.gz: eced3fe2a0b44a5f6b2bbf6d732d9bc37ea5c588deaa16a8731865e1ac437b41e89dc5ee5ecd84a0b9c6fb59b07578abc08f15cce39aa3bda8f043ff27b3587f
+  metadata.gz: 627f0a7065903eba9ff54e6fd27e74a5afe63b75619563220fe89c8796263bae1f6b73ae07adb1ccba90457773db39683fc60b8e21054c6953eef9980eff7281
+  data.tar.gz: 019c64c84064e5315ca9021df33d5f332b98ca7d52feb071640ac0ecb7bd8d50f897c33573525b58e933f8c9b46452933d9139606f97148eb15e1da346d85618

data/NEWS

@@ -1,3 +1,26 @@
+Release 1.12.9 (2014-04-05) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Supported cocoa gem. [Patch by Patrick Hanevold]
+  * Made Cairo::Rectangle based on cairo_rectangle_int_t. It improves
+    Ruby/GDK3 integration.
+
+Fixes
+-----
+
+  * Fixed a bug that Cairo::Context isn't GC-ed without explicit
+    Cairo::Context#destroy.
+    [ruby-gnome2-devel-en][Reported by Detlef Reichl]
+
+Thanks
+------
+
+  * Patrick Hanevold
+  * Detlef Reichl
+
 Release 1.12.8 (2013-12-23) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 

data/Rakefile

@@ -36,7 +36,11 @@ end
 
 binary_dir = File.join("vendor", "local")
 Rake::ExtensionTask.new("cairo", spec) do |ext|
-  ext.cross_platform = ["x86-mingw32"]
+  if ENV["RCAIRO_WINDOWS_64"] == "yes"
+    ext.cross_platform = ["x64-mingw32"]
+  else
+    ext.cross_platform = ["x86-mingw32"]
+  end
   ext.cross_compile = true
   ext.cross_compiling do |_spec|
     if /mingw|mswin/ =~ _spec.platform.to_s
@@ -131,7 +135,11 @@ class Package < Struct.new(:name,
     end
 
     def build_host
-      "i686-w64-mingw32"
+      if ENV["RCAIRO_WINDOWS_64"] == "yes"
+        "x86_64-w64-mingw32"
+      else
+        "i686-w64-mingw32"
+      end
     end
 
     def configure_args
@@ -178,11 +186,13 @@ class WindowsTask
     namespace :windows do
       namespace :gcc do
         namespace :dll do
+          binary_path = install_dir + "bin"
+          directory binary_path.to_s
           desc "Bundle GCC related DLLs"
-          task :bundle do
+          task :bundle => binary_path do
             dll_names = ["libgcc_s_sjlj-1.dll", "libwinpthread-1.dll"]
             dll_names.each do |dll_name|
-              cp(absolete_gcc_dll_path(dll_name), install_dir + "bin")
+              cp(absolete_gcc_dll_path(dll_name), binary_path)
             end
           end
         end
@@ -413,16 +423,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.8",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.8",
+      :version => "1.6.10",
+      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.10",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.5.2",
-      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.2",
+      :version => "2.5.3",
+      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.3",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-6.dll",
@@ -442,7 +452,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "fontconfig",
-      :version => "2.11.0",
+      :version => "2.11.1",
       :download_base_url => "http://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -452,8 +462,7 @@ windows_task = WindowsTask.new(spec) do |task|
           "--disable-docs",
         ],
         :patches => [
-          "fontconfig-2.11.0-disable-mktemp-s.diff",
-          "fontconfig-2.11.0-disable-test.diff",
+          "fontconfig-2.11.1-disable-mktemp-s.diff",
         ],
         :need_autoreconf => true,
       },

data/ext/cairo/rb_cairo.c

@@ -93,6 +93,7 @@ Init_cairo ()
   Init_cairo_constants ();
 
   Init_cairo_context ();
+  Init_cairo_rectangle ();
   Init_cairo_path ();
   Init_cairo_matrix ();
   Init_cairo_region ();

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 8
+#define RB_CAIRO_VERSION_MICRO 9
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_context.c

@@ -15,6 +15,7 @@
 
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
+#include "rb_cairo_io.h"
 
 #ifdef HAVE_RUBY_ST_H
 #  include <ruby/st.h>
@@ -23,7 +24,6 @@
 #endif
 
 VALUE rb_cCairo_Context;
-VALUE rb_cCairo_Rectangle;
 
 static ID cr_id_surface, cr_id_source;
 static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
@@ -33,22 +33,6 @@ static cairo_user_data_key_t cr_object_holder_key;
 
 static VALUE cr_get_current_point (VALUE self);
 
-#if CAIRO_CHECK_VERSION(1, 3, 0)
-static ID at_x, at_y, at_width, at_height;
-
-static VALUE
-cr_rectangle_initialize (VALUE self, VALUE x, VALUE y,
-                         VALUE width, VALUE height)
-{
-  rb_ivar_set (self, at_x, x);
-  rb_ivar_set (self, at_y, y);
-  rb_ivar_set (self, at_width, width);
-  rb_ivar_set (self, at_height, height);
-
-  return Qnil;
-}
-#endif
-
 static inline void
 cr_check_status (cairo_t *context)
 {
@@ -154,10 +138,11 @@ cr_initialize (VALUE self, VALUE target)
   cr = cairo_create (RVAL2CRSURFACE (target));
   cr_check_status (cr);
   rb_ivar_set (self, cr_id_surface, target);
-  cr_set_user_data (cr,
-                    &cr_object_holder_key,
-                    cr_object_holder_new(self),
-                    cr_object_holder_free);
+  if (rb_ivar_defined (target, rb_cairo__io_id_output))
+    cr_set_user_data (cr,
+                      &cr_object_holder_key,
+                      cr_object_holder_new (self),
+                      cr_object_holder_free);
   DATA_PTR (self) = cr;
   if (rb_block_given_p ())
     result = rb_ensure (rb_yield, self, cr_destroy_with_destroy_check, self);
@@ -1533,23 +1518,6 @@ Init_cairo_context (void)
   cr_id_multi = rb_intern ("*");
   cr_id_div = rb_intern ("/");
 
-#if CAIRO_CHECK_VERSION(1, 3, 0)
-  rb_cCairo_Rectangle =
-    rb_define_class_under (rb_mCairo, "Rectangle", rb_cObject);
-  at_x = rb_intern ("@x");
-  at_y = rb_intern ("@y");
-  at_width = rb_intern ("@width");
-  at_height = rb_intern ("@height");
-
-  rb_define_attr (rb_cCairo_Rectangle, "x", CR_TRUE, CR_TRUE);
-  rb_define_attr (rb_cCairo_Rectangle, "y", CR_TRUE, CR_TRUE);
-  rb_define_attr (rb_cCairo_Rectangle, "width", CR_TRUE, CR_TRUE);
-  rb_define_attr (rb_cCairo_Rectangle, "height", CR_TRUE, CR_TRUE);
-
-  rb_define_method (rb_cCairo_Rectangle, "initialize",
-                    cr_rectangle_initialize, 4);
-#endif
-
   rb_cCairo_Context =
     rb_define_class_under (rb_mCairo, "Context", rb_cObject);
 

data/ext/cairo/rb_cairo_private.h

@@ -48,6 +48,7 @@ extern void Init_cairo_io (void);
 extern void Init_cairo_constants (void);
 
 extern void Init_cairo_context (void);
+extern void Init_cairo_rectangle (void);
 extern void Init_cairo_path (void);
 extern void Init_cairo_matrix (void);
 extern void Init_cairo_region (void);

data/ext/cairo/rb_cairo_rectangle.c

@@ -0,0 +1,83 @@
+/* -*- c-file-style: "gnu"; indent-tabs-mode: nil -*- */
+/*
+ * Ruby Cairo Binding
+ *
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ *
+ * This file is made available under the same terms as Ruby
+ *
+*/
+
+#include "rb_cairo.h"
+
+VALUE rb_cCairo_Rectangle;
+
+#define _SELF  ((cairo_rectangle_int_t *)DATA_PTR (self))
+
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+static VALUE
+cr_rectangle_allocate (VALUE klass)
+{
+  return Data_Wrap_Struct (klass, NULL, xfree, NULL);
+}
+
+static VALUE
+cr_rectangle_initialize (VALUE self, VALUE x, VALUE y,
+                         VALUE width, VALUE height)
+{
+  cairo_rectangle_int_t *rectangle;
+
+  rectangle = ALLOC (cairo_rectangle_int_t);
+  DATA_PTR (self) = rectangle;
+
+  rectangle->x = NUM2INT (x);
+  rectangle->y = NUM2INT (y);
+  rectangle->width = NUM2INT (width);
+  rectangle->height = NUM2INT (height);
+
+  return Qnil;
+}
+
+#  define DEFINE_RECTANGLE_ACCESSOR(name)               \
+static VALUE                                            \
+cr_rectangle_get_ ## name (VALUE self)                  \
+{                                                       \
+  return INT2NUM (_SELF->name);                         \
+}                                                       \
+                                                        \
+static VALUE                                            \
+cr_rectangle_set_ ## name (VALUE self, VALUE value)     \
+{                                                       \
+  _SELF->name = NUM2INT (value);                        \
+  return self;                                          \
+}
+
+DEFINE_RECTANGLE_ACCESSOR(x)
+DEFINE_RECTANGLE_ACCESSOR(y)
+DEFINE_RECTANGLE_ACCESSOR(width)
+DEFINE_RECTANGLE_ACCESSOR(height)
+
+#  undef DEFINE_RECTANGLE_ACCESSOR
+#endif
+
+void
+Init_cairo_rectangle (void)
+{
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+  rb_cCairo_Rectangle =
+    rb_define_class_under (rb_mCairo, "Rectangle", rb_cObject);
+  rb_define_alloc_func (rb_cCairo_Rectangle, cr_rectangle_allocate);
+
+  rb_define_method (rb_cCairo_Rectangle, "initialize",
+                    cr_rectangle_initialize, 4);
+
+  rb_define_method (rb_cCairo_Rectangle, "x",  cr_rectangle_get_x, 0);
+  rb_define_method (rb_cCairo_Rectangle, "x=", cr_rectangle_set_x, 1);
+  rb_define_method (rb_cCairo_Rectangle, "y",  cr_rectangle_get_y, 0);
+  rb_define_method (rb_cCairo_Rectangle, "y=", cr_rectangle_set_y, 1);
+  rb_define_method (rb_cCairo_Rectangle, "width",  cr_rectangle_get_width, 0);
+  rb_define_method (rb_cCairo_Rectangle, "width=", cr_rectangle_set_width, 1);
+  rb_define_method (rb_cCairo_Rectangle, "height",  cr_rectangle_get_height, 0);
+  rb_define_method (rb_cCairo_Rectangle, "height=", cr_rectangle_set_height, 1);
+#endif
+}

data/ext/cairo/rb_cairo_surface.c

@@ -2,10 +2,8 @@
 /*
  * Ruby Cairo Binding
  *
- * $Author: kou $
- * $Date: 2008-11-01 14:23:14 $
- *
- * Copyright 2005-2012 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -55,11 +53,9 @@ enum ruby_value_type {
 #  undef T_DATA
 #  include <cairo-quartz.h>
 #  define T_DATA RUBY_T_DATA
-#  ifdef HAVE_RUBY_COCOA
-#    define RB_CAIRO_HAS_QUARTZ_SURFACE
-#    ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TYPE
-#      define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
-#    endif
+#  define RB_CAIRO_HAS_QUARTZ_SURFACE
+#  ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TYPE
+#    define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
 #  endif
 #endif
 
@@ -106,6 +102,10 @@ VALUE rb_cCairo_CoglSurface = Qnil;
 static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
+static ID cr_id_x;
+static ID cr_id_y;
+static ID cr_id_width;
+static ID cr_id_height;
 static cairo_user_data_key_t cr_closure_key;
 static cairo_user_data_key_t cr_object_holder_key;
 static cairo_user_data_key_t cr_finished_key;
@@ -571,10 +571,10 @@ cr_surface_map_to_image (int argc, VALUE *argv, VALUE self)
       extents = &extents_value;
       if (rb_cairo__is_kind_of (rb_extents, rb_cCairo_Rectangle))
         {
-          extents->x = NUM2INT (rb_iv_get (rb_extents, "@x"));
-          extents->y = NUM2INT (rb_iv_get (rb_extents, "@y"));
-          extents->width = NUM2INT (rb_iv_get (rb_extents, "@width"));
-          extents->height = NUM2INT (rb_iv_get (rb_extents, "@height"));
+          extents->x = NUM2INT (rb_funcall (rb_extents, cr_id_x, 0));
+          extents->y = NUM2INT (rb_funcall (rb_extents, cr_id_y, 0));
+          extents->width = NUM2INT (rb_funcall (rb_extents, cr_id_width, 0));
+          extents->height = NUM2INT (rb_funcall (rb_extents, cr_id_height, 0));
         }
       else
         {
@@ -1211,7 +1211,10 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
   cairo_surface_t *surface = NULL;
   cairo_format_t format = CAIRO_FORMAT_ARGB32;
   VALUE arg1, arg2, arg3, rb_width, rb_height;
+#ifdef HAVE_RUBY_COCOA
   static VALUE rb_cOSXCGContextRef = Qnil;
+#endif
+  static VALUE rb_cFFIPointer = Qnil;
 
   rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
 
@@ -1232,20 +1235,45 @@ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
           format = RVAL2CRFORMAT (arg1);
           break;
         default:
+#ifdef HAVE_RUBY_COCOA
           if (NIL_P (rb_cOSXCGContextRef))
             rb_cOSXCGContextRef =
               rb_const_get (rb_const_get (rb_cObject, rb_intern ("OSX")),
                             rb_intern ("CGContextRef"));
+#endif
 
+          if (NIL_P (rb_cFFIPointer))
+            rb_cFFIPointer =
+              rb_const_get (rb_const_get (rb_cObject, rb_intern ("FFI")),
+                            rb_intern ("Pointer"));
+
+#ifdef HAVE_RUBY_COCOA
           if (RTEST (rb_obj_is_kind_of (arg1, rb_cOSXCGContextRef)))
-            rbobj_to_nsobj (arg1, &objc_object);
+            {
+              rbobj_to_nsobj (arg1, &objc_object);
+            }
           else
-            rb_raise (rb_eArgError,
-                      "invalid argument (expect "
-                      "(width, height), "
-                      "(format, width, height) or "
-                      "(cg_context, width, height)): %s",
-                      rb_cairo__inspect (rb_ary_new3 (3, arg1, arg2, arg3)));
+#endif
+            {
+              if (RTEST (rb_obj_is_kind_of (arg1, rb_cFFIPointer)))
+                {
+                  VALUE rb_objc_pointer;
+                  rb_objc_pointer = rb_funcall (arg1,
+                                                rb_intern ("address"),
+                                                0);
+                  objc_object = NUM2ULONG (rb_objc_pointer);
+                }
+              else
+                {
+                  rb_raise (rb_eArgError,
+                            "invalid argument (expect "
+                            "(width, height), "
+                            "(format, width, height), "
+                            "(cg_context, width, height) or "
+                            "(ffi_pointer, width, height)): %s",
+                            rb_cairo__inspect (rb_ary_new3 (3, arg1, arg2, arg3)));
+                }
+            }
           break;
         }
 
@@ -1893,6 +1921,10 @@ Init_cairo_surface (void)
   cr_id_parse = rb_intern ("parse");
   cr_id_size = rb_intern ("size");
   cr_id_set_unit = rb_intern ("unit=");
+  cr_id_x = rb_intern ("x");
+  cr_id_y = rb_intern ("y");
+  cr_id_width = rb_intern ("width");
+  cr_id_height = rb_intern ("height");
 
   rb_cCairo_Surface =
     rb_define_class_under (rb_mCairo, "Surface", rb_cObject);