From 98c6736c1b734dbadf970cf05e8f463e395c3af3 Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 31 May 2009 09:00:48 +0000 Subject: Update ruby-gnome2 to 0.19.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit == Ruby-GNOME2 0.19.0: 2009-05-29 This release supports new versions of panel-applet and xulrunner and fixes various bugs including some GC issues === Changes Ruby/GLib2: * add 'const' to name argument of rbgerr_define_gerror() [Nikolai Weibull, Kouhei Sutou] * Bug fixes: * #2420281: Failed to build [troels knak-nielsen, Kouhei Sutou] * #2493874: glib/rbglib_maincontext.c error in "RUBY_UBF_IO" [boo, Kouhei Sutou] * wrong priority conversion in GLib::Timeout.add and GLib::Timeout.add_seconds. [Nikolai Weibull] * fixed limits of basic types [Pascal Terjan] Ruby/GTK2: * Bug fixes: * fixed initialize function is deleted. [kimura wataru, Kouhei Sutou] * checked GTK_FILE_SYSTEM_ERROR availability. GTK+ 2.15.x doesn't have it. [Kouhei Sutou] * fixed GC problems. [Kouhei Sutou] * #2195432: Gtk::RCStyle.set_color_flags wrong conversion [Jesse van den Kieboom, Kouhei Sutou] * #2318481: gtkselectiondata_set Drag and Drop API problem [dave foster, Kouhei Sutou] * #2420281: Failed to build [troels knak-nielsen, Kouhei Sutou] Ruby/Pango: * added Pango::Attribute#start_index= and Pango::Attribute#end_index=. [Geoff Youngs, Kouhei Sutou] Ruby/Poppler: * removed 0.6.x support. 0.8.0 or later is required. [Kouhei Sutou] Ruby/RSVG2: * fixed broken cairo integration. [James Healy, Kouhei Sutou] Ruby/PanelApplet: * #2466921: fixed build failure with libpanel-applet >= 2.25 [Mamoru Tasaka, Kouhei Sutou] * fixed incomplete install. [Pascal Terjan, Kouhei Sutou] Ruby/GtkMozEmbed: * supported XULRunner 1.9.0. [Arnaud Cornet, Kouhei Sutou] Ruby/GNOME2: * supported MinGW. [id:luna_8bit, Kouhei Sutou] Ruby/Bonobo2: * moved Bonobo.setup_x_error_handler to Ruby/BonoboUI2. [id:luna_8bit, Kouhei Sutou] Ruby/BonoboUI2: * moved Bonobo.setup_x_error_handler from Ruby/Bonobo2. [id:luna_8bit, Kouhei Sutou] Ruby/GnomeVFS: * format security error. [Pascal Terjan] === Thanks * kimura wataru * Philipp Götzinger * Andrew S. Townley * Jesse van den Kieboom * James Healy * dave foster * troels knak-nielsen * boo * Geoff Youngs * Arnaud Cornet * id:luna_8bit * ... --- meta-pkgs/ruby-gnome2/Makefile.common | 33 +++++++++++-- meta-pkgs/ruby-gnome2/distinfo | 28 +++++------ meta-pkgs/ruby-gnome2/patches/patch-aa | 4 +- meta-pkgs/ruby-gnome2/patches/patch-ab | 10 ++-- meta-pkgs/ruby-gnome2/patches/patch-ac | 4 +- meta-pkgs/ruby-gnome2/patches/patch-ad | 4 +- meta-pkgs/ruby-gnome2/patches/patch-af | 4 +- meta-pkgs/ruby-gnome2/patches/patch-ag | 4 +- meta-pkgs/ruby-gnome2/patches/patch-an | 4 +- meta-pkgs/ruby-gnome2/patches/patch-ao | 24 +++++----- meta-pkgs/ruby-gnome2/patches/patch-ap | 4 +- meta-pkgs/ruby-gnome2/patches/patch-ar | 85 ++++++++++++++++++++++++++++++++++ meta-pkgs/ruby-gnome2/patches/patch-as | 15 ++++++ 13 files changed, 184 insertions(+), 39 deletions(-) create mode 100644 meta-pkgs/ruby-gnome2/patches/patch-ar create mode 100644 meta-pkgs/ruby-gnome2/patches/patch-as (limited to 'meta-pkgs') diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common index 3357c3fcf34..f0692addce1 100644 --- a/meta-pkgs/ruby-gnome2/Makefile.common +++ b/meta-pkgs/ruby-gnome2/Makefile.common @@ -1,7 +1,33 @@ -# $NetBSD: Makefile.common,v 1.8 2008/10/28 13:43:57 obache Exp $ +# $NetBSD: Makefile.common,v 1.9 2009/05/31 09:00:48 obache Exp $ # +# used by devel/ruby-gnome2-atk/Makefile +# used by devel/ruby-gnome2-bonobo/Makefile +# used by devel/ruby-gnome2-bonoboui/Makefile +# used by devel/ruby-gnome2-gconf/Makefile +# used by devel/ruby-gnome2-glib/Makefile +# used by devel/ruby-gnome2-libglade/Makefile +# used by devel/ruby-gnome2-pango/Makefile +# used by graphics/ruby-gnome2-gdkpixbuf/Makefile +# used by graphics/ruby-gnome2-gnomecanvas/Makefile +# used by graphics/ruby-gnome2-goocanvas/Makefile +# used by graphics/ruby-gnome2-gtkglext/Makefile +# used by graphics/ruby-gnome2-libart/Makefile +# used by graphics/ruby-gnome2-rsvg/Makefile +# used by multimedia/ruby-gnome2-gstreamer/Makefile +# used by print/ruby-gnome2-gnomeprint/Makefile +# used by print/ruby-gnome2-gnomeprintui/Makefile +# used by print/ruby-gnome2-poppler/Makefile +# used by sysutils/ruby-gnome2-gnomevfs/Makefile +# used by www/ruby-gnome2-gtkhtml2/Makefile +# used by www/ruby-gnome2-gtkmozembed/Makefile +# used by x11/ruby-gnome2-gnome/Makefile +# used by x11/ruby-gnome2-gtk/Makefile +# used by x11/ruby-gnome2-gtksourceview/Makefile +# used by x11/ruby-gnome2-gtksourceview2/Makefile +# used by x11/ruby-gnome2-panelapplet/Makefile +# used by x11/ruby-gnome2-vte/Makefile -DISTNAME= ruby-gnome2-all-0.18.1 +DISTNAME= ruby-gnome2-all-0.19.0 CATEGORIES+= ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ruby-gnome2/} @@ -10,8 +36,9 @@ PATCHDIR= ${.CURDIR}/../../meta-pkgs/ruby-gnome2/patches MAINTAINER= dieter.NetBSD@pandora.be HOMEPAGE= http://ruby-gnome2.sourceforge.jp/ +LICENSE= gnu-lgpl-v2.1 -VERSION= 0.18.1 +VERSION= 0.19.0 RUBY_HAS_ARCHLIB= yes USE_RUBY_EXTCONF= yes diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo index c59e7eb0825..8ffdf7bfcc2 100644 --- a/meta-pkgs/ruby-gnome2/distinfo +++ b/meta-pkgs/ruby-gnome2/distinfo @@ -1,14 +1,16 @@ -$NetBSD: distinfo,v 1.8 2008/10/28 13:43:57 obache Exp $ +$NetBSD: distinfo,v 1.9 2009/05/31 09:00:48 obache Exp $ -SHA1 (ruby-gnome2-all-0.18.1.tar.gz) = 3d5b3666d1fe2b717c98f68019722a4a144bbc0d -RMD160 (ruby-gnome2-all-0.18.1.tar.gz) = cd85a0ffcedcd7ca857631f8ff7aba08c98c90e6 -Size (ruby-gnome2-all-0.18.1.tar.gz) = 1501200 bytes -SHA1 (patch-aa) = 1e3330a13df0786a1e3559a57578c99c6d3fce85 -SHA1 (patch-ab) = 3056c970276c2b6442fb7792a457b356cd1a0cb6 -SHA1 (patch-ac) = 0713a9c0255d7e08769645451ca33282c93e280f -SHA1 (patch-ad) = c50e2ba5299d48eecfc6d68940efc2562cefa0d0 -SHA1 (patch-af) = b45bd1593f9ca2b577ccfa5693507aae6aad3440 -SHA1 (patch-ag) = e46ee6839e9df605b6cdb04c5c2a2a4970563747 -SHA1 (patch-an) = fe2160188643513011c9a2db8d7a21437c1c3516 -SHA1 (patch-ao) = ec787fd91c52f8ecbf4aa6166bb4b288f35b97b5 -SHA1 (patch-ap) = d14bd0b87149d6cf68a22e5b2ad16e86d50b107c +SHA1 (ruby-gnome2-all-0.19.0.tar.gz) = 59e20b43a2592d63373bba72430e72ffd84e4f68 +RMD160 (ruby-gnome2-all-0.19.0.tar.gz) = fb56d0e3e63a82d56c7b9efdb859ededba0fbbce +Size (ruby-gnome2-all-0.19.0.tar.gz) = 2321941 bytes +SHA1 (patch-aa) = bb42e339a8441f7d35951b383b8f3d0379e8a28e +SHA1 (patch-ab) = 5a4277ae9d007927de7667458b0c8da49c15bcea +SHA1 (patch-ac) = baa182ff65cddbb623e943c0f8ff2875a73c1e51 +SHA1 (patch-ad) = f872f01bd22a0d0f46068cbaed4d44ca98b073c5 +SHA1 (patch-af) = b37ac30eb73fd2d3eb3aadd76d5aeb7a930eeabe +SHA1 (patch-ag) = 24cdbb883400d56e308bcc3034852b2a82f11930 +SHA1 (patch-an) = 218d7dcdafad3baefb438fb645260c3b419f75e9 +SHA1 (patch-ao) = 988b73484ba7eccfd15e52c1e59c91991378408d +SHA1 (patch-ap) = 9cdbc50e8f51ab7fff97206b157e8d1a5f717f3c +SHA1 (patch-ar) = b6efa6163ce8dbb184269e60e2823d4151a7aa8c +SHA1 (patch-as) = b5829f4f36e364bc306a62f20f67a37a37a28f1d diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa index a04386c1ae3..f4a2ccbb12c 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-aa +++ b/meta-pkgs/ruby-gnome2/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-aa,v 1.4 2009/05/31 09:00:48 obache Exp $ + +Install files into vendor. --- atk/src/depend.orig 2008-01-03 02:56:49.000000000 +0000 +++ atk/src/depend diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ab b/meta-pkgs/ruby-gnome2/patches/patch-ab index a5e03da7fb3..0881a736f59 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ab +++ b/meta-pkgs/ruby-gnome2/patches/patch-ab @@ -1,6 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-ab,v 1.4 2009/05/31 09:00:48 obache Exp $ ---- glib/src/depend.orig 2008-09-30 14:41:50.000000000 +0000 +Install files in vendor. + +--- glib/src/depend.orig 2009-05-18 12:47:11.000000000 +0000 +++ glib/src/depend @@ -1,6 +1,6 @@ -install: @@ -8,10 +10,10 @@ $NetBSD: patch-ab,v 1.3 2008/10/22 10:42:02 obache Exp $ - @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(sitearchdir)$(target_prefix) - @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(sitearchdir)$(target_prefix) - @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(sitearchdir)$(target_prefix) -- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/glib-enum-types.h $(sitearchdir)$(target_prefix) +- @$(RUBY) -run -e install -- -m 0644 -v glib-enum-types.h $(sitearchdir)$(target_prefix) +install-so: + $(INSTALL_DATA) $(srcdir)/rbglib.h $(RUBYARCHDIR) + $(INSTALL_DATA) $(srcdir)/rbgutil.h $(RUBYARCHDIR) + $(INSTALL_DATA) $(srcdir)/rbgobject.h $(RUBYARCHDIR) + $(INSTALL_DATA) $(srcdir)/rbgcompat.h $(RUBYARCHDIR) -+ $(INSTALL_DATA) $(srcdir)/glib-enum-types.h $(RUBYARCHDIR) ++ $(INSTALL_DATA) glib-enum-types.h $(RUBYARCHDIR) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac index 23b89dceefb..a212eaf3d6d 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ac +++ b/meta-pkgs/ruby-gnome2/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-ac,v 1.4 2009/05/31 09:00:48 obache Exp $ + +Also look at vendor. --- glib/src/lib/mkmf-gnome2.rb.orig 2008-09-13 11:18:06.000000000 +0000 +++ glib/src/lib/mkmf-gnome2.rb diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ad b/meta-pkgs/ruby-gnome2/patches/patch-ad index c16a2c934e5..3382461f3e4 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ad +++ b/meta-pkgs/ruby-gnome2/patches/patch-ad @@ -1,4 +1,6 @@ -$NetBSD: patch-ad,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-ad,v 1.4 2009/05/31 09:00:48 obache Exp $ + +Install files in vendor. --- gtk/src/depend.orig 2008-09-30 13:00:42.000000000 +0000 +++ gtk/src/depend diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af index 9c990536e18..32f92d5b850 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-af +++ b/meta-pkgs/ruby-gnome2/patches/patch-af @@ -1,4 +1,6 @@ -$NetBSD: patch-af,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-af,v 1.4 2009/05/31 09:00:48 obache Exp $ + +Install files in vendor. --- libart/src/depend.orig 2008-01-03 02:59:38.000000000 +0000 +++ libart/src/depend diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ag b/meta-pkgs/ruby-gnome2/patches/patch-ag index e6f867e244e..ada0f9c7c1a 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ag +++ b/meta-pkgs/ruby-gnome2/patches/patch-ag @@ -1,4 +1,6 @@ -$NetBSD: patch-ag,v 1.3 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-ag,v 1.4 2009/05/31 09:00:48 obache Exp $ + +Install files in vendor. --- pango/src/depend.orig 2008-01-03 03:00:57.000000000 +0000 +++ pango/src/depend diff --git a/meta-pkgs/ruby-gnome2/patches/patch-an b/meta-pkgs/ruby-gnome2/patches/patch-an index 4be268f8098..b5fd8c914a0 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-an +++ b/meta-pkgs/ruby-gnome2/patches/patch-an @@ -1,4 +1,6 @@ -$NetBSD: patch-an,v 1.2 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-an,v 1.3 2009/05/31 09:00:48 obache Exp $ + +use gem version rcairo as fallback --- gdkpixbuf/lib/gdk_pixbuf2.rb.orig 2007-10-23 12:51:24.000000000 +0000 +++ gdkpixbuf/lib/gdk_pixbuf2.rb diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ao b/meta-pkgs/ruby-gnome2/patches/patch-ao index e7e19e6dfd1..cb1e13f7b7a 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ao +++ b/meta-pkgs/ruby-gnome2/patches/patch-ao @@ -1,17 +1,17 @@ -$NetBSD: patch-ao,v 1.2 2008/10/22 10:42:02 obache Exp $ +$NetBSD: patch-ao,v 1.3 2009/05/31 09:00:48 obache Exp $ ---- gtk/src/lib/gtk2/base.rb.orig 2008-04-10 14:01:35.000000000 +0000 +remove cairo loading because Ruby/Pango has tried it. + +--- gtk/src/lib/gtk2/base.rb.orig 2008-05-12 14:44:38.000000000 +0000 +++ gtk/src/lib/gtk2/base.rb -@@ -13,7 +13,12 @@ require 'glib2' +@@ -12,10 +12,6 @@ + require 'glib2' require 'atk' require 'pango' - begin -+ begin - require 'cairo' -+ rescue LoadError -+ require 'rubygems' -+ require 'cairo' -+ end - rescue LoadError - end +-begin +- require 'cairo' +-rescue LoadError +-end require 'gtk2.so' + require 'gdk_pixbuf2' + diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ap b/meta-pkgs/ruby-gnome2/patches/patch-ap index d7640ee514b..d492fc69a54 100644 --- a/meta-pkgs/ruby-gnome2/patches/patch-ap +++ b/meta-pkgs/ruby-gnome2/patches/patch-ap @@ -1,4 +1,6 @@ -$NetBSD: patch-ap,v 1.2 2008/10/22 10:42:03 obache Exp $ +$NetBSD: patch-ap,v 1.3 2009/05/31 09:00:48 obache Exp $ + +use gem version rcairo as fallback --- pango/src/lib/pango.rb.orig 2007-12-28 09:01:22.000000000 +0000 +++ pango/src/lib/pango.rb diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ar b/meta-pkgs/ruby-gnome2/patches/patch-ar new file mode 100644 index 00000000000..a89de3d7712 --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-ar @@ -0,0 +1,85 @@ +$NetBSD: patch-ar,v 1.1 2009/05/31 09:00:48 obache Exp $ + +use GHashTable instead of Ruby's Hash to avoid object creation while GC. + +--- glib/src/rbgobj_type.c.orig 2009-05-18 12:47:11.000000000 +0000 ++++ glib/src/rbgobj_type.c +@@ -8,5 +8,5 @@ + created at: Sun Jun 9 20:31:47 JST 2002 + +- Copyright (C) 2002-2008 Ruby-GNOME2 Project Team ++ Copyright (C) 2002-2009 Ruby-GNOME2 Project Team + Copyright (C) 2002,2003 Masahiro Sakai + +@@ -29,5 +29,5 @@ static ID id_superclass; + static ID id_lock; + static ID id_unlock; +-static VALUE gtype_to_cinfo; ++static GHashTable *gtype_to_cinfo; + static VALUE klass_to_cinfo; + +@@ -132,9 +132,7 @@ rbgobj_lookup_class_by_gtype_without_loc + return NULL; + +- c = rb_hash_aref(gtype_to_cinfo, INT2NUM(gtype)); +- if (!NIL_P(c)) { +- Data_Get_Struct(c, RGObjClassInfo, cinfo); ++ cinfo = g_hash_table_lookup(gtype_to_cinfo, GUINT_TO_POINTER(gtype)); ++ if (cinfo) + return cinfo; +- } + + if (!create_class) +@@ -185,5 +183,5 @@ rbgobj_lookup_class_by_gtype_without_loc + + rb_hash_aset(klass_to_cinfo, cinfo->klass, c); +- rb_hash_aset(gtype_to_cinfo, INT2NUM(gtype), c); ++ g_hash_table_insert(gtype_to_cinfo, GUINT_TO_POINTER(gtype), cinfo); + + if (G_TYPE_IS_CLASSED(gtype)) +@@ -336,17 +334,25 @@ rbgobj_register_class(VALUE klass, + gboolean gtype2klass) + { +- RGObjClassInfo* cinfo; +- VALUE c = Data_Make_Struct(rb_cData, RGObjClassInfo, cinfo_mark, NULL, cinfo); +- +- cinfo->klass = klass; +- cinfo->gtype = gtype; +- cinfo->mark = NULL; +- cinfo->free = NULL; +- cinfo->flags = 0; +- ++ RGObjClassInfo* cinfo = NULL; ++ VALUE c = Qnil; ++ ++ if (klass2gtype) ++ c = Data_Make_Struct(rb_cData, RGObjClassInfo, cinfo_mark, NULL, cinfo); ++ if (gtype2klass && !cinfo) ++ cinfo = g_new(RGObjClassInfo, 1); ++ ++ if (cinfo) { ++ cinfo->klass = klass; ++ cinfo->gtype = gtype; ++ cinfo->mark = NULL; ++ cinfo->free = NULL; ++ cinfo->flags = 0; ++ } ++ + if (klass2gtype) +- rb_hash_aset(klass_to_cinfo, cinfo->klass, c); ++ rb_hash_aset(klass_to_cinfo, cinfo->klass, c); ++ + if (gtype2klass) +- rb_hash_aset(gtype_to_cinfo, INT2NUM(gtype), c); ++ g_hash_table_insert(gtype_to_cinfo, GUINT_TO_POINTER(gtype), cinfo); + } + +@@ -363,7 +369,6 @@ Init_typemap() + id_superclass = rb_intern("superclass"); + +- rb_global_variable(>ype_to_cinfo); ++ gtype_to_cinfo = g_hash_table_new(g_direct_hash, g_direct_equal); + rb_global_variable(&klass_to_cinfo); +- gtype_to_cinfo = rb_hash_new(); + klass_to_cinfo = rb_hash_new(); + diff --git a/meta-pkgs/ruby-gnome2/patches/patch-as b/meta-pkgs/ruby-gnome2/patches/patch-as new file mode 100644 index 00000000000..f8de6ba09f0 --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-as @@ -0,0 +1,15 @@ +$NetBSD: patch-as,v 1.1 2009/05/31 09:00:48 obache Exp $ + +choose only readable(existing) header files + +--- gtkmozembed/extconf.rb.orig 2009-05-18 12:47:19.000000000 +0000 ++++ gtkmozembed/extconf.rb +@@ -77,7 +77,7 @@ create_makefile_at_srcdir(PACKAGE_NAME, + end + headers = include_paths.inject([]) do |result, path| + gtkmozembed_h = File.join(path, "gtkmozembed.h") +- result += [gtkmozembed_h] if gtkmozembed_h ++ result += [gtkmozembed_h] if File.readable?(gtkmozembed_h) + result + end + glib_mkenums(enum_type_prefix, headers, "GTK_TYPE_", ["gtkmozembed.h"]) -- cgit v1.2.3