Re: pkg/37441: x11/lablgtk is not 32-bit friendly

[Brian de Alwis <bsd%cs.ubc.ca@localhost>]

The following reply was made to PR pkg/37441; it has been noted by GNATS.

From: Brian de Alwis <bsd%cs.ubc.ca@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/37441: x11/lablgtk is not 32-bit friendly
Date: Tue, 27 Nov 2007 21:53:32 -0600

 There was one other problem that prevented mldonkey-gui from working.
 I've re-spun the patch for x11/lablgtk here.
 
 diff -w -b -u -r1.11 distinfo
 --- distinfo    27 Oct 2007 13:29:38 -0000      1.11
 +++ distinfo    28 Nov 2007 03:49:49 -0000
 @@ -4,3 +4,5 @@
  RMD160 (lablgtk-2.10.0.tar.gz) = c149acc683c43b846347aeb3454966fd6ce1cce8
  Size (lablgtk-2.10.0.tar.gz) = 742009 bytes
  SHA1 (patch-aa) = 613dc2ffbc245b0593df8c500673e19ed1de1554
 +SHA1 (patch-ab) = 0b5a8e4899eb74a19ddbf3fc6d60e0bbd173f9e5
 +SHA1 (patch-ac) = fab26b8608ef476da6cbf48e22f54c07703d5057
 
 diff -Nwbu /dev/null patches/patch-ab
 --- /dev/null   2007-11-27 21:48:50.000000000 -0600
 +++ patches/patch-ab    2007-11-27 10:57:35.000000000 -0600
 @@ -0,0 +1,16 @@
 +$NetBSD$
 +
 +--- src/ml_gobject.h.orig      2007-09-24 20:56:09.000000000 -0600
 ++++ src/ml_gobject.h
 +@@ -31,8 +31,9 @@ CAMLexport value Val_GObject_new (GObjec
 + #define Val_GAnyObject_new(val) Val_GObject_new(G_OBJECT(val))
 + CAMLexport void ml_g_object_unref_later (GObject *);
 + 
 +-#define GType_val Long_val
 +-#define Val_GType Val_long
 ++/* As per Garrigue's suggestion on the lablgtk%yuqm.inria.fr@localhost 
mailinglist */
 ++#define GType_val(t) ((GType)t)
 ++#define Val_GType(t) ((value)t)
 + 
 + #define GClosure_val(val) ((GClosure*)Pointer_val(val))
 + CAMLexport value Val_GClosure (GClosure *);
 
 diff -Nwbu /dev/null patches/patch-ac
 --- /dev/null   2007-11-27 21:48:50.000000000 -0600
 +++ patches/patch-ac    2007-11-27 21:48:50.000000000 -0600
 @@ -0,0 +1,13 @@
 +$NetBSD$
 +
 +--- src/ml_gobject.c.orig      2007-09-24 20:56:09.000000000 -0600
 ++++ src/ml_gobject.c
 +@@ -51,7 +51,7 @@ CAMLexport void ml_g_object_unref_later 
 + 
 + Make_Val_final_pointer(GObject, g_object_ref, ml_g_object_unref_later, 0)
 + Make_Val_final_pointer_ext (GObject, _new, Ignore, ml_g_object_unref_later, 
20)
 +-ML_1 (G_TYPE_FROM_INSTANCE, GObject_val, Val_int)
 ++ML_1 (G_TYPE_FROM_INSTANCE, GObject_val, Val_GType)
 + // ML_1 (g_object_ref, GObject_val, Unit)
 + CAMLprim value ml_g_object_unref (value val)
 + {
 
 
 
 -- 
   Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
       "Amusement to an observing mind is study." - Benjamin Disraeli