pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ruby-gnome2-glib Fixes build problem with glib 2...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/217ee17bbb05
branches:  trunk
changeset: 541647:217ee17bbb05
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Apr 24 00:49:30 2008 +0000

description:
Fixes build problem with glib 2.16 reported in PR 38467.
Patch taken from upstream SVN repository Revision 2848.

diffstat:

 devel/ruby-gnome2-glib/distinfo         |   3 +-
 devel/ruby-gnome2-glib/patches/patch-ad |  35 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletions(-)

diffs (53 lines):

diff -r 4b0b9fa39f6c -r 217ee17bbb05 devel/ruby-gnome2-glib/distinfo
--- a/devel/ruby-gnome2-glib/distinfo   Wed Apr 23 22:48:35 2008 +0000
+++ b/devel/ruby-gnome2-glib/distinfo   Thu Apr 24 00:49:30 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2007/08/19 03:00:26 taca Exp $
+$NetBSD: distinfo,v 1.2 2008/04/24 00:49:30 obache Exp $
 
 SHA1 (ruby-gnome2-all-0.16.0.tar.gz) = 488f6c1f139060e005f336c9c854c4dc5b3e6b7c
 RMD160 (ruby-gnome2-all-0.16.0.tar.gz) = c83c7cdcf633ad5cc213180f641a6c8f18002a9c
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = c2d366bd156936838ec0a8f74ab89474f3373931
 SHA1 (patch-ab) = 513dea951b8596dafd4c0c4f58cb7614b6a68dc0
 SHA1 (patch-ac) = 28e54cb6be9dbad161379989bc815a2bc84360bb
+SHA1 (patch-ad) = 19d23bf36d61f23e876af0554011cb289c37b68a
diff -r 4b0b9fa39f6c -r 217ee17bbb05 devel/ruby-gnome2-glib/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-gnome2-glib/patches/patch-ad   Thu Apr 24 00:49:30 2008 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 2008/04/24 00:49:30 obache Exp $
+
+Fixes build problem with glib 2.16
+Taken from upstream SVN repository rev 2848.
+
+--- glib/src/lib/glib-mkenums.rb.orig  2006-12-29 13:17:28.000000000 +0000
++++ glib/src/lib/glib-mkenums.rb
+@@ -3,7 +3,7 @@
+ #
+ # C language enum description generation library like as glib-mkenums tool.
+ #
+-# Copyright(C) 2006 Ruby-GNOME2 Project.
++# Copyright(C) 2006-2008 Ruby-GNOME2 Project.
+ #
+ # This program is licenced under the same license of Ruby-GNOME2.
+ #
+@@ -33,16 +33,14 @@ module GLib
+       if const_lines.include? "<<"
+         @type = "flags"
+         @Type = "Flags"
+-        regexp = /^\s*([^\s]*)\s.*\n/
+       else
+         @type = "enum"
+         @Type = "Enum"
+-        regexp = /^\s*([^\s,]*).*\n/
+       end
+       consts = []
+-      const_lines.scan(regexp){|name|
++      const_lines.scan(/^\s*([^\s,]*).*\n/) do |name|
+         consts << name[0] unless name[0] =~ /(^[\/\*]|^$)/
+-      }
++      end
+       @prefix = extract_prefix(consts)
+       consts.each do |name|
+         # consts = [name, nick]



Home | Main Index | Thread Index | Old Index