[DRE-commits] [ruby-cairo] 07/13: New upstream version 1.14.3

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository ruby-cairo.

commit b68a0c936f48cbca205779e9d84017ad0560fee7
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Wed Oct 26 12:41:43 2016 +0900

    New upstream version 1.14.3
---
 NEWS                                               | 14 ++++++++++++++
 Rakefile                                           | 22 +++++++++++++++++-----
 ext/cairo/extconf.rb                               |  2 --
 ext/cairo/rb_cairo.c                               |  2 --
 ext/cairo/rb_cairo.h                               |  4 ++--
 ..._quartz_surface.m => rb_cairo_quartz_surface.c} |  0
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 0512554..57c1bff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 1.14.3 (2015-09-08) Kouhei Sutou <kou at cozmixng.org>
+===========================================================
+
+Fixes
+-----
+
+ * Fixed run-time error on OS X.
+   [shocker-ja:1270][Reported by Junichi Oya]
+
+Thanks
+------
+
+ * Junichi Oya
+
 Release 1.14.2 (2015-09-06) Kouhei Sutou <kou at cozmixng.org>
 ===========================================================
 
diff --git a/Rakefile b/Rakefile
index 1bb203e..586da12 100644
--- a/Rakefile
+++ b/Rakefile
@@ -527,13 +527,25 @@ windows_task.define
 
 namespace :vm do
   namespace :windows do
-    desc "Build all packages for Windows in VM"
-    task :build do
-      cd("build") do
-        sh("vagrant", "destroy", "--force")
-        sh("vagrant", "up")
+    architectures = ["32", "64"]
+    build_tasks = []
+
+    namespace :build do
+      architectures.each do |architecture|
+        desc "Build all packages for Windows #{architecture}"
+        task_name = "win#{architecture}"
+        build_tasks << task_name
+        task task_name do
+          cd("build") do
+            sh("vagrant", "destroy", "--force", task_name)
+            sh("vagrant", "up", task_name)
+          end
+        end
       end
     end
+
+    desc "Build all packages for Windows"
+    task :build => build_tasks
   end
 end
 
diff --git a/ext/cairo/extconf.rb b/ext/cairo/extconf.rb
index ccdf26d..867f209 100755
--- a/ext/cairo/extconf.rb
+++ b/ext/cairo/extconf.rb
@@ -199,8 +199,6 @@ checking_for(checking_message("Mac OS X")) do
     end
     true
   else
-    MakeMakefile::C_EXT.delete("m")
-    MakeMakefile::SRC_EXT.delete("m")
     false
   end
 end
diff --git a/ext/cairo/rb_cairo.c b/ext/cairo/rb_cairo.c
index c46f571..91e6b4a 100644
--- a/ext/cairo/rb_cairo.c
+++ b/ext/cairo/rb_cairo.c
@@ -99,9 +99,7 @@ Init_cairo ()
   Init_cairo_region ();
   Init_cairo_device ();
   Init_cairo_surface ();
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
   Init_cairo_quartz_surface ();
-#endif
   Init_cairo_exception ();
   Init_cairo_font ();
   Init_cairo_font_extents ();
diff --git a/ext/cairo/rb_cairo.h b/ext/cairo/rb_cairo.h
index 821e5d4..019bcc3 100644
--- a/ext/cairo/rb_cairo.h
+++ b/ext/cairo/rb_cairo.h
@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2014 Kouhei Sutou <kou at cozmixng.org>
+ * Copyright 2006-2015 Kouhei Sutou <kou at cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin at freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental at rydia.com>
  *
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 14
-#define RB_CAIRO_VERSION_MICRO 2
+#define RB_CAIRO_VERSION_MICRO 3
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
diff --git a/ext/cairo/rb_cairo_quartz_surface.m b/ext/cairo/rb_cairo_quartz_surface.c
similarity index 100%
rename from ext/cairo/rb_cairo_quartz_surface.m
rename to ext/cairo/rb_cairo_quartz_surface.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-cairo.git