cairo 1.17.8 → 1.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dffa934fa956305e9ed3ba9a9a5c92956c61c09277ea1723ceb69c1bee1b5c72
-  data.tar.gz: c4a6b1aa7bc5e3e00ca1bb388272d75c726fb20a1366dcbc2f15513d06177cbd
+  metadata.gz: 05f4568d5884a55b9ec5f2490536c75737a5513ee52db87d6a1847bccb233499
+  data.tar.gz: cf202c94b822be61b2d77fcbdf49a566022038ac23447a3f4cd8780cd5fe4de3
 SHA512:
-  metadata.gz: 163b19b0d0fdbfadd8117629b95fbd51f97a84617bc77366eb5083b4e631bc3eb863c1daa51ce6e79fd0cfbe462f69215b6bc3548c9a3960e95861c799f53515
-  data.tar.gz: c266cd0dc3e254bccecae19b9f8dfb688c55404cd348446d2e34d67d263e07b1244851292aa1d8c1140e30bfa8162af1135855b99eb1da7af54c9d67d77aefba
+  metadata.gz: 569e8766de9065d5887b3de6bfe01b23fdf97f9865b392e85312a7e9e2015a7f0dfccef6ab91dccdc1cc91b48534437c3d61b927b4d799098975b0bc6fdcaa70
+  data.tar.gz: dcc158f18e380017c86d15dc94c66c0d45beb1463937f10366daf017913c1dbdcba82972efd1a76ac981ffc001328103364011816adf5c1e52cc0f8675531bdb

data/NEWS

@@ -1,3 +1,48 @@
+Release 1.17.9 (2023-06-14) Sutou Kouhei <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Dropped support for fat gem.
+    [GH-78][https://github.com/rcairo/rcairo/issues/78]
+    [Reported by Largo]
+
+  * Added support for auto native package installation with conda.
+
+  * Added support for cairo 1.17.8:
+
+    * Added Cairo::SVGFontError.
+
+    * Added Cairo::ColorMode.
+
+    * Added Cairo::FontOptions#color_mode.
+
+    * Added Cairo::FontOptions#color_mode=.
+
+    * Added Cairo::ColorPalette.
+
+    * Added Cairo::FontOptions#color_palette.
+
+    * Added Cairo::FontOptions#color_palette=.
+
+    * Added Cairo::FontOptions#set_custom_palette_color.
+
+Fixes
+-----
+
+  * Fixed the number of arguments of Cairo::GLSurface#initialize and
+    Cairo::GLTextureSurface#initialize.
+    [GH-79][https://github.com/rcairo/rcairo/issues/79]
+    [Patch by Dimitry Andric]
+
+Thanks
+------
+
+  * Largo
+
+  * Dimitry Andric
+
 Release 1.17.8 (2022-09-01) Sutou Kouhei <kou@cozmixng.org>
 ===========================================================
 

data/ext/cairo/extconf.rb

@@ -49,6 +49,7 @@ end
 
 unless required_pkg_config_package([package, major, minor, micro],
                                    :arch_linux => "cairo",
+                                   :conda => "cairo",
                                    :debian => "libcairo2-dev",
                                    :homebrew => "cairo",
                                    :macports => "cairo",

data/ext/cairo/rb_cairo.h

@@ -65,7 +65,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 17
-#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;
@@ -136,6 +136,8 @@ RB_CAIRO_VAR VALUE rb_mCairo_FontWeight;
 RB_CAIRO_VAR VALUE rb_mCairo_SubpixelOrder;
 RB_CAIRO_VAR VALUE rb_mCairo_HintStyle;
 RB_CAIRO_VAR VALUE rb_mCairo_HintMetrics;
+RB_CAIRO_VAR VALUE rb_mCairo_ColorMode;
+RB_CAIRO_VAR VALUE rb_mCairo_ColorPalette;
 RB_CAIRO_VAR VALUE rb_mCairo_FontType;
 RB_CAIRO_VAR VALUE rb_mCairo_PathDataType;
 RB_CAIRO_VAR VALUE rb_mCairo_Content;
@@ -266,6 +268,9 @@ VALUE                 rb_cairo_device_to_ruby_object         (cairo_device_t *de
 #define RVAL2CRSUBPIXELORDER(obj) (rb_cairo_subpixel_order_from_ruby_object(obj))
 #define RVAL2CRHINTSTYLE(obj)     (rb_cairo_hint_style_from_ruby_object(obj))
 #define RVAL2CRHINTMETRICS(obj)   (rb_cairo_hint_metrics_from_ruby_object(obj))
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+#define RVAL2CRCOLORMODE(obj)     (rb_cairo_color_mode_from_ruby_object(obj))
+#endif
 #define RVAL2CRPATHDATATYPE(obj)  (rb_cairo_path_data_type_from_ruby_object(obj))
 #define RVAL2CRCONTENT(obj)       (rb_cairo_content_from_ruby_object(obj))
 #define RVAL2CRFORMAT(obj)        (rb_cairo_format_from_ruby_object(obj))
@@ -311,6 +316,9 @@ cairo_font_weight_t    rb_cairo_font_weight_from_ruby_object    (VALUE obj);
 cairo_subpixel_order_t rb_cairo_subpixel_order_from_ruby_object (VALUE obj);
 cairo_hint_style_t     rb_cairo_hint_style_from_ruby_object     (VALUE obj);
 cairo_hint_metrics_t   rb_cairo_hint_metrics_from_ruby_object   (VALUE obj);
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+cairo_color_mode_t     rb_cairo_color_mode_from_ruby_object     (VALUE obj);
+#endif
 cairo_path_data_type_t rb_cairo_path_data_type_from_ruby_object (VALUE obj);
 cairo_content_t        rb_cairo_content_from_ruby_object        (VALUE obj);
 cairo_format_t         rb_cairo_format_from_ruby_object         (VALUE obj);

data/ext/cairo/rb_cairo_constants.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2005-2023 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -27,6 +27,8 @@ VALUE rb_mCairo_FontWeight;
 VALUE rb_mCairo_SubpixelOrder;
 VALUE rb_mCairo_HintStyle;
 VALUE rb_mCairo_HintMetrics;
+VALUE rb_mCairo_ColorMode;
+VALUE rb_mCairo_ColorPalette;
 VALUE rb_mCairo_PathDataType;
 VALUE rb_mCairo_Content;
 VALUE rb_mCairo_Format;
@@ -81,6 +83,9 @@ VALUE rb_mCairo_SVGUnit = Qnil;
 #define CAIRO_HINT_METRICS_MIN CAIRO_HINT_METRICS_DEFAULT
 #define CAIRO_HINT_METRICS_MAX CAIRO_HINT_METRICS_ON
 
+#define CAIRO_COLOR_MODE_MIN CAIRO_COLOR_MODE_DEFAULT
+#define CAIRO_COLOR_MODE_MAX CAIRO_COLOR_MODE_COLOR
+
 #define CAIRO_PATH_MIN CAIRO_PATH_MOVE_TO
 #define CAIRO_PATH_MAX CAIRO_PATH_CLOSE_PATH
 
@@ -182,6 +187,9 @@ DEFINE_RVAL2ENUM(font_weight, FONT_WEIGHT)
 DEFINE_RVAL2ENUM(subpixel_order, SUBPIXEL_ORDER)
 DEFINE_RVAL2ENUM(hint_style, HINT_STYLE)
 DEFINE_RVAL2ENUM(hint_metrics, HINT_METRICS)
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+DEFINE_RVAL2ENUM(color_mode, COLOR_MODE)
+#endif
 DEFINE_RVAL2ENUM(path_data_type, PATH)
 DEFINE_RVAL2ENUM(content, CONTENT)
 DEFINE_RVAL2ENUM(format, FORMAT)
@@ -529,6 +537,20 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_HintMetrics,     "OFF",
                    INT2FIX (CAIRO_HINT_METRICS_OFF));
 
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  /* cairo_color_mode_t */
+  rb_mCairo_ColorMode = rb_define_module_under (rb_mCairo, "ColorMode");
+  rb_define_const (rb_mCairo_ColorMode,     "DEFAULT",
+                   INT2FIX (CAIRO_COLOR_MODE_DEFAULT));
+  rb_define_const (rb_mCairo_ColorMode,     "NO_COLOR",
+                   INT2FIX (CAIRO_COLOR_MODE_NO_COLOR));
+  rb_define_const (rb_mCairo_ColorMode,     "COLOR",
+                   INT2FIX (CAIRO_COLOR_MODE_COLOR));
+
+  rb_mCairo_ColorPalette = rb_define_module_under (rb_mCairo, "ColorPalette");
+  rb_define_const (rb_mCairo_ColorPalette,     "DEFAULT",
+                   INT2FIX (CAIRO_COLOR_PALETTE_DEFAULT));
+#endif
 
   /* cairo_path_data_type_t */
   rb_mCairo_PathDataType = rb_define_module_under (rb_mCairo, "PathDataType");

data/ext/cairo/rb_cairo_exception.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-16 12:52:16 $
  *
- * Copyright 2010-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2010-2023 Sutou Kouhei <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -74,6 +74,9 @@ static VALUE rb_eCairo_TagError;
 #if CAIRO_CHECK_VERSION(1, 17, 6)
 static VALUE rb_eCairo_DirectWriteError;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+static VALUE rb_eCairo_SVGFontError;
+#endif
 
 void
 rb_cairo_check_status (cairo_status_t status)
@@ -229,6 +232,11 @@ rb_cairo_check_status (cairo_status_t status)
       rb_raise (rb_eCairo_DirectWriteError, "%s", string);
       break;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+    case CAIRO_STATUS_SVG_FONT_ERROR:
+      rb_raise (rb_eCairo_SVGFontError, "%s", string);
+      break;
+#endif
 #if CAIRO_CHECK_VERSION(1, 10, 0)
     case CAIRO_STATUS_LAST_STATUS:
 #else
@@ -340,6 +348,10 @@ rb_cairo__exception_to_status (VALUE exception)
   else if (rb_cairo__is_kind_of (exception, rb_eCairo_DirectWriteError))
     return CAIRO_STATUS_DWRITE_ERROR;
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  else if (rb_cairo__is_kind_of (exception, rb_eCairo_SVGFontError))
+    return CAIRO_STATUS_SVG_FONT_ERROR;
+#endif
 
   return -1;
 }
@@ -506,4 +518,10 @@ Init_cairo_exception (void)
     rb_define_class_under (rb_mCairo, "DirectWriteError",
                            rb_eCairo_Error);
 #endif
+
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  rb_eCairo_SVGFontError =
+    rb_define_class_under (rb_mCairo, "SVGFontError",
+                           rb_eCairo_Error);
+#endif
 }

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2022 Sutou Kouhei <kou@cozmixng.org>
+ * Copyright 2005-2023 Sutou Kouhei <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -196,6 +196,53 @@ cr_options_get_variations (VALUE self)
 }
 #endif
 
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+static VALUE
+cr_options_set_color_mode (VALUE self, VALUE mode)
+{
+  cairo_font_options_set_color_mode (_SELF (self),
+                                     RVAL2CRCOLORMODE (mode));
+  return self;
+}
+
+static VALUE
+cr_options_get_color_mode (VALUE self)
+{
+  return INT2NUM (cairo_font_options_get_color_mode (_SELF (self)));
+}
+
+static VALUE
+cr_options_set_color_palette (VALUE self, VALUE index)
+{
+  cairo_font_options_set_color_palette (_SELF (self),
+                                        NUM2UINT (index));
+  return self;
+}
+
+static VALUE
+cr_options_get_color_palette (VALUE self)
+{
+  return UINT2NUM (cairo_font_options_get_color_palette (_SELF (self)));
+}
+
+static VALUE
+cr_options_set_custom_palette_color (VALUE self,
+                                     VALUE index,
+                                     VALUE red,
+                                     VALUE green,
+                                     VALUE blue,
+                                     VALUE alpha)
+{
+  cairo_font_options_set_custom_palette_color (_SELF (self),
+                                               NUM2UINT (index),
+                                               NUM2DBL (red),
+                                               NUM2DBL (green),
+                                               NUM2DBL (blue),
+                                               NUM2DBL (alpha));
+  return self;
+}
+#endif
+
 void
 Init_cairo_font_options (void)
 {
@@ -234,6 +281,18 @@ Init_cairo_font_options (void)
   rb_define_method (rb_cCairo_FontOptions, "variations",
                     cr_options_get_variations, 0);
 #endif
+#if CAIRO_CHECK_VERSION(1, 17, 8)
+  rb_define_method (rb_cCairo_FontOptions, "set_color_mode",
+                    cr_options_set_color_mode, 1);
+  rb_define_method (rb_cCairo_FontOptions, "color_mode",
+                    cr_options_get_color_mode, 0);
+  rb_define_method (rb_cCairo_FontOptions, "set_color_palette",
+                    cr_options_set_color_palette, 1);
+  rb_define_method (rb_cCairo_FontOptions, "color_palette",
+                    cr_options_get_color_palette, 0);
+  rb_define_method (rb_cCairo_FontOptions, "set_custom_palette_color",
+                    cr_options_set_custom_palette_color, 5);
+#endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_FontOptions);
 }

data/ext/cairo/rb_cairo_surface.c

@@ -2352,7 +2352,7 @@ Init_cairo_surface (void)
     rb_define_class_under (rb_mCairo, "GLTextureSurface", rb_cCairo_GLSurface);
 #ifdef RB_CAIRO_HAS_GL_SURFACE
   rb_define_method (rb_cCairo_GLSurface, "initialize",
-                    cr_gl_surface_initialize, 1);
+                    cr_gl_surface_initialize, -1);
 
   rb_define_method (rb_cCairo_GLSurface, "set_size",
                     cr_gl_surface_set_size, 2);
@@ -2366,7 +2366,7 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_GLSurface);
 
   rb_define_method (rb_cCairo_GLTextureSurface, "initialize",
-                    cr_gl_texture_surface_initialize, 1);
+                    cr_gl_texture_surface_initialize, -1);
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_GLTextureSurface);
 #endif

data/lib/cairo.rb

@@ -1,28 +1,3 @@
-# vim: filetype=ruby:expandtab:shiftwidth=2:tabstop=8:softtabstop=2 :
-
-if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
-  require "pathname"
-  base_dir = Pathname(File.dirname(__FILE__))
-  base_dir = base_dir.parent + "vendor" + "local"
-  if base_dir.exist?
-    base_dir = base_dir.to_s.gsub(/\//, "\\")
-    begin
-      require "ruby_installer/runtime"
-    rescue LoadError
-    else
-      RubyInstaller::Runtime.add_dll_directory("#{base_dir}\\bin")
-    end
-    ENV["PATH"] = %w(bin lib).collect do |dir|
-      "#{base_dir}\\#{dir};"
-    end.join("") + ENV["PATH"]
-  else
-    require "rbconfig"
-    ENV["PATH"] = %w(bin lib).collect do |dir|
-      "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
-    end.join("") + ENV["PATH"]
-  end
-end
-
 require "time"
 
 module Cairo
@@ -46,13 +21,7 @@ end
 
 require "cairo/color"
 require "cairo/paper"
-
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/cairo.so"
-rescue LoadError
-  require "cairo.so"
-end
+require "cairo.so"
 require "cairo/constants"
 
 module Cairo

data/test/test_constants.rb

@@ -24,4 +24,16 @@ class ConstantsTest < Test::Unit::TestCase
     send(assertion, Cairo::MimeType, :JBIG2_GLOBAL)
     send(assertion, Cairo::MimeType, :JBIG2_GLOBAL_ID)
   end
+
+  def test_new_constants_since_1_17_8
+    if Cairo.satisfied_version?(1, 17, 8)
+      assert_const_defined(Cairo::ColorMode, :DEFAULT)
+      assert_const_defined(Cairo::ColorMode, :COLOR)
+      assert_const_defined(Cairo::ColorMode, :NO_COLOR)
+      assert_const_defined(Cairo::ColorPalette, :DEFAULT)
+    else
+      assert_not_const_defined(Cairo, :ColorMode)
+      assert_not_const_defined(Cairo, :ColorPalette)
+    end
+  end
 end

data/test/test_context.rb

@@ -105,6 +105,7 @@ class ContextTest < Test::Unit::TestCase
   sub_test_case("#tag") do
     setup do
       only_cairo_version(1, 15, 4)
+      only_not_windows
     end
 
     test("LINK") do

data/test/test_font_options.rb

@@ -62,4 +62,23 @@ class FontOptionsTest < Test::Unit::TestCase
     @options.variations = "wdth=200"
     assert_equal("wdth=200", @options.variations)
   end
+
+  test "color mode" do
+    only_cairo_version(1, 17, 8)
+    assert_equal(Cairo::ColorMode::DEFAULT, @options.color_mode)
+    @options.color_mode = Cairo::ColorMode::COLOR
+    assert_equal(Cairo::ColorMode::COLOR, @options.color_mode)
+  end
+
+  test "color palette" do
+    only_cairo_version(1, 17, 8)
+    assert_equal(Cairo::ColorPalette::DEFAULT, @options.color_palette)
+    @options.set_custom_palette_color(1,
+                                      1.0,
+                                      0.2,
+                                      0.0,
+                                      0.8)
+    @options.color_palette = 1
+    assert_equal(1, @options.color_palette)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.17.8
+  version: 1.17.9
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: native-package-installer
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cairo >= 1.2.0
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Ruby bindings for cairo