summaryrefslogtreecommitdiff
path: root/meta-pkgs/ruby-gnome2
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2009-08-12 12:43:08 +0000
committerobache <obache@pkgsrc.org>2009-08-12 12:43:08 +0000
commitb728468db72946a0813284dff46fb38c74d89fd6 (patch)
tree1cef75f911018913591e17e10f53eb0be71218e6 /meta-pkgs/ruby-gnome2
parent49ce20159bb07c2135185fbe1a39d413344e46fd (diff)
downloadpkgsrc-b728468db72946a0813284dff46fb38c74d89fd6.tar.gz
Update ruby-gnome2 to 0.19.1.
This release is a bug fix release of 0.19.0. === Changes ==== Ruby/GTK2 * use RUBYARCHDIR [OBATA Akio] * #2814953: install missing headers [Mamoru Tasaka] ==== Ruby/GLib2 * Bug fixes: * avoid object allocation while GC [OBATA Akio, Kouhei Sutou] * use RUBYARCHDIR [OBATA Akio] * mkmf-gnome2.rb add "-I$(vendorarchdir)" to $CPPFLAGS. [OBATA Akio, Kouhei Sutou] ==== Ruby/ATK * use RUBYARCHDIR [OBATA Akio] ==== Ruby/Pango * use RUBYARCHDIR [OBATA Akio] * use gem version rcairo as fallback [OBATA Akio] ==== Ruby/Libart * use RUBYARCHDIR [OBATA Akio] ==== Ruby/GdkPixbuf * use gem version rcairo as fallback [OBATA Akio] ==== Ruby/GnomePrint * install rblibgnomeprintversion.h [OBATA Akio, Kouhei Sutou] ==== Ruby/GtkMozEmbeded * fix header generation error caused by missing file [OBATA Akio] ==== Ruby/VTE * support VTE 0.20 [Kouhei Sutou] ==== Ruby/PanelApplet * #2815036: re-support Ruby 1.8.6. [Mamoru Tasaka, Kouhei Sutou] ==== Ruby/Libglade2 * Debian#519786: fix GC related SEGV when a widget in glade is removed by hand. [Arnaud Cornet, Kouhei Sutou] === Thanks * OBATA Akio * Mamoru Tasaka * Arnaud Cornet
Diffstat (limited to 'meta-pkgs/ruby-gnome2')
-rw-r--r--meta-pkgs/ruby-gnome2/Makefile.common10
-rw-r--r--meta-pkgs/ruby-gnome2/distinfo20
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-aa13
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ab19
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ac15
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ad13
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-af11
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ag13
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-al18
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-an18
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ao17
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ap19
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-ar85
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-as15
14 files changed, 30 insertions, 256 deletions
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index f0692addce1..78a3dff1025 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2009/05/31 09:00:48 obache Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/08/12 12:43:08 obache Exp $
#
# used by devel/ruby-gnome2-atk/Makefile
# used by devel/ruby-gnome2-bonobo/Makefile
@@ -27,7 +27,7 @@
# used by x11/ruby-gnome2-panelapplet/Makefile
# used by x11/ruby-gnome2-vte/Makefile
-DISTNAME= ruby-gnome2-all-0.19.0
+DISTNAME= ruby-gnome2-all-0.19.1
CATEGORIES+= ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ruby-gnome2/}
@@ -38,9 +38,13 @@ MAINTAINER= dieter.NetBSD@pandora.be
HOMEPAGE= http://ruby-gnome2.sourceforge.jp/
LICENSE= gnu-lgpl-v2.1
-VERSION= 0.19.0
+VERSION= 0.19.1
RUBY_HAS_ARCHLIB= yes
USE_RUBY_EXTCONF= yes
+INSTALL_TARGET= install
+
+INSTALLATION_DIRS= lib/pkgconfig
+
.include "../../lang/ruby/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 8ffdf7bfcc2..b7eb439841e 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,16 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/05/31 09:00:48 obache Exp $
+$NetBSD: distinfo,v 1.10 2009/08/12 12:43:08 obache Exp $
-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
+SHA1 (ruby-gnome2-all-0.19.1.tar.gz) = 7b42fd26e54eb82c006f7aeacaf91efc417bdbde
+RMD160 (ruby-gnome2-all-0.19.1.tar.gz) = 3161d8e2d99ba91ac3a8c6ee51992462b5413e10
+Size (ruby-gnome2-all-0.19.1.tar.gz) = 2330644 bytes
+SHA1 (patch-al) = 8960917a6409b99602ed81163327b9be44c57637
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa
deleted file mode 100644
index f4a2ccbb12c..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -1,3 +1,3 @@
--install:
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(sitearchdir)$(target_prefix)
-- @$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(sitearchdir)$(target_prefix)
-+install-so:
-+ $(INSTALL_DATA) $(srcdir)/rbatk.h $(RUBYARCHDIR)
-+ $(INSTALL_DATA) rbatkversion.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ab b/meta-pkgs/ruby-gnome2/patches/patch-ab
deleted file mode 100644
index 0881a736f59..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/05/31 09:00:48 obache Exp $
-
-Install files in vendor.
-
---- glib/src/depend.orig 2009-05-18 12:47:11.000000000 +0000
-+++ glib/src/depend
-@@ -1,6 +1,6 @@
--install:
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(sitearchdir)$(target_prefix)
-- @$(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 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) glib-enum-types.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac
deleted file mode 100644
index a212eaf3d6d..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
-@@ -257,7 +257,7 @@ def make_version_header(app_name, pkgnam
- end
-
- def check_ruby_func
-- $CPPFLAGS << " -I$(sitearchdir) "
-+ $CPPFLAGS << " -I$(vendorarchdir) "
-
- #Other options
- ruby_header = "ruby.h"
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ad b/meta-pkgs/ruby-gnome2/patches/patch-ad
deleted file mode 100644
index 3382461f3e4..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -1,3 +1,3 @@
--install:
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtkconversions.h $(sitearchdir)$(target_prefix)
-+install-so:
-+ $(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR)
-+ $(INSTALL_DATA) $(srcdir)/rbgtkconversions.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af
deleted file mode 100644
index 32f92d5b850..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$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
-@@ -1,2 +1,2 @@
--install:
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(sitearchdir)$(target_prefix)
-+install-so:
-+ $(INSTALL_DATA) $(srcdir)/rbart.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ag b/meta-pkgs/ruby-gnome2/patches/patch-ag
deleted file mode 100644
index ada0f9c7c1a..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -1,3 +1,3 @@
--install:
-- @$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(sitearchdir)$(target_prefix)
-- @$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(sitearchdir)$(target_prefix)
-+install-so:
-+ $(INSTALL_DATA) $(srcdir)/rbpango.h $(RUBYARCHDIR)
-+ $(INSTALL_DATA) rbpangoversion.h $(RUBYARCHDIR)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-al b/meta-pkgs/ruby-gnome2/patches/patch-al
new file mode 100644
index 00000000000..2b5daff21d4
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-al
@@ -0,0 +1,18 @@
+$NetBSD: patch-al,v 1.3 2009/08/12 12:43:08 obache Exp $
+
+--- vte/extconf.rb.orig 2009-07-26 06:16:52.000000000 +0000
++++ vte/extconf.rb
+@@ -25,10 +25,12 @@ add_depend_package("atk", "atk/src", TOP
+ vte_headers = ["vte/vte.h"]
+ have_type("VteTerminalCursorBlinkMode", vte_headers)
+
++vte_version_header = nil
+ unless have_macro("VTE_CHECK_VERSION", vte_headers)
+ make_version_header("VTE", PACKAGE_ID)
+- create_pkg_config_file('VTE', 'src/rbvteversion.h', 'vte-ruby.pc')
++ vte_version_header = 'src/rbvteversion.h'
+ end
+
+ create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_VTE_COMPILATION")
++create_pkg_config_file('VTE', vte_version_header, 'vte-ruby.pc')
+ create_top_makefile
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-an b/meta-pkgs/ruby-gnome2/patches/patch-an
deleted file mode 100644
index b5fd8c914a0..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-an
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
-@@ -1,6 +1,11 @@
- require 'glib2'
- begin
-+ begin
- require 'cairo'
-+ rescue LoadError
-+ require 'rubygems'
-+ require 'cairo'
-+ end
- rescue LoadError
- end
- require 'gdk_pixbuf2.so'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ao b/meta-pkgs/ruby-gnome2/patches/patch-ao
deleted file mode 100644
index cb1e13f7b7a..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2009/05/31 09:00:48 obache Exp $
-
-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
-@@ -12,10 +12,6 @@
- require 'glib2'
- require 'atk'
- require 'pango'
--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
deleted file mode 100644
index d492fc69a54..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ap
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
-@@ -8,7 +8,12 @@
-
- require 'glib2'
- begin
-+ begin
- require 'cairo'
-+ rescue LoadError
-+ require 'rubygems'
-+ require 'cairo'
-+ end
- rescue LoadError
- end
- require 'pango.so'
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ar b/meta-pkgs/ruby-gnome2/patches/patch-ar
deleted file mode 100644
index a89de3d7712..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-ar
+++ /dev/null
@@ -1,85 +0,0 @@
-$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(&gtype_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
deleted file mode 100644
index f8de6ba09f0..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"])