rsvg2 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f06e8b63ec6c3e35fbdedf1d3e38b174d747954
-  data.tar.gz: dacccb9f8920f63aa365a7bc512e7908ba7888d8
+  metadata.gz: f2c6d80cf1abaee2e065ede4c4e5e32e1548983b
+  data.tar.gz: 7b532c1882475492bc85b9e6465704f07ea00a90
 SHA512:
-  metadata.gz: 2d7f532dc0d84d87a5d24c7ab277f5398dd218479eb68350edb5999df5fb216bb6d17b09ea01f0de49d091b7d49d8b12fe97b1136f2f009696e89c39bab27f3b
-  data.tar.gz: 4637ad9d754689a1e27ab5287cafb717d0ead5e3a1b6beb9ebdbf075b62c9a337aa0cc141129e64383d64ea878146d2977a467a9120421942095a66734c24b88
+  metadata.gz: eaa431733aeabac011a7c0b4cb73b06765f581208fb81212c0d46cdb6442912d30d932943f4304d29668561ed0fdd36b5684fe7ce6badd4a8b1e5af6c90520bc
+  data.tar.gz: 7942170fcb4db6d77235dc647d4ca19b32c154b541e315395d2b06f8275d9bd8e32592c1bd9862dd3c5bc2ac444753541bd2e0a1dceb70ce963bb52e85714aef

data/Rakefile

@@ -52,14 +52,13 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "librsvg",
       :download_site => :gnome,
       :label => "librsvg",
-      :version => "2.40.1",
+      :version => "2.40.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
         ],
         :patches => [
-          "librsvg-2.40.1-replace-canonicalize-file-name.diff",
         ],
         :built_file => "bin/librsvg-2-2.dll",
       },

data/ext/rsvg2/extconf.rb

@@ -39,24 +39,11 @@ end
                      :target_build_dir => build_dir)
 end
 
-rcairo_options = {}
-rcairo_source_dir_names = ["rcairo"]
-if /mingw|cygwin|mswin/ =~ RUBY_PLATFORM
-  rcairo_source_dir_names.unshift("rcairo.win32")
-end
-rcairo_source_dir_names.each do |rcairo_source_dir_name|
-  rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
-  if rcairo_source_dir.exist?
-    rcairo_options[:rcairo_source_dir] = rcairo_source_dir.to_s
-    break
-  end
-end
-
-unless check_cairo(rcairo_options)
+unless check_cairo(:top_dir => top_dir)
   exit(false)
 end
 
-setup_win32(module_name, base_dir)
+setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package(package_id,
                                    :debian => "librsvg2-dev",

data/ext/rsvg2/rbrsvghandle.c

@@ -109,13 +109,44 @@ rg_s_new_from_data(G_GNUC_UNUSED VALUE self, VALUE data)
 }
 
 static VALUE
-rg_s_new_from_file(G_GNUC_UNUSED VALUE self, VALUE file)
+rg_s_new_from_file(int argc, VALUE *argv, VALUE self)
 {
+    VALUE rb_file_path, rb_options, rb_flags;
     GError *error = NULL;
     RsvgHandle *handle;
 
-    handle = rsvg_handle_new_from_file((const gchar *)RVAL2CSTR(file),
+    rb_scan_args(argc, argv, "11", &rb_file_path, &rb_options);
+    rbg_scan_options(rb_options,
+                     "flags", &rb_flags,
+                     NULL);
+
+#if LIBRSVG_CHECK_VERSION(2, 40, 3)
+    {
+        GFile *file;
+        GCancellable *cancellable = NULL;
+        RsvgHandleFlags flags = RSVG_HANDLE_FLAGS_NONE;
+
+        if (!NIL_P(rb_flags)) {
+            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);
@@ -232,21 +263,6 @@ rg_pixbuf(int argc, VALUE *argv, VALUE self)
     return rb_pixbuf;
 }
 
-#if LIBRSVG_CHECK_VERSION(2, 9, 0)
-static VALUE
-rg_base_uri(VALUE self)
-{
-    return CSTR2RVAL(rsvg_handle_get_base_uri(_SELF(self)));
-}
-
-static VALUE
-rg_set_base_uri(VALUE self, VALUE base_uri)
-{
-    rsvg_handle_set_base_uri(_SELF(self), RVAL2CSTR(base_uri));
-    return self;
-}
-#endif
-
 #ifdef HAVE_TYPE_RSVGDIMENSIONDATA
 static VALUE
 rg_dimensions(VALUE self)
@@ -266,6 +282,7 @@ rg_dimensions(VALUE self)
 }
 #endif
 
+#if !LIBRSVG_CHECK_VERSION(2, 36, 0)
 /* Accessibility API */
 static VALUE
 rg_title(VALUE self)
@@ -279,12 +296,13 @@ rg_desc(VALUE self)
     return CSTR2RVAL(rsvg_handle_get_desc(_SELF(self)));
 }
 
-#ifdef HAVE_RSVG_HANDLE_GET_METADATA
+#  ifdef HAVE_RSVG_HANDLE_GET_METADATA
 static VALUE
 rg_metadata(VALUE self)
 {
     return CSTR2RVAL(rsvg_handle_get_metadata(_SELF(self)));
 }
+#  endif
 #endif
 
 #if !LIBRSVG_CHECK_VERSION(2, 11, 0)
@@ -432,7 +450,7 @@ Init_rsvg_handle(VALUE mRSVG)
 
 #if LIBRSVG_CHECK_VERSION(2, 14, 0)
     RG_DEF_SMETHOD(new_from_data, 1);
-    RG_DEF_SMETHOD(new_from_file, 1);
+    RG_DEF_SMETHOD(new_from_file, -1);
 #endif
 
     RG_DEF_METHOD(initialize, -1);
@@ -444,20 +462,17 @@ Init_rsvg_handle(VALUE mRSVG)
     RG_DEF_METHOD_P(closed, 0);
     RG_DEF_METHOD(pixbuf, -1);
 
-#if LIBRSVG_CHECK_VERSION(2, 9, 0)
-    RG_DEF_METHOD(base_uri, 0);
-    RG_DEF_METHOD(set_base_uri, 1);
-#endif
-
 #ifdef HAVE_TYPE_RSVGDIMENSIONDATA
     RG_DEF_METHOD(dimensions, 0);
 #endif
 
+#if !LIBRSVG_CHECK_VERSION(2, 36, 0)
     /* Accessibility API */
     RG_DEF_METHOD(title, 0);
     RG_DEF_METHOD(desc, 0);
-#ifdef HAVE_RSVG_HANDLE_GET_METADATA
+#  ifdef HAVE_RSVG_HANDLE_GET_METADATA
     RG_DEF_METHOD(metadata, 0);
+#  endif
 #endif
 
 #if !LIBRSVG_CHECK_VERSION(2, 11, 0)
@@ -472,4 +487,10 @@ Init_rsvg_handle(VALUE mRSVG)
 #ifdef HAVE_LIBRSVG_RSVG_CAIRO_H
     RG_DEF_METHOD(render_cairo, -1);
 #endif
+
+#if LIBRSVG_CHECK_VERSION(2, 40, 3)
+    /* RsvgHandleFlags */
+    G_DEF_CLASS(RSVG_TYPE_HANDLE_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, RSVG_TYPE_HANDLE_FLAGS, "RSVG_HANDLE_");
+#endif
 }

data/ext/rsvg2/rsvg2.h

@@ -49,14 +49,16 @@ extern "C" {
 #  include "librsvg-enum-types.h"
 #endif
 
-#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)))
 
+#if !LIBRSVG_CHECK_VERSION(2, 36, 2)
+#  include <librsvg/librsvg-features.h>
+#endif
+
 
 G_GNUC_INTERNAL void Init_rsvg_handle(VALUE mRSVG);
 G_GNUC_INTERNAL void Init_rsvg_dimensiondata(VALUE mRSVG);

data/test/rsvg2-test-utils.rb

@@ -0,0 +1,23 @@
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "test-unit"
+require "test/unit/notify"
+
+require "fileutils"
+
+module RSVG2TestUtils
+end

data/test/run-test.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
+ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
+
+glib_base = File.join(ruby_gnome2_base, "glib2")
+gdk_pixbuf2_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
+rsvg2_base = File.join(ruby_gnome2_base, "rsvg2")
+
+have_make = system("which make > /dev/null")
+
+modules = [
+  [glib_base, "glib2"],
+  [gdk_pixbuf2_base, "gdk_pixbuf2"],
+  [rsvg2_base, "rsvg2"],
+]
+modules.each do |target, module_name|
+  if File.exist?(File.join(target, "Makefile")) and have_make
+    `make -C #{target.dump} > /dev/null` or exit(false)
+  end
+  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
+  $LOAD_PATH.unshift(File.join(target, "lib"))
+end
+
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require "glib-test-init"
+
+$LOAD_PATH.unshift(File.join(rsvg2_base, "test"))
+require "rsvg2-test-utils"
+
+require "rsvg2"
+
+exit Test::Unit::AutoRunner.run(true)

data/test/test-handle.rb

@@ -0,0 +1,91 @@
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestHandle < Test::Unit::TestCase
+  sub_test_case ".new_from_file" do
+    sub_test_case "options" do
+      def setup
+        setup_svg
+      end
+
+      def setup_svg
+        @svg_path = "tmp/empty.svg"
+        return if File.exist?(@svg_path)
+
+        FileUtils.mkdir_p(File.dirname(@svg_path))
+        File.open(@svg_path, "w") do |svg|
+          svg.puts(<<-SVG)
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg>
+</svg>
+          SVG
+        end
+      end
+
+      def test_empty_options
+        handle = RSVG::Handle.new_from_file(@svg_path, {})
+        assert_equal([0, 0, 0.0, 0.0],
+                     handle.dimensions.to_a)
+      end
+    end
+
+    sub_test_case ":flags => :unlimited" do
+      def setup
+        setup_large_svg
+      end
+
+      def setup_large_svg
+        @large_svg_path = "tmp/large-file.svg"
+        return if File.exist?(@large_svg_path)
+
+        FileUtils.mkdir_p(File.dirname(@large_svg_path))
+        large_byte = (10 * 1024 * 1024).to_i
+        File.open(@large_svg_path, "w") do |svg|
+          svg.puts(<<-SVG_HEADER)
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg>
+          SVG_HEADER
+          large_byte.times do
+            svg.puts("\n")
+          end
+          svg.puts(<<-SVG_FOOTER)
+</svg>
+          SVG_FOOTER
+        end
+      end
+
+      def test_no_option
+        assert_raise(RSVG::Error::Failed) do
+          RSVG::Handle.new_from_file(@large_svg_path)
+        end
+      end
+
+      def test_unlimited
+        handle = RSVG::Handle.new_from_file(@large_svg_path,
+                                            :flags => :flag_unlimited)
+        assert_equal([0, 0, 0.0, 0.0],
+                     handle.dimensions.to_a)
+      end
+
+      def test_base_uri
+        handle = RSVG::Handle.new
+        uri_string = "test_base_uri"
+        handle.base_uri = uri_string
+        assert_match(uri_string, handle.base_uri)
+      end
+    end
+  end
+end

data/vendor/local/bin/croco-0.6-config

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-prefix=/home/kou/work/ruby/ruby-gnome2.win32/rsvg2/vendor/local
+prefix=/home/vagrant/ruby-gnome2.win32/rsvg2/vendor/local
 exec_prefix=${prefix}
 exec_prefix_set=no
 includedir=${prefix}/include
@@ -68,11 +68,11 @@ while test $# -gt 0; do
 	;;
 
     --cflags)
-	echo -mms-bitfields -I/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/include/glib-2.0 -I/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib/glib-2.0/include -I/home/kou/work/ruby/rcairo.win32/vendor/local/include/libxml2  @GLIB2_CFLAGS@ @LIBXML2_CFLAGS@
+	echo -mms-bitfields -I/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/include -I/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/include/glib-2.0 -I/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib/glib-2.0/include -I/home/vagrant/rcairo.win32/vendor/local/include/libxml2  @GLIB2_CFLAGS@ @LIBXML2_CFLAGS@
        	;;
 
     --libs)
-	echo -L/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/kou/work/ruby/rcairo.win32/vendor/local/lib -lglib-2.0 -lintl -lxml2  @GLIB2_LIBS@ @LIBXML2_LIBS@
+	echo -L/home/vagrant/ruby-gnome2.win32/glib2/vendor/local/lib -L/home/vagrant/rcairo.win32/vendor/local/lib -lglib-2.0 -lintl -lxml2  @GLIB2_LIBS@ @LIBXML2_LIBS@
        	;;
 
     *)

data/vendor/local/include/librsvg-2.0/librsvg/librsvg-features.h

@@ -7,8 +7,8 @@
 
 #define LIBRSVG_MAJOR_VERSION (2)
 #define LIBRSVG_MINOR_VERSION (40)
-#define LIBRSVG_MICRO_VERSION (1)
-#define LIBRSVG_VERSION "2.40.1"
+#define LIBRSVG_MICRO_VERSION (6)
+#define LIBRSVG_VERSION "2.40.6"
 
 #define LIBRSVG_CHECK_VERSION(major,minor,micro) \
   (LIBRSVG_MAJOR_VERSION > (major) || \

data/vendor/local/include/librsvg-2.0/librsvg/rsvg.h

@@ -54,8 +54,9 @@ GType rsvg_handle_get_type (void);
 
 /**
  * RsvgError:
+ * @RSVG_ERROR_FAILED: the request failed
  *
- * An enumeration representing possible error domains
+ * An enumeration representing possible errors
  */
 typedef enum {
     RSVG_ERROR_FAILED
@@ -67,7 +68,7 @@ GQuark rsvg_error_quark (void) G_GNUC_CONST;
 /**
  * RsvgHandle:
  *
- * The RsvgHandle is an object representing the parsed form of a SVG
+ * The #RsvgHandle is an object representing the parsed form of a SVG
  */
 typedef struct _RsvgHandle RsvgHandle;
 typedef struct RsvgHandlePrivate RsvgHandlePrivate;
@@ -75,9 +76,16 @@ typedef struct _RsvgHandleClass RsvgHandleClass;
 typedef struct _RsvgDimensionData RsvgDimensionData;
 typedef struct _RsvgPositionData RsvgPositionData;
 
+/**
+ * RsvgHandleClass:
+ * @parent: parent class
+ *
+ * Class structure for #RsvgHandle
+ */
 struct _RsvgHandleClass {
     GObjectClass parent;
 
+    /*< private >*/
     gpointer _abi_padding[15];
 };
 
@@ -107,6 +115,9 @@ struct _RsvgDimensionData {
 
 /**
  * RsvgPositionData:
+ * @x: position on the x axis
+ * @y: position on the y axis
+ *
  * Position of an SVG fragment.
  */
 struct _RsvgPositionData {
@@ -141,9 +152,22 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
 
 /* GIO APIs */
 
+/**
+ * RsvgHandleFlags:
+ * @RSVG_HANDLE_FLAGS_NONE: none
+ * @RSVG_HANDLE_FLAG_UNLIMITED: Allow any SVG XML without size limitations.
+ *   For security reasons, this should only be used for trusted input!
+ *   Since: 2.40.3
+ * @RSVG_HANDLE_FLAG_KEEP_IMAGE_DATA: Keeps the image data when loading images,
+ *  for use by cairo when painting to e.g. a PDF surface. This will make the
+ *  resulting PDF file smaller and faster.
+ *  Since: 2.40.3
+ */
 typedef enum /*< flags >*/ 
 {
-    RSVG_HANDLE_FLAGS_NONE        = 0
+    RSVG_HANDLE_FLAGS_NONE           = 0,
+    RSVG_HANDLE_FLAG_UNLIMITED       = 1 << 0,
+    RSVG_HANDLE_FLAG_KEEP_IMAGE_DATA = 1 << 1
 } RsvgHandleFlags;
 
 RsvgHandle *rsvg_handle_new_with_flags (RsvgHandleFlags flags);
@@ -183,15 +207,12 @@ RSVG_DEPRECATED_FOR(g_object_unref)
 void rsvg_handle_free (RsvgHandle * handle);
 
 /**
- * RsvgSizeFunc ():
- * @width: Pointer to where to set/store the width
- * @height: Pointer to where to set/store the height
- * @user_data: User data pointer
+ * RsvgSizeFunc:
+ * @width: (out): the width of the SVG
+ * @height: (out): the height of the SVG
+ * @user_data: user data
  *
  * Function to let a user of the library specify the SVG's dimensions
- * @width: the ouput width the SVG should be
- * @height: the output height the SVG should be
- * @user_data: user data
  *
  * Deprecated: Set up a cairo matrix and use rsvg_handle_render_cairo() instead.
  */