summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/ruby-gnome2-gio/PLIST3
-rw-r--r--devel/ruby-gnome2-glib/Makefile3
-rw-r--r--devel/ruby-gnome2-glib/PLIST3
-rw-r--r--devel/ruby-gnome2-pango/Makefile3
-rw-r--r--graphics/ruby-gnome2-gdkpixbuf/Makefile6
-rw-r--r--graphics/ruby-gnome2-goocanvas/Makefile5
-rw-r--r--graphics/ruby-gnome2-rsvg/Makefile3
-rw-r--r--meta-pkgs/ruby-gnome2/Makefile.common4
-rw-r--r--meta-pkgs/ruby-gnome2/distinfo10
-rw-r--r--meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__closure.c39
-rw-r--r--multimedia/ruby-gnome2-gstreamer/Makefile6
-rw-r--r--multimedia/ruby-gnome2-gstreamer/PLIST4
-rw-r--r--print/ruby-gnome2-poppler/Makefile4
-rw-r--r--x11/ruby-gnome2-gtk/Makefile3
-rw-r--r--x11/ruby-gnome2-gtksourceview2/Makefile4
-rw-r--r--x11/ruby-gnome2-vte/Makefile4
16 files changed, 29 insertions, 75 deletions
diff --git a/devel/ruby-gnome2-gio/PLIST b/devel/ruby-gnome2-gio/PLIST
index 344ecb8e86c..1f87c2605aa 100644
--- a/devel/ruby-gnome2-gio/PLIST
+++ b/devel/ruby-gnome2-gio/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2010/10/23 12:45:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/01/11 13:47:30 obache Exp $
lib/pkgconfig/ruby-gio2.pc
${RUBY_VENDORLIB}/gio2.rb
+${RUBY_VENDORLIB}/gio2/deprecated.rb
${RUBY_VENDORARCHLIB}/gio2.${RUBY_DLEXT}
diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index bb0c32e581f..271fe03d9be 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/01/06 13:34:51 obache Exp $
+# $NetBSD: Makefile,v 1.16 2012/01/11 13:47:30 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
-PKGREVISION= 1
COMMENT= Ruby binding of GLib-2.x
CATEGORIES= devel
diff --git a/devel/ruby-gnome2-glib/PLIST b/devel/ruby-gnome2-glib/PLIST
index df70841b5d4..3f174a556bd 100644
--- a/devel/ruby-gnome2-glib/PLIST
+++ b/devel/ruby-gnome2-glib/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2011/02/11 13:50:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/01/11 13:47:30 obache Exp $
lib/pkgconfig/ruby-glib2.pc
${RUBY_VENDORLIB}/glib-mkenums.rb
${RUBY_VENDORLIB}/glib2.rb
+${RUBY_VENDORLIB}/glib2/deprecatable.rb
${RUBY_VENDORLIB}/gnome2-raketask.rb
${RUBY_VENDORLIB}/gnome2-win32-binary-downloader.rb
${RUBY_VENDORARCHLIB}/glib-enum-types.h
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index 0bef7f5ef2d..0e4d4ac0f4d 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2011/11/01 06:01:04 sbd Exp $
+# $NetBSD: Makefile,v 1.23 2012/01/11 13:47:30 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
COMMENT= Ruby binding of pango-1.x
-PKGREVISION= 1
CATEGORIES= devel fonts
CONFLICTS+= ruby-gnome2-pango-[0-9]*
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index c0f538e5919..c72a83d6226 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2011/11/01 06:01:45 sbd Exp $
+# $NetBSD: Makefile,v 1.25 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
COMMENT= Ruby binding of GdkPixbuf-2.x
-PKGREVISION= 1
CATEGORIES= graphics devel
CONFLICTS+= ruby-gnome2-gdkpixbuf-[0-9]*
@@ -15,7 +14,6 @@ RUBY_EXTCONF_SUBDIRS= gdk_pixbuf2
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
.include "../../devel/ruby-pkg-config/tool.mk"
.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile
index 96fbfced083..136eafa0019 100644
--- a/graphics/ruby-gnome2-goocanvas/Makefile
+++ b/graphics/ruby-gnome2-goocanvas/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2011/11/01 06:01:46 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION}
COMMENT= Ruby binding of GooCanvas
-PKGREVISION= 1
CATEGORIES= graphics gnome
CONFLICTS+= ruby[0-9][0-9]-gnome2-goocanvas-[0-9]*
@@ -12,6 +11,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
RUBY_EXTCONF_SUBDIRS= goocanvas
+DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
+
.include "../../graphics/goocanvas/buildlink3.mk"
.include "../../graphics/ruby-rcairo/buildlink3.mk"
.include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index 2e221e87ff9..c569d5b4477 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2011/11/01 06:01:46 sbd Exp $
+# $NetBSD: Makefile,v 1.26 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
COMMENT= Ruby binding of librsvg
-PKGREVISION= 1
CATEGORIES= graphics
CONFLICTS+= ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index 65737a6fb77..e56c135b351 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2011/10/03 14:19:43 obache Exp $
+# $NetBSD: Makefile.common,v 1.22 2012/01/11 13:47:30 obache Exp $
#
# used by devel/ruby-gnome2-atk/Makefile
# used by devel/ruby-gnome2-gio/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= dieter.NetBSD@pandora.be
HOMEPAGE= http://ruby-gnome2.sourceforge.jp/
LICENSE= gnu-lgpl-v2.1
-VERSION= 1.0.3
+VERSION= 1.1.0
USE_RUBY_EXTCONF= yes
CONFIGURE_ENV+= RUBYOPT="-Ku"
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 34d49f6aaac..659b1f2f8a8 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2012/01/06 13:34:50 obache Exp $
+$NetBSD: distinfo,v 1.26 2012/01/11 13:47:30 obache Exp $
-SHA1 (ruby-gnome2-all-1.0.3.tar.gz) = 2a280760e411e443e4e617ca5345a3301fbd609d
-RMD160 (ruby-gnome2-all-1.0.3.tar.gz) = bac4a901b3c09f548ced80c2a1cfbea482dc0ead
-Size (ruby-gnome2-all-1.0.3.tar.gz) = 1141565 bytes
-SHA1 (patch-glib2_ext_glib2_rbgobj__closure.c) = ee99d5f3e4ed67bc1965368da0aa314d1fd2cf57
+SHA1 (ruby-gnome2-all-1.1.0.tar.gz) = c267a2e5a13ae9cf4d0bb6ed1c2e05fc72101053
+RMD160 (ruby-gnome2-all-1.1.0.tar.gz) = 930f8ded1e84a0d42d138ccc89c60f7585c81f96
+Size (ruby-gnome2-all-1.1.0.tar.gz) = 1006675 bytes
+SHA1 (patch-glib2_lib_mkmf-gnome2.rb) = 7ea9f2066aae905e64d8477f500245e3e3b5df9e
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__closure.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__closure.c
deleted file mode 100644
index a42e221c7d5..00000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__closure.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-glib2_ext_glib2_rbgobj__closure.c,v 1.1 2012/01/06 13:34:50 obache Exp $
-
-* fix SEGV by GC on Ruby 1.9.
- https://github.com/ruby-gnome2/ruby-gnome2/commit/b5ca012f55017dff95546d331aa87576432fbc32
- https://github.com/ruby-gnome2/ruby-gnome2/commit/7c712c51181edc73d419007a31064321bd14c929
-
---- glib2/ext/glib2/rbgobj_closure.c.orig 2011-09-18 02:48:35.000000000 +0000
-+++ glib2/ext/glib2/rbgobj_closure.c
-@@ -148,8 +148,7 @@ rclosure_unref(GRClosure *rclosure)
- g_list_free(rclosure->objects);
- rclosure->objects = NULL;
- if (!NIL_P(rclosure->rb_holder)) {
-- RDATA(rclosure->rb_holder)->dmark = NULL;
-- RDATA(rclosure->rb_holder)->dfree = NULL;
-+ DATA_PTR(rclosure->rb_holder) = NULL;
- rclosure->rb_holder = Qnil;
- }
- }
-@@ -178,13 +177,18 @@ rclosure_invalidate(gpointer data, GClos
- static void
- gr_closure_holder_mark(GRClosure *rclosure)
- {
-- rb_gc_mark(rclosure->callback);
-- rb_gc_mark(rclosure->extra_args);
-+ if (rclosure) {
-+ rb_gc_mark(rclosure->callback);
-+ rb_gc_mark(rclosure->extra_args);
-+ }
- }
-
- static void
- gr_closure_holder_free(GRClosure *rclosure)
- {
-+ if (!rclosure)
-+ return;
-+
- if (rclosure->count > 0) {
- rclosure->count = 1;
-
diff --git a/multimedia/ruby-gnome2-gstreamer/Makefile b/multimedia/ruby-gnome2-gstreamer/Makefile
index 210ee1b8faa..32f7167bff3 100644
--- a/multimedia/ruby-gnome2-gstreamer/Makefile
+++ b/multimedia/ruby-gnome2-gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/06/12 11:43:34 obache Exp $
+# $NetBSD: Makefile,v 1.11 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gstreamer-${VERSION}
@@ -11,11 +11,11 @@ PKG_DESTDIR_SUPPORT= user-destdir
RUBY_EXTCONF_SUBDIRS= gstreamer
+DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
+
do-test:
${RUN} cd ${WRKSRC}/gstreamer/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
-BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}
-.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/multimedia/ruby-gnome2-gstreamer/PLIST b/multimedia/ruby-gnome2-gstreamer/PLIST
index b2295f5fb14..612b52b5268 100644
--- a/multimedia/ruby-gnome2-gstreamer/PLIST
+++ b/multimedia/ruby-gnome2-gstreamer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/12 03:09:32 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/01/11 13:47:31 obache Exp $
lib/pkgconfig/ruby-gstreamer.pc
${RUBY_VENDORLIB}/gst.rb
-${RUBY_VENDORARCHLIB}/gst.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/gstreamer.${RUBY_DLEXT}
diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile
index cf3ea284f1a..baeeedf16a9 100644
--- a/print/ruby-gnome2-poppler/Makefile
+++ b/print/ruby-gnome2-poppler/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2011/11/01 06:02:27 sbd Exp $
+# $NetBSD: Makefile,v 1.25 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-poppler-${VERSION}
COMMENT= Ruby binding of poppler-glib
-PKGREVISION= 1
CATEGORIES= print
CONFLICTS+= ruby[0-9][0-9]-gnome2-poppler-[0-9]*
@@ -12,7 +11,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
RUBY_EXTCONF_SUBDIRS= poppler
-DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
do-test:
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index c85ee731ee8..451ca702071 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2011/11/01 06:03:08 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
COMMENT= Ruby binding of GTK+-2.x
-PKGREVISION= 1
CATEGORIES= x11
CONFLICTS+= ruby-gnome2-gtk-[0-9]*
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
index 451d6482860..6da9edc0cd6 100644
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2011/11/01 06:03:09 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
COMMENT= Ruby binding of gtksourceview2
-PKGREVISION= 1
CATEGORIES= x11
CONFLICTS+= ruby[0-9][0-9]-gnome2-gtksourceview2-[0-9]*
@@ -17,6 +16,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
do-test:
${RUN} cd ${WRKSRC}/gtksourceview2/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb
+.include "../../graphics/ruby-rcairo/buildlink3.mk"
.include "../../x11/gtksourceview2/buildlink3.mk"
.include "../../devel/ruby-pkg-config/tool.mk"
.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
index 22f6106e67d..f6b7146a1fc 100644
--- a/x11/ruby-gnome2-vte/Makefile
+++ b/x11/ruby-gnome2-vte/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2011/11/01 06:03:09 sbd Exp $
+# $NetBSD: Makefile,v 1.21 2012/01/11 13:47:31 obache Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-vte-${VERSION}
COMMENT= Ruby binding of vte
-PKGREVISION= 1
CATEGORIES= x11
CONFLICTS+= ruby[0-9][0-9]-gnome2-vte-[0-9]*
@@ -17,7 +16,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-
BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}{,nb*}
BUILDLINK_DEPMETHOD.ruby-gnome2-glib= build
.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
-.include "../../graphics/ruby-rcairo/buildlink3.mk"
.include "../../x11/vte/buildlink3.mk"
.include "../../devel/ruby-pkg-config/tool.mk"
.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 11:14:13 +0000