cairo 1.15.12 → 1.15.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9246c27ad4be18800b673b550196fe792d437811807e5e532c687c815389cd09
-  data.tar.gz: 944ff6cf52ecf2c8d5f21093a535b3032e4bfa16dc44fb7c6c85f1af05eafab4
+  metadata.gz: 872d797ea9046334f26dea74fdf385c09f64fdaa8ec808730f54295a8f395a47
+  data.tar.gz: 4d7b4fb50859438dfc8c6fbaf23cf40b37e76cdab1279d2b36efe0327eeb8e8b
 SHA512:
-  metadata.gz: 33b0640ad6a3eb1846496ecc946bc87dc78f90110b785b4283f7e8f8f289fcc8a750fea08b8f62b94e491fcbb68c56d74e9947c6265d5521a3d3b775786884ea
-  data.tar.gz: 908b0cdfd11c78fedad6b475fd6604c3524bf5fb185a1a2105b6ddd9a7381bb202e45ffd71227059af32ee04bc8d50ef7a119248b5fae0b7abb0a64defbfcf7b
+  metadata.gz: c4ee0593dfac55f08f8746c8bf25ea7c77d1d02ceb1960e30b653971440956bb694ad117e9807d9ba044be5856d9bf8fc96850beefbca7098d50d5909037a4a2
+  data.tar.gz: 11c1ae52aeca7cb823a9d5e87d83f389425e6d1ec6fbc8dac662fd4c218e2294928351f14ed5fb6010f092b674094ea34379a24ca5d23a52b5472ceba45fd97b

data/NEWS

@@ -1,3 +1,15 @@
+Release 1.15.13 (2018-05-01) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added cairo 1.15.12 support.
+
+    * Added Cairo::FontOptions#variations
+
+    * Added Cairo::FontOptions#variations=
+
 Release 1.15.12 (2018-03-14) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/Rakefile

@@ -404,11 +404,7 @@ class WindowsTask
   end
 
   def ruby_gnome2_dir
-    if RCairoBuild.for_64bit?
-      @base_dir.parent + "ruby-gnome2.win64"
-    else
-      @base_dir.parent + "ruby-gnome2.win32"
-    end
+    @base_dir.parent + "ruby-gnome2"
   end
 
   def ruby_glib2_pkg_config_path
@@ -489,7 +485,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "fontconfig",
-      :version => "2.12.4",
+      :version => "2.13.0",
       :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -511,7 +507,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.15.10",
+      :version => "1.15.12",
       :download_site => :cairo_snapshots,
       :windows => {
         :built_file => "bin/libcairo-2.dll",

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 12
+#define RB_CAIRO_VERSION_MICRO 13
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -163,6 +163,27 @@ cr_options_get_hint_metrics (VALUE self)
   return INT2NUM (cairo_font_options_get_hint_metrics (_SELF (self)));
 }
 
+#if CAIRO_CHECK_VERSION(1, 15, 12)
+static VALUE
+cr_options_set_variations (VALUE self, VALUE variations)
+{
+  cairo_font_options_set_variations (_SELF (self),
+                                     RVAL2CSTR (variations));
+  return self;
+}
+
+static VALUE
+cr_options_get_variations (VALUE self)
+{
+  const char *variations;
+
+  variations = cairo_font_options_get_variations (_SELF (self));
+  if (!variations)
+    return Qnil;
+
+  return CSTR2RVAL (variations);
+}
+#endif
 
 void
 Init_cairo_font_options (void)
@@ -196,6 +217,12 @@ Init_cairo_font_options (void)
                     cr_options_set_hint_metrics, 1);
   rb_define_method (rb_cCairo_FontOptions, "hint_metrics",
                     cr_options_get_hint_metrics, 0);
+#if CAIRO_CHECK_VERSION(1, 15, 12)
+  rb_define_method (rb_cCairo_FontOptions, "set_variations",
+                    cr_options_set_variations, 1);
+  rb_define_method (rb_cCairo_FontOptions, "variations",
+                    cr_options_get_variations, 0);
+#endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_FontOptions);
 }

data/test/test_font_options.rb

@@ -55,4 +55,11 @@ class FontOptionsTest < Test::Unit::TestCase
       assert_equal(:value, hash[@options.dup])
     end
   end
+
+  test "variations" do
+    only_cairo_version(1, 15, 12)
+    assert_nil(@options.variations)
+    @options.variations = "wdth=200"
+    assert_equal("wdth=200", @options.variations)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.15.12
+  version: 1.15.13
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config