Compiling Guile-Gnome with latest G-Wrap

[Ludovic Courtès]

Hi,

I tried compiling Guile-Gnome-Platform 2.7.99 with the latest G-Wrap
(from Andreas' repo), without much success.

A number of incompatible changes have been introduced in G-Wrap.  The
attached patch works around them.  The main issues were:

  * `allowed-options' slot changed to `class-allowed-options';

  * `(g-wrap c-codegen)' must be imported to be able to overload
    `global-definitions-cg' and the likes.

I think the former (at least) should be discussed with Andreas, before
it makes it into a release.

I also had to compile with "CFLAGS=-Wno-pointer-sign" to ignore a few
warnings with GLib string functions (IIRC).  Eventually, the compilation
failed and I bailed out, having no clue of what to do:

  if /bin/sh ../../../libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. 
-I../../..    -I../../../glib/gnome/gobject -I../../../glib/gnome/gobject -I. 
-I. -Wall -Werror -g -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 
-I/usr/include/libpng12   -I/usr/local/include -pthread -std=gnu99 -pthread 
-I/usr/local/include    -Wno-pointer-sign -MT 
libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.lo -MD -MP -MF 
".deps/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.Tpo" -c -o 
libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.lo `test -f 'guile-gnome-gw-gtk.c' 
|| echo './'`guile-gnome-gw-gtk.c; \
          then mv -f ".deps/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.Tpo" 
".deps/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.Plo"; else rm -f 
".deps/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.Tpo"; exit 1; fi
   gcc -DHAVE_CONFIG_H -I. -I. -I../../.. -I../../../glib/gnome/gobject 
-I../../../glib/gnome/gobject -I. -I. -Wall -Werror -g -I/usr/include/gtk-2.0 
-I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo 
-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/local/include -pthread 
-std=gnu99 -pthread -I/usr/local/include -Wno-pointer-sign -MT 
libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.lo -MD -MP -MF 
.deps/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.Tpo -c guile-gnome-gw-gtk.c  
-fPIC -DPIC -o .libs/libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.o
  cc1: warnings being treated as errors
  guile-gnome-gw-gtk.c: In function 'gw__tmp2665__gtk_tree_path__wrap_value':
  guile-gnome-gw-gtk.c:152: warning: implicit declaration of function 
'gw__gvalue_gtk_tree_path_wrap'
  guile-gnome-gw-gtk.c:152: warning: assignment makes pointer from integer 
without a cast
  guile-gnome-gw-gtk.c: In function 'gw__tmp2666__gtk_tree_path__unwrap_value':
  guile-gnome-gw-gtk.c:167: warning: implicit declaration of function 
'gw__gvalue_gtk_tree_path_unwrap'
  guile-gnome-gw-gtk.c: In function 
'gw__tmp3765_gtk_tree_selection_get_selected_rows_wrapper':
  guile-gnome-gw-gtk.c:19112: warning: assignment makes pointer from integer 
without a cast
  make[5]: *** [libgw_guile_gnome_gtk_la-guile-gnome-gw-gtk.lo] Error 1
  make[5]: Leaving directory 
`/home/ludo/tmp/guile-gnome-platform-2.7.99/gtk/gnome/gw'
  make[4]: *** [all] Error 2

Thanks,
Ludovic.

diff --git a/atk/gnome/gw/atk-spec.scm b/atk/gnome/gw/atk-spec.scm
index 3b9bc09..14d718d 100644
--- a/atk/gnome/gw/atk-spec.scm
+++ b/atk/gnome/gw/atk-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -27,6 +27,7 @@
 (define-module (gnome gw atk-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (gnome gw gobject-spec)
   #:use-module (gnome gw support gobject)
diff --git a/glib/gnome/gw/glib-spec.scm b/glib/gnome/gw/glib-spec.scm
index cf3107c..5b9e653 100644
--- a/glib/gnome/gw/glib-spec.scm
+++ b/glib/gnome/gw/glib-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -30,6 +30,7 @@
   #:use-module (srfi srfi-35)
   #:use-module (g-wrap)
   #:use-module (g-wrap util)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap c-types)
   #:use-module (g-wrap guile)
   #:use-module (g-wrap guile ws standard)
diff --git a/glib/gnome/gw/gobject-spec.scm b/glib/gnome/gw/gobject-spec.scm
index 1494f8a..76e8625 100644
--- a/glib/gnome/gw/gobject-spec.scm
+++ b/glib/gnome/gw/gobject-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 ;; Copyright (C) 2004 Andreas Rottmann <rotty at debian dot org>
 
 ;; This program is free software; you can redistribute it and/or    
@@ -30,6 +30,7 @@
 (define-module (gnome gw gobject-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap enumeration)
   #:use-module (g-wrap guile)
   #:use-module (gnome gw glib-spec)
diff --git a/glib/gnome/gw/support/gobject.scm 
b/glib/gnome/gw/support/gobject.scm
index db54021..4ced799 100644
--- a/glib/gnome/gw/support/gobject.scm
+++ b/glib/gnome/gw/support/gobject.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 ;; Copyright (C) 2004 Andreas Rottmann <rotty at debian dot org>
 
 ;; This program is free software; you can redistribute it and/or    
@@ -513,7 +513,7 @@
     (add-type-alias! ws ctype (name type))))
 
 (for-each (lambda (null-ok-class)
-            (class-slot-set! null-ok-class 'allowed-options '(null-ok)))
+            (class-slot-set! null-ok-class 'class-allowed-options '(null-ok)))
           (list <gobject-object-type> <gobject-boxed-type>
                 <gobject-interface-type>))
             
diff --git a/glib/test-suite/gw-test-glib-spec.scm 
b/glib/test-suite/gw-test-glib-spec.scm
index 1f61345..c4c29cb 100644
--- a/glib/test-suite/gw-test-glib-spec.scm
+++ b/glib/test-suite/gw-test-glib-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andreas Rottmann
+;; Copyright (C) 2003,2004,2007 Andreas Rottmann
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -21,6 +21,7 @@
 (define-module (gw-test-glib-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (g-wrap guile ws standard)
   #:use-module (gnome gw glib-spec)
diff --git a/glib/test-suite/gw-test-gobject-spec.scm 
b/glib/test-suite/gw-test-gobject-spec.scm
index f5b4509..d3d2e37 100644
--- a/glib/test-suite/gw-test-gobject-spec.scm
+++ b/glib/test-suite/gw-test-gobject-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andreas Rottmann
+;; Copyright (C) 2003,2004,2007 Andreas Rottmann
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -22,6 +22,7 @@
 (define-module (gw-test-gobject-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (g-wrap guile ws standard)
   #:use-module (gnome gw gobject-spec)
diff --git a/gtk/gnome/gw/gdk-spec.scm b/gtk/gnome/gw/gdk-spec.scm
index 0a40987..c6f90bf 100644
--- a/gtk/gnome/gw/gdk-spec.scm
+++ b/gtk/gnome/gw/gdk-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -28,6 +28,7 @@
   #:use-module (oop goops)
   #:use-module (ice-9 optargs)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (gnome gw pango-spec)
   #:use-module (gnome gw support gobject)
diff --git a/gtk/gnome/gw/gtk-spec.scm b/gtk/gnome/gw/gtk-spec.scm
index 91f158c..58bc0f4 100644
--- a/gtk/gnome/gw/gtk-spec.scm
+++ b/gtk/gnome/gw/gtk-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -27,6 +27,7 @@
 (define-module (gnome gw gtk-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (gnome gw atk-spec)
   #:use-module (gnome gw gdk-spec)
diff --git a/pango/gnome/gw/pango-spec.scm b/pango/gnome/gw/pango-spec.scm
index a7f56ba..b019883 100644
--- a/pango/gnome/gw/pango-spec.scm
+++ b/pango/gnome/gw/pango-spec.scm
@@ -1,5 +1,5 @@
 ;; guile-gnome
-;; Copyright (C) 2003,2004 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2003,2004,2007 Andy Wingo <wingo at pobox dot com>
 
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -27,6 +27,7 @@
 (define-module (gnome gw pango-spec)
   #:use-module (oop goops)
   #:use-module (g-wrap)
+  #:use-module (g-wrap c-codegen)
   #:use-module (g-wrap guile)
   #:use-module (gnome gw glib-spec)
   #:use-module (gnome gw gobject-spec)