diff options
34 files changed, 291 insertions, 33 deletions
diff --git a/devel/ruby-gnome2-atk/Makefile b/devel/ruby-gnome2-atk/Makefile index c06aa7b5d02..1cb021128e0 100644 --- a/devel/ruby-gnome2-atk/Makefile +++ b/devel/ruby-gnome2-atk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2012/10/31 11:19:41 asau Exp $ +# $NetBSD: Makefile,v 1.17 2013/02/07 13:41:55 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-atk-${VERSION} COMMENT= Ruby binding of ATK-1.0.x or later -PKGREVISION= 1 CATEGORIES= devel CONFLICTS+= ruby-gnome2-atk-[0-9]* diff --git a/devel/ruby-gnome2-gio/Makefile b/devel/ruby-gnome2-gio/Makefile index 28f03772646..f7234a4f0ff 100644 --- a/devel/ruby-gnome2-gio/Makefile +++ b/devel/ruby-gnome2-gio/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2012/10/31 11:19:41 asau Exp $ +# $NetBSD: Makefile,v 1.12 2013/02/07 13:41:55 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gio-${VERSION} COMMENT= Ruby binding of gio-2.0.x -PKGREVISION= 1 CATEGORIES= devel CONFLICTS+= ruby[0-9][0-9]-gnome2-gio-[0-9]* diff --git a/devel/ruby-gnome2-gio/PLIST b/devel/ruby-gnome2-gio/PLIST index 1f87c2605aa..94cb9e485fc 100644 --- a/devel/ruby-gnome2-gio/PLIST +++ b/devel/ruby-gnome2-gio/PLIST @@ -1,5 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2012/01/11 13:47:30 obache Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/02/07 13:41:55 obache Exp $ lib/pkgconfig/ruby-gio2.pc ${RUBY_VENDORLIB}/gio2.rb ${RUBY_VENDORLIB}/gio2/deprecated.rb ${RUBY_VENDORARCHLIB}/gio2.${RUBY_DLEXT} +${RUBY_VENDORARCHLIB}/rbgio2.h +${RUBY_VENDORARCHLIB}/rbgio2conversions.h diff --git a/devel/ruby-gnome2-gio/buildlink3.mk b/devel/ruby-gnome2-gio/buildlink3.mk new file mode 100644 index 00000000000..7f5f9998aab --- /dev/null +++ b/devel/ruby-gnome2-gio/buildlink3.mk @@ -0,0 +1,15 @@ +# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:55 obache Exp $ + +BUILDLINK_TREE+= ruby-gnome2-gio + +.if !defined(RUBY_GNOME2_GIO_BUILDLINK3_MK) +RUBY_GNOME2_GIO_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ruby-gnome2-gio+= ${RUBY_PKGPREFIX}-gnome2-gio>=1.2.0 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?= ../../devel/ruby-gnome2-gio + +.include "../../devel/glib2/buildlink3.mk" +.include "../../lang/ruby/buildlink3.mk" +.endif # RUBY_GNOME2_GIO_BUILDLINK3_MK + +BUILDLINK_TREE+= -ruby-gnome2-gio diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile index cb007160550..5714713069e 100644 --- a/devel/ruby-gnome2-glib/Makefile +++ b/devel/ruby-gnome2-glib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2012/10/31 11:19:41 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/02/07 13:41:55 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION} COMMENT= Ruby binding of GLib-2.x -PKGREVISION= 1 CATEGORIES= devel CONFLICTS+= ruby-gnome2-glib-[0-9]* diff --git a/devel/ruby-gnome2-gobject-introspection/DESCR b/devel/ruby-gnome2-gobject-introspection/DESCR new file mode 100644 index 00000000000..a70e177edef --- /dev/null +++ b/devel/ruby-gnome2-gobject-introspection/DESCR @@ -0,0 +1,5 @@ +Ruby-GNOME 2 is a set of Ruby language bindings for the various +application development libraries included with the GNOME/GTK+ +environment. + +Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection. diff --git a/devel/ruby-gnome2-gobject-introspection/Makefile b/devel/ruby-gnome2-gobject-introspection/Makefile new file mode 100644 index 00000000000..b4f9926bec6 --- /dev/null +++ b/devel/ruby-gnome2-gobject-introspection/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1 2013/02/07 13:41:55 obache Exp $ +# + +PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection-${VERSION} +COMMENT= Ruby binding of Gobject Introspection +CATEGORIES= devel + +CONFLICTS+= ruby-gnome2-gobject-introspection-[0-9]* +CONFLICTS+= ruby[0-9][0-9]-gnome2-gobject-introspection-[0-9]* + +RUBY_EXTCONF_SUBDIRS= gobject-introspection + +do-test: + ${RUN} cd ${WRKSRC}/gobject-introspection/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb + +BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.32.1 +.include "../../devel/gobject-introspection/buildlink3.mk" +BUILDLINK_API_DEPENDS.ruby-gnome2-glib+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION} +.include "../../devel/ruby-gnome2-glib/buildlink3.mk" +.include "../../devel/ruby-pkg-config/tool.mk" +.include "../../meta-pkgs/ruby-gnome2/Makefile.common" diff --git a/devel/ruby-gnome2-gobject-introspection/PLIST b/devel/ruby-gnome2-gobject-introspection/PLIST new file mode 100644 index 00000000000..20772f3b839 --- /dev/null +++ b/devel/ruby-gnome2-gobject-introspection/PLIST @@ -0,0 +1,11 @@ +@comment $NetBSD: PLIST,v 1.1 2013/02/07 13:41:55 obache Exp $ +${RUBY_VENDORLIB}/gobject-introspection.rb +${RUBY_VENDORLIB}/gobject-introspection/callable-info.rb +${RUBY_VENDORLIB}/gobject-introspection/collection-reader.rb +${RUBY_VENDORLIB}/gobject-introspection/interface-info.rb +${RUBY_VENDORLIB}/gobject-introspection/loader.rb +${RUBY_VENDORLIB}/gobject-introspection/object-info.rb +${RUBY_VENDORLIB}/gobject-introspection/repository.rb +${RUBY_VENDORLIB}/gobject-introspection/struct-info.rb +${RUBY_VENDORLIB}/gobject-introspection/union-info.rb +${RUBY_VENDORARCHLIB}/gobject_introspection.${RUBY_DLEXT} diff --git a/devel/ruby-gnome2-gobject-introspection/buildlink3.mk b/devel/ruby-gnome2-gobject-introspection/buildlink3.mk new file mode 100644 index 00000000000..9fde44338b2 --- /dev/null +++ b/devel/ruby-gnome2-gobject-introspection/buildlink3.mk @@ -0,0 +1,15 @@ +# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:55 obache Exp $ + +BUILDLINK_TREE+= ruby-gnome2-gobject-introspection + +.if !defined(RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK) +RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ruby-gnome2-gobject-introspection+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=1.2.0 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gobject-introspection?= ../../devel/ruby-gnome2-gobject-introspection + +.include "../../devel/gobject-introspection/buildlink3.mk" +.include "../../lang/ruby/buildlink3.mk" +.endif # RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK + +BUILDLINK_TREE+= -ruby-gnome2-gobject-introspection diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile index 005a8fe1108..309f67ca173 100644 --- a/devel/ruby-gnome2-pango/Makefile +++ b/devel/ruby-gnome2-pango/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2012/10/31 11:19:41 asau Exp $ +# $NetBSD: Makefile,v 1.32 2013/02/07 13:41:55 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-pango-${VERSION} COMMENT= Ruby binding of pango-1.x -PKGREVISION= 4 CATEGORIES= devel fonts CONFLICTS+= ruby-gnome2-pango-[0-9]* diff --git a/graphics/ruby-gnome2-gdk3/DESCR b/graphics/ruby-gnome2-gdk3/DESCR new file mode 100644 index 00000000000..4c910fcc275 --- /dev/null +++ b/graphics/ruby-gnome2-gdk3/DESCR @@ -0,0 +1,5 @@ +Ruby-GNOME 2 is a set of Ruby language bindings for the various +application development libraries included with the GNOME/GTK+ +environment. + +Ruby/GDK3 is a Ruby binding of GDK3. diff --git a/graphics/ruby-gnome2-gdk3/Makefile b/graphics/ruby-gnome2-gdk3/Makefile new file mode 100644 index 00000000000..fc2458ee2e3 --- /dev/null +++ b/graphics/ruby-gnome2-gdk3/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1 2013/02/07 13:41:55 obache Exp $ +# + +PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gdk3-${VERSION} +COMMENT= Ruby binding of GDK3 +CATEGORIES= graphics + +CONFLICTS+= ruby[0-9][0-9]-gnome2-gdk3-[0-9]* + +RUBY_EXTCONF_SUBDIRS= gdk3 + +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf + +RUBY_VERSION_SUPPORTED= 193 + +do-test: + ${RUN} cd ${WRKSRC}/gtk2/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" +BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION} +.include "../../devel/ruby-gnome2-pango/buildlink3.mk" +.include "../../graphics/ruby-rcairo/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.4.2 +.include "../../x11/gtk3/buildlink3.mk" +.include "../../devel/ruby-pkg-config/tool.mk" +.include "../../meta-pkgs/ruby-gnome2/Makefile.common" diff --git a/graphics/ruby-gnome2-gdk3/PLIST b/graphics/ruby-gnome2-gdk3/PLIST new file mode 100644 index 00000000000..6aca7f424b6 --- /dev/null +++ b/graphics/ruby-gnome2-gdk3/PLIST @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST,v 1.1 2013/02/07 13:41:55 obache Exp $ +lib/pkgconfig/ruby-gdk3.pc +${RUBY_VENDORLIB}/gdk3.rb +${RUBY_VENDORLIB}/gdk3/base.rb +${RUBY_VENDORLIB}/gdk3/deprecated.rb +${RUBY_VENDORARCHLIB}/gdk3.${RUBY_DLEXT} +${RUBY_VENDORARCHLIB}/rbgdk3.h +${RUBY_VENDORARCHLIB}/rbgdk3conversions.h diff --git a/graphics/ruby-gnome2-gdk3/buildlink3.mk b/graphics/ruby-gnome2-gdk3/buildlink3.mk new file mode 100644 index 00000000000..10a5508d1a9 --- /dev/null +++ b/graphics/ruby-gnome2-gdk3/buildlink3.mk @@ -0,0 +1,14 @@ +# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:55 obache Exp $ + +BUILDLINK_TREE+= ruby-gnome2-gdk3 + +.if !defined(RUBY_GNOME2_GDK3_BUILDLINK3_MK) +RUBY_GNOME2_GDK3_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ruby-gnome2-gdk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=2.0.0 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?= ../../graphics/ruby-gnome2-gdk3 + +.include "../../x11/gtk3/buildlink3.mk" +.endif # RUBY_GNOME2_GDK3_BUILDLINK3_MK + +BUILDLINK_TREE+= -ruby-gnome2-gdk3 diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile index 9fba2f9f850..556d63f6561 100644 --- a/graphics/ruby-gnome2-gdkpixbuf/Makefile +++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2012/10/06 14:11:20 asau Exp $ +# $NetBSD: Makefile,v 1.31 2013/02/07 13:41:56 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]* diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile index c6218fb2f9c..d473319d0cd 100644 --- a/graphics/ruby-gnome2-goocanvas/Makefile +++ b/graphics/ruby-gnome2-goocanvas/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2012/10/08 23:01:49 adam Exp $ +# $NetBSD: Makefile,v 1.26 2013/02/07 13:41:56 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION} COMMENT= Ruby binding of GooCanvas -PKGREVISION= 4 CATEGORIES= graphics gnome CONFLICTS+= ruby[0-9][0-9]-gnome2-goocanvas-[0-9]* diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile index 20045c439ea..260b5358dbc 100644 --- a/graphics/ruby-gnome2-rsvg/Makefile +++ b/graphics/ruby-gnome2-rsvg/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2012/10/08 23:01:49 adam Exp $ +# $NetBSD: Makefile,v 1.39 2013/02/07 13:41:56 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION} COMMENT= Ruby binding of librsvg -PKGREVISION= 4 CATEGORIES= graphics CONFLICTS+= ruby[0-9][0-9]-gnome2-rsvg-[0-9]* diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile index bc384d721dd..008bcaf6d04 100644 --- a/meta-pkgs/ruby-gnome2/Makefile +++ b/meta-pkgs/ruby-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2011/10/03 14:19:43 obache Exp $ +# $NetBSD: Makefile,v 1.16 2013/02/07 13:41:54 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${VERSION} @@ -8,14 +8,18 @@ CATEGORIES= meta-pkgs gnome DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdk3>=${VERSION}:../../graphics/ruby-gnome2-gdk3 DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-goocanvas>=${VERSION}:../../graphics/ruby-gnome2-goocanvas DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gstreamer>=${VERSION}:../../multimedia/ruby-gnome2-gstreamer DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3 DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtksourceview2>=${VERSION}:../../x11/ruby-gnome2-gtksourceview2 +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtksourceview3>=${VERSION}:../../x11/ruby-gnome2-gtksourceview3 DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-vte>=${VERSION}:../../x11/ruby-gnome2-vte META_PACKAGE= yes diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common index 8acbbf49b90..da9dd76683f 100644 --- a/meta-pkgs/ruby-gnome2/Makefile.common +++ b/meta-pkgs/ruby-gnome2/Makefile.common @@ -1,16 +1,20 @@ -# $NetBSD: Makefile.common,v 1.26 2012/08/30 13:36:32 obache Exp $ +# $NetBSD: Makefile.common,v 1.27 2013/02/07 13:41:54 obache Exp $ # # used by devel/ruby-gnome2-atk/Makefile # used by devel/ruby-gnome2-gio/Makefile # used by devel/ruby-gnome2-glib/Makefile +# used by devel/ruby-gnome2-gobject-introspection/Makefile # used by devel/ruby-gnome2-pango/Makefile +# used by graphics/ruby-gnome2-gdk3/Makefile # used by graphics/ruby-gnome2-gdkpixbuf/Makefile # used by graphics/ruby-gnome2-goocanvas/Makefile # used by graphics/ruby-gnome2-rsvg/Makefile # used by multimedia/ruby-gnome2-gstreamer/Makefile # used by print/ruby-gnome2-poppler/Makefile # used by x11/ruby-gnome2-gtk/Makefile +# used by x11/ruby-gnome2-gtk3/Makefile # used by x11/ruby-gnome2-gtksourceview2/Makefile +# used by x11/ruby-gnome2-gtksourceview3/Makefile # used by x11/ruby-gnome2-vte/Makefile DISTNAME= ruby-gnome2-all-${VERSION} @@ -24,13 +28,15 @@ MAINTAINER= dieter.NetBSD@pandora.be HOMEPAGE= http://ruby-gnome2.sourceforge.jp/ LICENSE= gnu-lgpl-v2.1 -VERSION= 1.1.5 -USE_RUBY_EXTCONF= yes +VERSION= 1.2.1 +USE_RUBY_EXTCONF?= yes CONFIGURE_ENV+= RUBYOPT="-Ku" INSTALL_TARGET= install +.if defined(USE_RUBY_EXTCONF) && empty(USE_RUBY_EXTCONF:M[Nn][Oo]) CONFIGURE_ARGS+= --with-pkg-config-dir=${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig +.endif .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 722a42ca942..c538c736bb8 100644 --- a/meta-pkgs/ruby-gnome2/distinfo +++ b/meta-pkgs/ruby-gnome2/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.30 2012/08/30 13:36:32 obache Exp $ +$NetBSD: distinfo,v 1.31 2013/02/07 13:41:54 obache Exp $ -SHA1 (ruby-gnome2-all-1.1.5.tar.gz) = 2b47dea62101aa5116ad94e29465bdaaf45f2f49 -RMD160 (ruby-gnome2-all-1.1.5.tar.gz) = 0cdf62b69ba67f4da552c5ef2a5a16d7fff4c0ac -Size (ruby-gnome2-all-1.1.5.tar.gz) = 1016680 bytes +SHA1 (ruby-gnome2-all-1.2.1.tar.gz) = cbf6cbe574f27582acdb93c9ebed828b0126f553 +RMD160 (ruby-gnome2-all-1.2.1.tar.gz) = 76091e8dfdceb889ff75c6076f665d118765d908 +Size (ruby-gnome2-all-1.2.1.tar.gz) = 1680458 bytes +SHA1 (patch-glib2_ext_glib2_rbglib.h) = 1a504f24e09acb6e962bde5fd8eace5696572ae4 +SHA1 (patch-glib2_ext_glib2_rbgprivate.h) = 73ce03f3a64c3e2f54247012211fac359eb6ccf2 SHA1 (patch-glib2_lib_mkmf-gnome2.rb) = 7ea9f2066aae905e64d8477f500245e3e3b5df9e diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h new file mode 100644 index 00000000000..0654e873291 --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h @@ -0,0 +1,20 @@ +$NetBSD: patch-glib2_ext_glib2_rbglib.h,v 1.1 2013/02/07 13:41:54 obache Exp $ + +* Move rb_str_new_cstr() compatible macro to private header + Because all rbglib.h users should check rb_str_new_cstr() check when + it exists in rbglib.h. + https://github.com/ruby-gnome2/ruby-gnome2/commit/97e6965c4b4463c5aa687b4827f3ef52e7054571 + +--- glib2/ext/glib2/rbglib.h.orig 2013-01-30 14:00:35.000000000 +0000 ++++ glib2/ext/glib2/rbglib.h +@@ -63,10 +63,6 @@ typedef int GPid; + # define G_SOURCE_CONTINUE TRUE + #endif + +-#ifndef HAVE_RB_STR_NEW_CSTR +-# define rb_str_new_cstr(c_string) rb_str_new2(c_string) +-#endif +- + #define RBG_INSPECT(object) (rbg_rval_inspect(object)) + + #define RVAL2CSTR(v) (rbg_rval2cstr(&(v))) diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h new file mode 100644 index 00000000000..35bb80db09a --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h @@ -0,0 +1,28 @@ +$NetBSD: patch-glib2_ext_glib2_rbgprivate.h,v 1.1 2013/02/07 13:41:54 obache Exp $ + +* Move rb_str_new_cstr() compatible macro to private header + Because all rbglib.h users should check rb_str_new_cstr() check when + it exists in rbglib.h. + https://github.com/ruby-gnome2/ruby-gnome2/commit/97e6965c4b4463c5aa687b4827f3ef52e7054571 + +--- glib2/ext/glib2/rbgprivate.h.orig 2012-07-21 14:29:19.000000000 +0000 ++++ glib2/ext/glib2/rbgprivate.h +@@ -1,6 +1,6 @@ + /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */ + /* +- * Copyright (C) 2011 Ruby-GNOME2 Project Team ++ * Copyright (C) 2011-2013 Ruby-GNOME2 Project Team + * Copyright (C) 2007 Ruby-GNOME2 Project Team + * + * This library is free software; you can redistribute it and/or +@@ -29,6 +29,10 @@ + # define rb_errinfo() (ruby_errinfo) + #endif + ++#ifndef HAVE_RB_STR_NEW_CSTR ++# define rb_str_new_cstr(c_string) rb_str_new2(c_string) ++#endif ++ + #ifndef G_VALUE_INIT + # define G_VALUE_INIT { 0, { { 0 } } } + #endif diff --git a/multimedia/ruby-gnome2-gstreamer/Makefile b/multimedia/ruby-gnome2-gstreamer/Makefile index fd06f2b15d0..d757118999b 100644 --- a/multimedia/ruby-gnome2-gstreamer/Makefile +++ b/multimedia/ruby-gnome2-gstreamer/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2012/10/08 09:21:12 asau Exp $ +# $NetBSD: Makefile,v 1.19 2013/02/07 13:41:56 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gstreamer-${VERSION} COMMENT= Ruby binding of GStreamer 0.10.x or later -PKGREVISION= 1 CATEGORIES= multimedia CONFLICTS+= ruby[0-9][0-9]-gnome2-gstreamer-[0-9]* diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile index ec9415a591a..51862f5906e 100644 --- a/print/ruby-gnome2-poppler/Makefile +++ b/print/ruby-gnome2-poppler/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2013/01/26 21:38:44 adam Exp $ +# $NetBSD: Makefile,v 1.37 2013/02/07 13:41:56 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-poppler-${VERSION} COMMENT= Ruby binding of poppler-glib -PKGREVISION= 5 CATEGORIES= print CONFLICTS+= ruby[0-9][0-9]-gnome2-poppler-[0-9]* diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile index 369852124b8..44f634bf6cf 100644 --- a/x11/ruby-gnome2-gtk/Makefile +++ b/x11/ruby-gnome2-gtk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2012/10/29 05:06:50 asau Exp $ +# $NetBSD: Makefile,v 1.39 2013/02/07 13:41:57 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION} COMMENT= Ruby binding of GTK+-2.x -PKGREVISION= 4 CATEGORIES= x11 CONFLICTS+= ruby-gnome2-gtk-[0-9]* diff --git a/x11/ruby-gnome2-gtk3/DESCR b/x11/ruby-gnome2-gtk3/DESCR new file mode 100644 index 00000000000..1c997909c1d --- /dev/null +++ b/x11/ruby-gnome2-gtk3/DESCR @@ -0,0 +1,5 @@ +Ruby-GNOME 2 is a set of Ruby language bindings for the various +application development libraries included with the GNOME/GTK+ +environment. + +Ruby/GTK3 is a Ruby binding of GTK+-3.0.x. diff --git a/x11/ruby-gnome2-gtk3/Makefile b/x11/ruby-gnome2-gtk3/Makefile new file mode 100644 index 00000000000..9824c3d385a --- /dev/null +++ b/x11/ruby-gnome2-gtk3/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1 2013/02/07 13:41:57 obache Exp $ +# + +PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtk3-${VERSION} +COMMENT= Ruby binding of GTK+-3.x +CATEGORIES= x11 + +CONFLICTS+= ruby[0-9][0-9]-gnome2-gtk3-[0-9]* + +RUBY_EXTCONF_SUBDIRS= gtk3 + +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdk3>=${VERSION}:../../graphics/ruby-gnome2-gdk3 +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf + +do-test: + ${RUN} cd ${WRKSRC}/gtk2/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" +BUILDLINK_API_DEPENDS.ruby-gnome2-gio+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION} +.include "../../devel/ruby-gnome2-gio/buildlink3.mk" +BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION} +.include "../../devel/ruby-gnome2-pango/buildlink3.mk" +.include "../../graphics/ruby-rcairo/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.include "../../devel/ruby-pkg-config/tool.mk" +.include "../../meta-pkgs/ruby-gnome2/Makefile.common" diff --git a/x11/ruby-gnome2-gtk3/PLIST b/x11/ruby-gnome2-gtk3/PLIST new file mode 100644 index 00000000000..63427be54b8 --- /dev/null +++ b/x11/ruby-gnome2-gtk3/PLIST @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST,v 1.1 2013/02/07 13:41:57 obache Exp $ +lib/pkgconfig/ruby-gtk3.pc +${RUBY_VENDORLIB}/gtk3.rb +${RUBY_VENDORLIB}/gtk3/base.rb +${RUBY_VENDORLIB}/gtk3/deprecated.rb +${RUBY_VENDORARCHLIB}/gtk3.${RUBY_DLEXT} +${RUBY_VENDORARCHLIB}/rbgtk3.h +${RUBY_VENDORARCHLIB}/rbgtk3conversions.h diff --git a/x11/ruby-gnome2-gtk3/buildlink3.mk b/x11/ruby-gnome2-gtk3/buildlink3.mk new file mode 100644 index 00000000000..73601707130 --- /dev/null +++ b/x11/ruby-gnome2-gtk3/buildlink3.mk @@ -0,0 +1,15 @@ +# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:57 obache Exp $ + +BUILDLINK_TREE+= ruby-gnome2-gtk3 + +.if !defined(RUBY_GNOME2_GTK3_BUILDLINK3_MK) +RUBY_GNOME2_GTK3_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3 + +.include "../../devel/ruby-gnome2-glib/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.endif # RUBY_GNOME2_GTK3_BUILDLINK3_MK + +BUILDLINK_TREE+= -ruby-gnome2-gtk3 diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile index 40dba442173..c2a7d9770f8 100644 --- a/x11/ruby-gnome2-gtksourceview2/Makefile +++ b/x11/ruby-gnome2-gtksourceview2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2012/10/29 05:06:50 asau Exp $ +# $NetBSD: Makefile,v 1.28 2013/02/07 13:41:57 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION} COMMENT= Ruby binding of gtksourceview2 -PKGREVISION= 4 CATEGORIES= x11 CONFLICTS+= ruby[0-9][0-9]-gnome2-gtksourceview2-[0-9]* diff --git a/x11/ruby-gnome2-gtksourceview3/DESCR b/x11/ruby-gnome2-gtksourceview3/DESCR new file mode 100644 index 00000000000..91d62b85a20 --- /dev/null +++ b/x11/ruby-gnome2-gtksourceview3/DESCR @@ -0,0 +1,5 @@ +Ruby-GNOME 2 is a set of Ruby language bindings for the various +application development libraries included with the GNOME/GTK+ +environment. + +Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x. diff --git a/x11/ruby-gnome2-gtksourceview3/Makefile b/x11/ruby-gnome2-gtksourceview3/Makefile new file mode 100644 index 00000000000..7453cd236b0 --- /dev/null +++ b/x11/ruby-gnome2-gtksourceview3/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1 2013/02/07 13:41:57 obache Exp $ +# + +PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtksourceview3-${VERSION} +COMMENT= Ruby binding of gtksourceview3 +CATEGORIES= x11 + +CONFLICTS+= ruby[0-9][0-9]-gnome2-gtksourceview3-[0-9]* + +RUBY_EXTCONF_SUBDIRS= gtksourceview3 + +DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3 + +do-test: + ${RUN} cd ${WRKSRC}/gtksourceview3/test; ${SETENV} ${TEST_ENV} ${RUBY} run-test.rb + +.include "../../graphics/ruby-rcairo/buildlink3.mk" +.include "../../x11/gtksourceview3/buildlink3.mk" +.include "../../devel/ruby-pkg-config/tool.mk" +.include "../../meta-pkgs/ruby-gnome2/Makefile.common" diff --git a/x11/ruby-gnome2-gtksourceview3/PLIST b/x11/ruby-gnome2-gtksourceview3/PLIST new file mode 100644 index 00000000000..35d9ae71839 --- /dev/null +++ b/x11/ruby-gnome2-gtksourceview3/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1 2013/02/07 13:41:57 obache Exp $ +lib/pkgconfig/ruby-gtksourceview3.pc +${RUBY_VENDORLIB}/gtksourceview3.rb +${RUBY_VENDORLIB}/gtksourceview3/deprecated.rb +${RUBY_VENDORARCHLIB}/gtksourceview3.${RUBY_DLEXT} diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile index 1665226d8b2..c875bfb01a7 100644 --- a/x11/ruby-gnome2-vte/Makefile +++ b/x11/ruby-gnome2-vte/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2012/10/29 05:06:51 asau Exp $ +# $NetBSD: Makefile,v 1.31 2013/02/07 13:41:57 obache Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-vte-${VERSION} COMMENT= Ruby binding of vte -PKGREVISION= 4 CATEGORIES= x11 CONFLICTS+= ruby[0-9][0-9]-gnome2-vte-[0-9]* |