rsvg2 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c96a4acbe770d71f1797a4c6219d8b600b26f90
-  data.tar.gz: fc0846b76a30a41d76830875eed8df2020ad46e3
+  metadata.gz: 0782fbf6be7c8103d52d3ba451200c2245fd766e
+  data.tar.gz: 04d00a3f561574f6ee8d925c8310c3af0a34ddc5
 SHA512:
-  metadata.gz: f953d02ecec715f3c680d5f4244856a268a346800a8afd4aafaa8064c1a7546158b435c110e933bfa0b93b174c774ee6726a77076acb1732fd23b7cfa52b2344
-  data.tar.gz: 1312ce0c729a0f0aee12c63158493df29c01855cf956400439a8a5950358796d7e61cc9f53d0f11fcacb2ad293d93336868fd4ea446cfa3daf8def281cfaf309
+  metadata.gz: 6680000ed04f702c6c063b4515d6484cc73c30a58c091dcf8b3fd4141d20e7a622ac8a841245b66a18a2fbd877be6fcfa952fdf3c4f718b8221da6cba53fb8c8
+  data.tar.gz: e7c36078118b01877e9270dbabab8cb13978418374d7da7cd3c6149558f7d24b386d1fa55bfc2fdc7535f7751727302c2196910c60cb037cdf7846590be00d94

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2010-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2010-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -52,7 +52,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "librsvg",
       :download_site => :gnome,
       :label => "librsvg",
-      :version => "2.40.6",
+      :version => "2.40.9",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/rsvg2/extconf.rb

@@ -45,7 +45,7 @@ end
 
 setup_windows(module_name, base_dir)
 
-unless required_pkg_config_package(package_id,
+unless required_pkg_config_package([package_id, 2, 16, 1],
                                    :debian => "librsvg2-dev",
                                    :redhat => "librsvg2-devel",
                                    :homebrew => "librsvg",

data/ext/rsvg2/rbrsvg.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2005-2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005-2015  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Kouhei Sutou <kou@cozmixng.org>
  *
  *  This library is free software; you can redistribute it and/or
@@ -155,22 +154,12 @@ rg_s_pixbuf_from_file_at_zoom_with_max(G_GNUC_UNUSED VALUE self,
     return rb_pixbuf;
 }
 
-static VALUE
-rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
-{
-#ifdef HAVE_LIBRSVG_RSVG_CAIRO_H
-    return Qtrue;
-#else
-    return Qfalse;
-#endif
-}
-
 void
 Init_rsvg2(void)
 {
     VALUE RG_TARGET_NAMESPACE = rb_define_module("RSVG");
 
-#if LIBRSVG_CHECK_VERSION(2, 9, 0)
+#if !LIBRSVG_CHECK_VERSION(2, 35, 0)
     rsvg_init();
     atexit(rsvg_term);
 #endif
@@ -199,8 +188,6 @@ Init_rsvg2(void)
     RG_DEF_SMETHOD(pixbuf_from_file_at_max_size, 3);
     RG_DEF_SMETHOD(pixbuf_from_file_at_zoom_with_max, 5);
 
-    RG_DEF_SMETHOD_P(cairo_available, 0);
-
     Init_rsvg_handle(RG_TARGET_NAMESPACE);
     Init_rsvg_dimensiondata(RG_TARGET_NAMESPACE);
 }

data/ext/rsvg2/rbrsvghandle.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2005-2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005-2015  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Kouhei Sutou <kou@cozmixng.org>
  *
  *  This library is free software; you can redistribute it and/or
@@ -92,96 +91,73 @@ rb_rsvg_handle_alloc(VALUE klass)
 }
 #endif
 
-#if LIBRSVG_CHECK_VERSION(2, 14, 0)
 static VALUE
-rg_s_new_from_data(G_GNUC_UNUSED VALUE self, VALUE data)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
-    GError *error = NULL;
     RsvgHandle *handle;
-
-    handle = rsvg_handle_new_from_data((const guint8 *)RVAL2CSTR(data),
-                                       RSTRING_LEN(data), &error);
-
-    if (error)
-        RAISE_GERROR(error);
-
-    return GOBJ2RVAL(handle);
-}
-
-static VALUE
-rg_s_new_from_file(int argc, VALUE *argv, VALUE self)
-{
-    VALUE rb_file_path, rb_options, rb_flags;
+    VALUE rb_options;
+    const char *file_name = NULL;
+    const guint8 *data = NULL;
+    gsize data_size = 0;
     GError *error = NULL;
-    RsvgHandle *handle;
+#if LIBRSVG_CHECK_VERSION(2, 40, 3)
+    RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
+#endif
 
-    rb_scan_args(argc, argv, "11", &rb_file_path, &rb_options);
-    rbg_scan_options(rb_options,
-                     "flags", &rb_flags,
-                     NULL);
+    rb_scan_args(argc, argv, "01", &rb_options);
 
-#if LIBRSVG_CHECK_VERSION(2, 40, 3)
-    {
-        GFile *file;
-        GCancellable *cancellable = NULL;
-        RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
+    if (!NIL_P(rb_options)) {
+        VALUE rb_file_name;
+        VALUE rb_data;
+        VALUE rb_flags;
 
+        rbg_scan_options(rb_options,
+                         "file_name", &rb_file_name,
+                         "data", &rb_data,
+                         "flags", &rb_flags,
+                         NULL);
+        if (!NIL_P(rb_file_name)) {
+            file_name = RVAL2CSTRFILENAME(rb_file_name);
+        }
+        if (!NIL_P(rb_data)) {
+            data = (const guint8 *)RSTRING_PTR(rb_data);
+            data_size = RSTRING_LEN(rb_data);
+        }
         if (!NIL_P(rb_flags)) {
+#if LIBRSVG_CHECK_VERSION(2, 40, 3)
             flags = RVAL2GFLAGS(rb_flags, RSVG_TYPE_HANDLE_FLAGS);
-        }
-
-        file = g_file_new_for_path((const char *)RVAL2CSTR(rb_file_path));
-        handle = rsvg_handle_new_from_gfile_sync(file, flags,
-                                                 cancellable,
-                                                 &error);
-        g_object_unref(file);
-    }
 #else
-    if (!NIL_P(rb_flags)) {
         rb_raise(rb_eArgError,
                  "librsvg 2.40.3 or later is required for :flags: <%d.%d.%d>",
                  LIBRSVG_MAJOR_VERSION,
                  LIBRSVG_MINOR_VERSION,
                  LIBRSVG_MICRO_VERSION);
-    }
-    handle = rsvg_handle_new_from_file((const gchar *)RVAL2CSTR(rb_file_path),
-                                       &error);
-#endif
-
-    if (error)
-        RAISE_GERROR(error);
-
-    return GOBJ2RVAL(handle);
-}
 #endif
+        }
+    }
 
-static VALUE
-rg_initialize(int argc, VALUE *argv, VALUE self)
-{
-    RsvgHandle *handle;
-    VALUE gz;
-    rb_scan_args(argc, argv, "01", &gz);
+    if (file_name) {
+#if LIBRSVG_CHECK_VERSION(2, 40, 3)
+        GFile *file;
+        GCancellable *cancellable = NULL;
 
-#if LIBRSVG_CHECK_VERSION(2, 11, 0)
-    handle = rsvg_handle_new();
+        file = g_file_new_for_path(file_name);
+        handle = rsvg_handle_new_from_gfile_sync(file, flags, cancellable,
+                                                 &error);
+        g_object_unref(file);
 #else
-    if (RVAL2CBOOL(gz)) {
-#  ifdef HAVE_LIBRSVG_RSVG_GZ_H
-        handle = rsvg_handle_new_gz();
-#  else
-        rb_warning("gz handling is not supported in your librsvg");
-        handle = rsvg_handle_new();
-#  endif
+        handle = rsvg_handle_new_from_file(file_name, &error);
+#endif
+    } else if (data) {
+        handle = rsvg_handle_new_from_data(data, data_size, &error);
     } else {
         handle = rsvg_handle_new();
     }
-#endif
 
-#ifdef RSVG_TYPE_HANDLE
+    if (error)
+        RAISE_GERROR(error);
+
     G_INITIALIZE(self, handle);
-#else
-    DATA_PTR(self) = handle;
-#endif
 
     rb_ivar_set(self, id_closed, Qfalse);
     return Qnil;
@@ -305,118 +281,6 @@ rg_metadata(VALUE self)
 #  endif
 #endif
 
-#if !LIBRSVG_CHECK_VERSION(2, 11, 0)
-/* Extended Convenience API */
-static VALUE
-rg_pixbuf_from_file_at_size(VALUE self, VALUE file_name,
-                                    VALUE width, VALUE height)
-{
-    VALUE rb_pixbuf;
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
-
-    pixbuf = rsvg_pixbuf_from_file_at_size_ex(_SELF(self),
-                                              RVAL2CSTR(file_name),
-                                              NUM2INT(width),
-                                              NUM2INT(height),
-                                              &error);
-
-    if (error) RAISE_GERROR(error);
-
-    rb_pixbuf = GOBJ2RVAL(pixbuf);
-    g_object_unref(pixbuf);
-    return rb_pixbuf;
-}
-
-static VALUE
-rg_pixbuf_from_file(VALUE self, VALUE file_name)
-{
-    VALUE rb_pixbuf;
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
-
-    pixbuf = rsvg_pixbuf_from_file_ex(_SELF(self),
-                                      RVAL2CSTR(file_name),
-                                      &error);
-
-    if (error) RAISE_GERROR(error);
-
-    rb_pixbuf = GOBJ2RVAL(pixbuf);
-    g_object_unref(pixbuf);
-    return rb_pixbuf;
-}
-
-static VALUE
-rg_pixbuf_from_file_at_zoom(VALUE self, VALUE file_name,
-                                    VALUE x_zoom, VALUE y_zoom)
-{
-    VALUE rb_pixbuf;
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
-
-    pixbuf = rsvg_pixbuf_from_file_at_zoom_ex(_SELF(self),
-                                              RVAL2CSTR(file_name),
-                                              NUM2DBL(x_zoom),
-                                              NUM2DBL(y_zoom),
-                                              &error);
-
-    if (error) RAISE_GERROR(error);
-
-    rb_pixbuf = GOBJ2RVAL(pixbuf);
-    g_object_unref(pixbuf);
-    return rb_pixbuf;
-}
-
-static VALUE
-rg_pixbuf_from_file_at_max_size(VALUE self, VALUE file_name,
-                                        VALUE max_width, VALUE max_height)
-{
-    VALUE rb_pixbuf;
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
-
-    pixbuf = rsvg_pixbuf_from_file_at_max_size_ex(_SELF(self),
-                                                  RVAL2CSTR(file_name),
-                                                  NUM2INT(max_width),
-                                                  NUM2INT(max_height),
-                                                  &error);
-
-    if (error) RAISE_GERROR(error);
-
-    rb_pixbuf = GOBJ2RVAL(pixbuf);
-    g_object_unref(pixbuf);
-    return rb_pixbuf;
-}
-
-static VALUE
-rg_pixbuf_from_file_at_zoom_with_max(VALUE self,
-                                             VALUE file_name,
-                                             VALUE x_zoom,
-                                             VALUE y_zoom,
-                                             VALUE max_width,
-                                             VALUE max_height)
-{
-    VALUE rb_pixbuf;
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
-
-    pixbuf = rsvg_pixbuf_from_file_at_zoom_with_max_ex(_SELF(self),
-                                                       RVAL2CSTR(file_name),
-                                                       NUM2DBL(x_zoom),
-                                                       NUM2DBL(y_zoom),
-                                                       NUM2INT(max_width),
-                                                       NUM2INT(max_height),
-                                                       &error);
-
-    if (error) RAISE_GERROR(error);
-
-    rb_pixbuf = GOBJ2RVAL(pixbuf);
-    g_object_unref(pixbuf);
-    return rb_pixbuf;
-}
-#endif
-
-#ifdef HAVE_LIBRSVG_RSVG_CAIRO_H
 static VALUE
 rg_render_cairo(int argc, VALUE *argv, VALUE self)
 {
@@ -432,7 +296,6 @@ rg_render_cairo(int argc, VALUE *argv, VALUE self)
 
     return Qnil;
 }
-#endif
 
 void
 Init_rsvg_handle(VALUE mRSVG)
@@ -448,11 +311,6 @@ Init_rsvg_handle(VALUE mRSVG)
     rb_define_alloc_func(RG_TARGET_NAMESPACE, rb_rsvg_handle_alloc);
 #endif
 
-#if LIBRSVG_CHECK_VERSION(2, 14, 0)
-    RG_DEF_SMETHOD(new_from_data, 1);
-    RG_DEF_SMETHOD(new_from_file, -1);
-#endif
-
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(set_size_callback, 0);
     RG_DEF_METHOD(set_dpi, 1);
@@ -475,18 +333,7 @@ Init_rsvg_handle(VALUE mRSVG)
 #  endif
 #endif
 
-#if !LIBRSVG_CHECK_VERSION(2, 11, 0)
-    /* Extended Convenience API */
-    RG_DEF_METHOD(pixbuf_from_file_at_size, 3);
-    RG_DEF_METHOD(pixbuf_from_file, 1);
-    RG_DEF_METHOD(pixbuf_from_file_at_zoom, 3);
-    RG_DEF_METHOD(pixbuf_from_file_at_max_size, 3);
-    RG_DEF_METHOD(pixbuf_from_file_at_zoom_with_max, 5);
-#endif
-
-#ifdef HAVE_LIBRSVG_RSVG_CAIRO_H
     RG_DEF_METHOD(render_cairo, -1);
-#endif
 
 #if LIBRSVG_CHECK_VERSION(2, 40, 3)
     /* RsvgHandleFlags */

data/ext/rsvg2/rsvg2.h

@@ -31,32 +31,26 @@ extern "C" {
 
 #include <rbglib.h>
 #include <rbgobject.h>
+#include <rb_cairo.h>
 
-#ifdef HAVE_LIBRSVG_RSVG_GZ_H
-#  include <librsvg/rsvg-gz.h>
-#else
-#  include <librsvg/rsvg.h>
-#endif
-
-#ifdef HAVE_RB_CAIRO_H
-#  include <rb_cairo.h>
-#  include <librsvg/rsvg-cairo.h>
-#endif
-
-#ifdef HAVE_LIBRSVG_LIBRSVG_ENUM_TYPES_H
-#  include <librsvg/librsvg-enum-types.h>
-#else
-#  include "librsvg-enum-types.h"
-#endif
+#include <librsvg/rsvg.h>
 
-#define LIBRSVG_CHECK_VERSION(major, minor, micro)                            \
-    (LIBRSVG_MAJOR_VERSION > (major) ||                                       \
+#ifndef LIBRSVG_CHECK_VERSION
+#  include <librsvg/librsvg-features.h>
+#  define LIBRSVG_CHECK_VERSION(major, minor, micro)                    \
+    (LIBRSVG_MAJOR_VERSION > (major) ||                                 \
      (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION > (minor)) || \
      (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION == (minor) && \
       LIBRSVG_MICRO_VERSION >= (micro)))
+#endif
 
 #if !LIBRSVG_CHECK_VERSION(2, 36, 2)
-#  include <librsvg/librsvg-features.h>
+#  include <librsvg/rsvg-cairo.h>
+#  ifdef HAVE_LIBRSVG_LIBRSVG_ENUM_TYPES_H
+#    include <librsvg/librsvg-enum-types.h>
+#  else
+#    include "librsvg-enum-types.h"
+#  endif
 #endif
 
 

data/lib/rsvg2.rb

@@ -1,16 +1,13 @@
 require "glib2"
 require "gdk_pixbuf2"
-begin
-  require "cairo"
-rescue LoadError
-end
+require "cairo"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/rsvg2.so"
 rescue LoadError
   require "rsvg2.so"
@@ -18,14 +15,32 @@ end
 
 module RSVG
   LOG_DOMAIN = "librsvg"
-end
 
-if RSVG.cairo_available?
-  module Cairo
-    class Context
-      def render_rsvg_handle(handle, *args, &block)
-        handle.render_cairo(self, *args, &block)
+  class << self
+    def cairo_available?
+      true
+    end
+  end
+
+  class Handle
+    class << self
+      # For backward compatibility
+      def new_from_data(data)
+        new(:data => data)
       end
+
+      # For backward compatibility
+      def new_from_file(file_name, options={})
+        new(options.merge(:file_name => file_name))
+      end
+    end
+  end
+end
+
+module Cairo
+  class Context
+    def render_rsvg_handle(handle, *args, &block)
+      handle.render_cairo(self, *args, &block)
     end
   end
 end