Pull dependency fix from upstream.

Bump PKGREVISION to denote changes.

4 files changed, 62 insertions, 2 deletions

diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index 64caff4fa69..1ff3c91910b 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2017/06/10 08:27:20 tsutsui Exp $
+# $NetBSD: Makefile,v 1.63 2017/06/10 11:10:42 tsutsui Exp $
 #
 
 DISTNAME=		rsvg2-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
+PKGREVISION=		1
 COMMENT=		Ruby binding of librsvg
 CATEGORIES=		graphics
 
@@ -10,6 +11,7 @@ CONFLICTS+=		ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
 
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
 DEPENDS+=		${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
+DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
diff --git a/graphics/ruby-gnome2-rsvg/distinfo b/graphics/ruby-gnome2-rsvg/distinfo
index 695b01d473c..9993718eef4 100644
--- a/graphics/ruby-gnome2-rsvg/distinfo
+++ b/graphics/ruby-gnome2-rsvg/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2017/06/10 08:27:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.7 2017/06/10 11:10:42 tsutsui Exp $
 
 SHA1 (rsvg2-3.1.6.gem) = 85a41ef78594b2e66667fe60c5f9eda2939441d4
 RMD160 (rsvg2-3.1.6.gem) = 1aaf58bdfddd492a2f0c483415f469b6c3566721
 SHA512 (rsvg2-3.1.6.gem) = a6e2fa8b4d6ca723e4e08855627a0827cddc895a558113dd8c43887cb3072724181eb49deebea36d701a8ca24a3617c5d84078e65fc01c8df596b15703b85e44
 Size (rsvg2-3.1.6.gem) = 18944 bytes
+SHA1 (patch-Rakefile) = 9af0355c66136992b9da816c17736675262ef122
+SHA1 (patch-lib_rsvg2.rb) = d4ebbec68638791c4256fd2ee64408a3de8fa9f6
diff --git a/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile b/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile
new file mode 100644
index 00000000000..2863dd921dd
--- /dev/null
+++ b/graphics/ruby-gnome2-rsvg/patches/patch-Rakefile
@@ -0,0 +1,41 @@
+$NetBSD: patch-Rakefile,v 1.1 2017/06/10 11:10:42 tsutsui Exp $
+
+- pull dependency fix from upstream
+  https://github.com/ruby-gnome2/ruby-gnome2/commit/9ddac28ccf948a4db7d49ea87fda034f9411e3e5
+
+--- Rakefile.orig	2017-06-10 11:04:23.000000000 +0000
++++ Rakefile
+@@ -1,6 +1,6 @@
+ # -*- ruby -*-
+ #
+-# Copyright (C) 2010-2015  Ruby-GNOME2 Project Team
++# Copyright (C) 2010-2017  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
+@@ -22,7 +22,11 @@ require 'gnome2-raketask'
+ package_task = GNOME2::Rake::PackageTask.new do |package|
+   package.summary = "Ruby/Rsvg is a Ruby binding of librsvg-2.x."
+   package.description = "Ruby/Rsvg is a Ruby binding of librsvg-2.x."
+-  package.dependency.gem.runtime = [["cairo", ">= 1.12.8"], "gdk_pixbuf2"]
++  package.dependency.gem.runtime = [
++    ["cairo", ">= 1.12.8"],
++    "gdk_pixbuf2",
++    "cairo-gobject",
++  ]
+   package.windows.packages = []
+   package.windows.dependencies = []
+   package.windows.build_dependencies = [
+@@ -30,9 +34,12 @@ package_task = GNOME2::Rake::PackageTask
+     "gobject-introspection",
+     "pango",
+     "gdk_pixbuf2",
++    "cairo-gobject",
+   ]
+   package.windows.gobject_introspection_dependencies = [
++    "pango",
+     "gdk_pixbuf2",
++    "cairo-gobject",
+   ]
+   package.cross_compiling do |spec|
+     if /mingw|mswin/ =~ spec.platform.to_s
diff --git a/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb b/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb
new file mode 100644
index 00000000000..e034615555d
--- /dev/null
+++ b/graphics/ruby-gnome2-rsvg/patches/patch-lib_rsvg2.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_rsvg2.rb,v 1.1 2017/06/10 11:10:42 tsutsui Exp $
+
+- pull dependency fix from upstream
+  https://github.com/ruby-gnome2/ruby-gnome2/commit/9ddac28ccf948a4db7d49ea87fda034f9411e3e5
+
+--- lib/rsvg2.rb.orig	2017-06-10 11:04:23.000000000 +0000
++++ lib/rsvg2.rb
+@@ -18,6 +18,7 @@ require "gobject-introspection"
+ require "glib2"
+ require "gio2"
+ require "gdk_pixbuf2"
++require "cairo-gobject"
+ require "cairo"
+ 
+ base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path