From null+rcairo at clear-code.com  Thu Sep 15 09:14:55 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Thu, 15 Sep 2011 13:14:55 +0000
Subject: [cairo-commit:00092] rcairo/rcairo [master] [windows] fix a typo.
Message-ID: <20110915131820.9F3C62C42F5@taiyaki.ru>

Kouhei Sutou	2011-09-15 13:14:55 +0000 (Thu, 15 Sep 2011)

  New Revision: 1dead4576083f7686bab1146b88727f8d2125f27

  Log:
    [windows] fix a typo.
    
    Reported by Nikolai Weibull. Thanks!!!

  Modified files:
    ext/cairo/cairo.def

  Modified: ext/cairo/cairo.def (+1 -1)
===================================================================
--- ext/cairo/cairo.def    2011-09-15 13:14:28 +0000 (b00bd99)
+++ ext/cairo/cairo.def    2011-09-15 13:14:55 +0000 (2a02a7b)
@@ -51,7 +51,7 @@ EXPORTS
     rb_cCairo_GLDevice        DATA
     rb_cCairo_ScriptDevice    DATA
     rb_cCairo_XCBDevice       DATA
-    rb_cCairo_XlibtDevice     DATA
+    rb_cCairo_XlibDevice      DATA
     rb_cCairo_XMLDevice       DATA
 
     rb_mCairo_Operator        DATA


From null+rcairo at clear-code.com  Thu Sep 15 09:14:28 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Thu, 15 Sep 2011 13:14:28 +0000
Subject: [cairo-commit:00093] rcairo/rcairo [master] suppress a warning on
	Windows.
Message-ID: <20110915131820.8F4D92C419F@taiyaki.ru>

Kouhei Sutou	2011-09-15 13:14:28 +0000 (Thu, 15 Sep 2011)

  New Revision: f59e38823439b0c52ffcc6c7b6b4bbb8e81abe37

  Log:
    suppress a warning on Windows.
    
    Patch by Nikolai Weibull. Thanks!!!

  Modified files:
    README.rdoc
    ext/cairo/rb_cairo_font_face.c

  Modified: README.rdoc (+1 -0)
===================================================================
--- README.rdoc    2011-07-20 01:22:49 +0000 (4e6e60e)
+++ README.rdoc    2011-09-15 13:14:28 +0000 (bdd0d3c)
@@ -107,3 +107,4 @@ http://cairographics.org/cgi-bin/mailman/listinfo/cairo
   * Windows support.
 * Stefan Salewski: reports a bug.
 * Mamoru Tasaka: reports a bug.
+* Nikolai Weibull: reports problems.

  Modified: ext/cairo/rb_cairo_font_face.c (+1 -1)
===================================================================
--- ext/cairo/rb_cairo_font_face.c    2011-07-20 01:22:49 +0000 (aa6d222)
+++ ext/cairo/rb_cairo_font_face.c    2011-09-15 13:14:28 +0000 (89bd73a)
@@ -211,7 +211,7 @@ cr_user_font_face_invoke_rescue (VALUE user_data, VALUE exception)
   data = (cr_user_font_face_invoke_data_t *)user_data;
   *(data->status) = rb_cairo__exception_to_status (exception);
 
-  if (*(data->status) == -1)
+  if (*(data->status) == (cairo_status_t)-1)
     rb_exc_raise (exception);
 
   return Qnil;


From null+rcairo at clear-code.com  Thu Sep 15 09:28:10 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Thu, 15 Sep 2011 13:28:10 +0000
Subject: [cairo-commit:00094] rcairo/rcairo [master] don't define needless
	functions.
Message-ID: <20110915133134.06B6E2C4184@taiyaki.ru>

Kouhei Sutou	2011-09-15 13:28:10 +0000 (Thu, 15 Sep 2011)

  New Revision: 08fa92713eafe134decef905f1fc30878b98fa2f

  Log:
    don't define needless functions.
    
    Reported by Nikolai Weibull. Thanks!!!

  Modified files:
    ext/cairo/rb_cairo_device.c

  Modified: ext/cairo/rb_cairo_device.c (+8 -0)
===================================================================
--- ext/cairo/rb_cairo_device.c    2011-09-15 13:14:55 +0000 (e22b5ee)
+++ ext/cairo/rb_cairo_device.c    2011-09-15 13:28:10 +0000 (98159e4)
@@ -22,6 +22,10 @@
 #  include <cairo-xml.h>
 #endif
 
+#if defined(CAIRO_HAS_SCRIPT_SURFACE) || defined(CAIRO_HAS_XML_SURFACE)
+#  define NEED_DEFINE_OUTPUT_INITIALIZE 1
+#endif
+
 VALUE rb_cCairo_Device = Qnil;
 VALUE rb_cCairo_DRMDevice = Qnil;
 VALUE rb_cCairo_GLDevice = Qnil;
@@ -97,6 +101,7 @@ rb_cairo_device_from_ruby_object (VALUE obj)
   return device;
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
@@ -108,6 +113,7 @@ cr_object_holder_free (void *ptr)
 {
   rb_cairo__object_holder_free (rb_cCairo_Device, ptr);
 }
+#endif
 
 static void
 cr_device_free (void *ptr)
@@ -227,6 +233,7 @@ cr_finish_all_guarded_devices_at_end (VALUE data)
                    Qnil);
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static void
 yield_and_finish (VALUE self)
 {
@@ -238,6 +245,7 @@ yield_and_finish (VALUE self)
   if (!cairo_device_get_user_data (device, &cr_finished_key))
     cr_device_finish (self);
 }
+#endif
 
 #define DEFINE_OUTPUT_INITIALIZE(type)                                  \
 static VALUE                                                            \


From null+rcairo at clear-code.com  Fri Sep 16 04:32:39 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:39 +0000
Subject: [cairo-commit:00095] rcairo/rcairo [master] Use RbConfig instead of
	deprecated Config
Message-ID: <20110918023824.19E7A2C41BA@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:39 +0000 (Fri, 16 Sep 2011)

  New Revision: d694454258e823d5ad26b0554e2f1a3a3444e8a1

  Log:
    Use RbConfig instead of deprecated Config

  Modified files:
    lib/cairo.rb

  Modified: lib/cairo.rb (+1 -1)
===================================================================
--- lib/cairo.rb    2011-09-15 13:28:10 +0000 (6c6d5c2)
+++ lib/cairo.rb    2011-09-16 08:32:39 +0000 (3f7f687)
@@ -12,7 +12,7 @@ if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
   else
     require 'rbconfig'
     ENV['PATH'] = %w(bin lib).collect do |dir|
-      "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
+      "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
     end.join('') + ENV['PATH']
   end
 end


From null+rcairo at clear-code.com  Sat Sep 17 22:17:26 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Sun, 18 Sep 2011 02:17:26 +0000
Subject: [cairo-commit:00096] rcairo/rcairo [master] [test] silence which
	output.
Message-ID: <20110918023824.3D0F42C481A@taiyaki.ru>

Kouhei Sutou	2011-09-18 02:17:26 +0000 (Sun, 18 Sep 2011)

  New Revision: 357c1dfed0928086284c45e12aebca741b5d16f8

  Log:
    [test] silence which output.

  Modified files:
    test/run-test.rb

  Modified: test/run-test.rb (+1 -1)
===================================================================
--- test/run-test.rb    2011-09-16 08:32:40 +0000 (98afe63)
+++ test/run-test.rb    2011-09-18 02:17:26 +0000 (334eb06)
@@ -5,7 +5,7 @@ ext_dir = File.join(base_dir, "ext", "cairo")
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
-if system("which make > /dev/null")
+if system("which make >/dev/null 2>&1")
   Dir.chdir(base_dir) do
     system("make > /dev/null") or exit(1)
   end


From null+rcairo at clear-code.com  Sat Sep 17 22:21:15 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Sun, 18 Sep 2011 02:21:15 +0000
Subject: [cairo-commit:00097] rcairo/rcairo [master] use with_config instead
	of direct $configure_args access.
Message-ID: <20110918023824.6C2FC2C481E@taiyaki.ru>

Kouhei Sutou	2011-09-18 02:21:15 +0000 (Sun, 18 Sep 2011)

  New Revision: b1964e6e19b990dbee8507db5ceb5a8e08ecca96

  Log:
    use with_config instead of direct $configure_args access.

  Modified files:
    ext/cairo/extconf.rb

  Modified: ext/cairo/extconf.rb (+1 -1)
===================================================================
--- ext/cairo/extconf.rb    2011-09-16 08:32:44 +0000 (adc1fa3)
+++ ext/cairo/extconf.rb    2011-09-18 02:21:15 +0000 (849fd3b)
@@ -34,7 +34,7 @@ checking_for(checking_message("Win32 OS")) do
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    unless $configure_args['--without-vendor-override']
+    if with_config('vendor-override', true)
       binary_base_dir = base_dir + "vendor" + "local"
       $CFLAGS += " -I#{binary_base_dir}/include"
       pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"


From null+rcairo at clear-code.com  Fri Sep 16 04:32:45 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:45 +0000
Subject: [cairo-commit:00098] rcairo/rcairo [master] Rename variables
	shadowing outer variables
Message-ID: <20110918023824.75C012C481F@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:45 +0000 (Fri, 16 Sep 2011)

  New Revision: 9a4fccd37fbab628ce3eb78269361ce7879adc1a

  Log:
    Rename variables shadowing outer variables

  Modified files:
    lib/cairo/color.rb
    lib/cairo/context/path.rb

  Modified: lib/cairo/color.rb (+3 -3)
===================================================================
--- lib/cairo/color.rb    2011-09-18 02:21:15 +0000 (e14f0f1)
+++ lib/cairo/color.rb    2011-09-16 08:32:45 +0000 (c76486e)
@@ -35,11 +35,11 @@ module Cairo
     def parse_hex_color(value)
       case value
       when /\A#((?:#{HEX_RE}){3,4})\z/ #
-        RGB.new(*$1.scan(/./).collect {|value| value.hex / 15.0})
+        RGB.new(*$1.scan(/./).collect {|part| part.hex / 15.0})
       when /\A#((?:#{HEX_RE}{2,2}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{2,2}/).collect {|value| value.hex / 255.0})
+        RGB.new(*$1.scan(/.{2,2}/).collect {|part| part.hex / 255.0})
       when /\A#((?:#{HEX_RE}{4,4}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{4,4}/).collect {|value| value.hex / 65535.0})
+        RGB.new(*$1.scan(/.{4,4}/).collect {|part| part.hex / 65535.0})
       else
         message = "invalid hex color format: #{value} should be "
         message << "#RGB, #RGBA, #RRGGBB, #RRGGBBAA, #RRRRGGGGBBBB "

  Modified: lib/cairo/context/path.rb (+2 -1)
===================================================================
--- lib/cairo/context/path.rb    2011-09-18 02:21:15 +0000 (7cda0d7)
+++ lib/cairo/context/path.rb    2011-09-16 08:32:45 +0000 (78e05bd)
@@ -25,7 +25,8 @@ module Cairo
           d = x
           i = -1
           type = points = nil
-          path.each do |type, points|
+          path.each do |btype, bpoints|
+            type, points = btype, bpoints
             i += 1
             break if d < parameterized_path[i]
             d -= parameterized_path[i]


From null+rcairo at clear-code.com  Fri Sep 16 04:32:40 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:40 +0000
Subject: [cairo-commit:00099] rcairo/rcairo [master] Remove unused variables
Message-ID: <20110918023824.2C3372C4794@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:40 +0000 (Fri, 16 Sep 2011)

  New Revision: 951a18f4c5feb33df63a4ae7e118b68cf91c7e89

  Log:
    Remove unused variables

  Modified files:
    lib/cairo.rb
    lib/cairo/color.rb

  Modified: lib/cairo.rb (+1 -1)
===================================================================
--- lib/cairo.rb    2011-09-16 08:32:39 +0000 (3f7f687)
+++ lib/cairo.rb    2011-09-16 08:32:40 +0000 (656fd79)
@@ -40,7 +40,7 @@ require 'cairo/color'
 require 'cairo/paper'
 
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/cairo.so"
 rescue LoadError
   require 'cairo.so'

  Modified: lib/cairo/color.rb (+1 -1)
===================================================================
--- lib/cairo/color.rb    2011-09-16 08:32:39 +0000 (7d54e83)
+++ lib/cairo/color.rb    2011-09-16 08:32:40 +0000 (e14f0f1)
@@ -11,7 +11,7 @@ module Cairo
         when :hsv, :hsva
           HSV.new(*value[1..-1])
         else
-          type, *value = value if [:rgb, :rgba].include?(value.first)
+          _, *value = value if [:rgb, :rgba].include?(value.first)
           RGB.new(*value)
         end
       when /\A#/ #


From null+rcairo at clear-code.com  Fri Sep 16 04:32:44 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:44 +0000
Subject: [cairo-commit:00100] rcairo/rcairo [master] Add
	--without-vendor-override option to extconf.rb
Message-ID: <20110918023824.6062E2C481D@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:44 +0000 (Fri, 16 Sep 2011)

  New Revision: cf0c16ffcdc741c6e324a9814664ec5f8e6b685b

  Log:
    Add --without-vendor-override option to extconf.rb
    
    When compiling rcairo on Windows without using RubyGems you might want
    to use hand-compiled libraries.  Passing --without-vendor-override
    allows you to stop rcairo from trying to set up the vendor/local
    environment.

  Modified files:
    README.rdoc
    ext/cairo/extconf.rb

  Modified: README.rdoc (+5 -0)
===================================================================
--- README.rdoc    2011-09-16 08:32:43 +0000 (bdd0d3c)
+++ README.rdoc    2011-09-16 08:32:44 +0000 (08c2af6)
@@ -44,6 +44,11 @@ Compiling:
 		       # support. So you need to install rcairo and build
 		       # Ruby/Pango with it before you run them.
 
+Options to extconf.rb:
+
+  * --without-vendor-override: Use system libraries instead of those found in
+                               vendor/local for compiling
+
 == Windows
 
 cairo-X.Y.Z-x86-mswin32.gem includes cairo related binaries.

  Modified: ext/cairo/extconf.rb (+7 -5)
===================================================================
--- ext/cairo/extconf.rb    2011-09-16 08:32:43 +0000 (ea3cb8c)
+++ ext/cairo/extconf.rb    2011-09-16 08:32:44 +0000 (adc1fa3)
@@ -34,11 +34,13 @@ checking_for(checking_message("Win32 OS")) do
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    $CFLAGS += " -I#{binary_base_dir}/include"
-    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-    PKGConfig.add_path(pkg_config_dir.to_s)
-    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    unless $configure_args['--without-vendor-override']
+      binary_base_dir = base_dir + "vendor" + "local"
+      $CFLAGS += " -I#{binary_base_dir}/include"
+      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(pkg_config_dir.to_s)
+      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    end
     true
   else
     false


From null+rcairo at clear-code.com  Fri Sep 16 04:32:43 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:43 +0000
Subject: [cairo-commit:00101] rcairo/rcairo [master] Ignore generated files
	on Windows
Message-ID: <20110918023824.51B222C481C@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:43 +0000 (Fri, 16 Sep 2011)

  New Revision: ec67e07ea06477b84540dd58db44f978c262392e

  Log:
    Ignore generated files on Windows

  Modified files:
    .gitignore

  Modified: .gitignore (+1 -0)
===================================================================
--- .gitignore    2011-09-16 08:32:42 +0000 (a52c9a7)
+++ .gitignore    2011-09-16 08:32:43 +0000 (0952d04)
@@ -1,4 +1,5 @@
 /ext/cairo/Makefile
+/ext/cairo/libruby-cairo.a
 /ext/cairo/mkmf.log
 *.so
 *.o


From null+rcairo at clear-code.com  Sat Sep 17 22:26:50 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Sun, 18 Sep 2011 02:26:50 +0000
Subject: [cairo-commit:00102] rcairo/rcairo [master] b -> _.
Message-ID: <20110918023824.8261B2C4820@taiyaki.ru>

Kouhei Sutou	2011-09-18 02:26:50 +0000 (Sun, 18 Sep 2011)

  New Revision: 898c8581eba1d97914e41f7e87f4c7e586bb061c

  Log:
    b -> _.

  Modified files:
    lib/cairo/context/path.rb

  Modified: lib/cairo/context/path.rb (+2 -2)
===================================================================
--- lib/cairo/context/path.rb    2011-09-16 08:32:45 +0000 (78e05bd)
+++ lib/cairo/context/path.rb    2011-09-18 02:26:50 +0000 (2f92545)
@@ -25,8 +25,8 @@ module Cairo
           d = x
           i = -1
           type = points = nil
-          path.each do |btype, bpoints|
-            type, points = btype, bpoints
+          path.each do |_type, _points|
+            type, points = _type, _points
             i += 1
             break if d < parameterized_path[i]
             d -= parameterized_path[i]


From null+rcairo at clear-code.com  Fri Sep 16 04:32:42 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Fri, 16 Sep 2011 08:32:42 +0000
Subject: [cairo-commit:00103] rcairo/rcairo [master] Fix font tests on
	Windows
Message-ID: <20110918023824.47CC62C481B@taiyaki.ru>

Nikolai Weibull	2011-09-16 08:32:42 +0000 (Fri, 16 Sep 2011)

  New Revision: eef70c8a8683048c7ab762f88904f48a301a7b32

  Log:
    Fix font tests on Windows

  Modified files:
    test/test_context.rb
    test/test_font_face.rb

  Modified: test/test_context.rb (+1 -1)
===================================================================
--- test/test_context.rb    2011-09-18 02:17:26 +0000 (df3e228)
+++ test/test_context.rb    2011-09-16 08:32:42 +0000 (d390e3f)
@@ -74,7 +74,7 @@ class ContextTest < Test::Unit::TestCase
     face = context.font_face
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

  Modified: test/test_font_face.rb (+1 -1)
===================================================================
--- test/test_font_face.rb    2011-09-18 02:17:26 +0000 (63f37d4)
+++ test/test_font_face.rb    2011-09-16 08:32:42 +0000 (a9a8b13)
@@ -9,7 +9,7 @@ class FontFaceTest < Test::Unit::TestCase
     face = Cairo::ToyFontFace.new
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],


From null+rcairo at clear-code.com  Sun Sep 18 20:17:07 2011
From: null+rcairo at clear-code.com (null+rcairo at clear-code.com)
Date: Mon, 19 Sep 2011 00:17:07 +0000
Subject: [cairo-commit:00104] rcairo/rcairo [master] use alias_method for
	RDoc. :<
Message-ID: <20110919002101.66A402C432E@taiyaki.ru>

Kouhei Sutou	2011-09-19 00:17:07 +0000 (Mon, 19 Sep 2011)

  New Revision: e941e56e44654e559b40aac6b6c2827166e3e7f8

  Log:
    use alias_method for RDoc. :<

  Modified files:
    lib/cairo.rb

  Modified: lib/cairo.rb (+1 -1)
===================================================================
--- lib/cairo.rb    2011-09-18 02:26:50 +0000 (656fd79)
+++ lib/cairo.rb    2011-09-19 00:17:07 +0000 (e05e50c)
@@ -128,7 +128,7 @@ module Cairo
     def rotate(radians); dup.rotate!(radians); end
     def invert; dup.invert!; end
     def multiply(other); dup.multiply!(other); end
-    alias * multiply
+    alias_method :*, :multiply
   end
 
   class FontOptions