From fac5fecec390fda3e78ad3d5c6943d3d7066e0c8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 16 Sep 2004 21:57:45 +0000 Subject: [PATCH] Add missing bit. --- ChangeLog | 4 + buildscripts/guile-gnome.sh | 327 ++++++++++++++++++++++++++++++++++++ cygwin/mknetrel | 5 - cygwin/mknetrel.doc | 11 +- 4 files changed, 332 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15f0c4b2c0..4d8eade2e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-16 Jan Nieuwenhuizen + + * buildscripts/guile-gnome.sh: Add missing bit. + 2004-09-16 Han-Wen Nienhuys * lily/slur-scoring.cc (get_y_attachment_range): set end point diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh index f4dde4d3d4..7ee64aff4a 100644 --- a/buildscripts/guile-gnome.sh +++ b/buildscripts/guile-gnome.sh @@ -171,3 +171,330 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then cd guile-gnome ln -s . src patch -p0 < +- +-;; This program is free software; you can redistribute it and/or +-;; modify it under the terms of the GNU General Public License as +-;; published by the Free Software Foundation; either version 2 of +-;; the License, or (at your option) any later version. +-;; +-;; This program is distributed in the hope that it will be useful, +-;; but WITHOUT ANY WARRANTY; without even the implied warranty of +-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-;; GNU General Public License for more details. +-;; +-;; You should have received a copy of the GNU General Public License +-;; along with this program; if not, contact: +-;; +-;; Free Software Foundation Voice: +1-617-542-5942 +-;; 59 Temple Place - Suite 330 Fax: +1-617-542-2652 +-;; Boston, MA 02111-1307, USA gnu@gnu.org +- +-;;; Commentary: +-;; +-;;Custom wrapper definitions. +-;; +-;;; Code: +- +-(ignore-glob "*_get_type" +- "_*" +- "*_ref" +- "*_unref" +- "*_copy" +- "*_free" +- "*_newv" +- "*_valist" +- "*_setv" +- "*_foreach" +- "*_valist" +- +- ;; only used by item implementations +- "gnome_canvas_request_redraw*" +- +- ;; don't deal with those yet +- "*_svp" +- "*_svp_*" +- ) +- +- +- +-(ignore "gnome_canvas_item_affine_relative" ;; don't deal with these affines yet +- "gnome_canvas_item_affine_absolute" +- "gnome_canvas_item_i2w_affine" +- "gnome_canvas_item_i2c_affine" +- "gnome_canvas_w2c_affine" +- +- ;; only for use by item implementations +- "gnome_canvas_item_request_update" +- "gnome_canvas_set_stipple_origin" +- +- ;; these use Art types, don't deal with them yet +- "gnome_canvas_cap_gdk_to_art" +- "gnome_canvas_join_gdk_to_art" +- ) ++;;;; -*- scheme -*- ++;;;; guile-gnome ++;;;; Copyright (C) 2004 Jan Nieuwenhuizen ++;;;; Andy Wingo ++ ++;;;; This program is free software; you can redistribute it and/or ++;;;; modify it under the terms of the GNU General Public License as ++;;;; published by the Free Software Foundation; either version 2 of ++;;;; the License, or (at your option) any later version. ++;;;; ++;;;; This program is distributed in the hope that it will be useful, ++;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ++;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++;;;; GNU General Public License for more details. ++;;;; ++;;;; You should have received a copy of the GNU General Public License ++;;;; along with this program; if not, contact: ++;;;; ++;;;; Free Software Foundation Voice: +1-617-542-5942 ++;;;; 59 Temple Place - Suite 330 Fax: +1-617-542-2652 ++;;;; Boston, MA 02111-1307, USA gnu@gnu.org ++ ++;; I'm not sure this wrapping for affine funtctions is the Right Way, ++;; but it works. Maybe we should have a plain affine maker: double[6] ++;; list_to_affine (SCM) or have affine_absolute take a SCM list ++;; directly? ++(define-method affine_absolute ++ (of-object "GnomeCanvasItem") ++ (c-name "_wrap_gnome_canvas_item_affine_absolute") ++ (overrides "gnome_canvas_item_affine_absolute") ++ (return-type "void") ++ (parameters ++ '("double" "x1") ++ '("double" "y2") ++ '("double" "x2") ++ '("double" "y2") ++ '("double" "x3") ++ '("double" "y3"))) ++ ++(define-method affine_relative ++ (of-object "GnomeCanvasItem") ++ (c-name "_wrap_gnome_canvas_item_affine_relative") ++ (overrides "gnome_canvas_item_affine_relative") ++ (return-type "void") ++ (parameters ++ '("double" "x1") ++ '("double" "y2") ++ '("double" "x2") ++ '("double" "y2") ++ '("double" "x3") ++ '("double" "y3"))) ++ ++(ignore-glob ++ ;; _get_type is needed/useful for the canvas, why ignore those? ++ ;;"*_get_type" ++ "_*" ++ "*_ref" ++ "*_unref" ++ "*_copy" ++ "*_free" ++ "*_newv" ++ "*_setv" ++ "*_foreach" ++ ;; "*_affine*" this removes the overridden _wrap methods now too --jcn ++ "*i2c_affine*" ++ "*i2w_affine*" ++ "*w2c_affine*" ++ "*gdk_to_art*" ++ ;; It seems that vararg functions are skipped no matter what. ++ ;;"*_valist" ++ ) + +EOF + fi + + rm -rf $OPT/guile-gnome + mkdir =build + cd =build + +# Using libtool < 1.6.0 together with gcc-3.4 may trigger this problem: +# +# If a tag has not been given, and we're using a compiler which is +# not one of the ones with which libtool was built, attempt to +# infer the compiler from the first word of the command line passed +# to libtool. +# + if [ -z "$GCC34" ]; then + # Use libtool-1.5.6, gcc-3.{2,3} without -O2, + CFLAGS='-O -g' ../src/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode + else + # or use gcc-3.4 with libtool-1.6.0 + CC=$GCC34 ../src/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode + fi + make install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site +fi + +# simple test -- fails atm +# guile -s ../src/libgnomecanvas/examples/canvas.scm + diff --git a/cygwin/mknetrel b/cygwin/mknetrel index a782c521a8..1dc7ace423 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -72,11 +72,6 @@ postconfig () { rm -f config.cache export HOST_CC=gcc export HOST_CXX=g++ - if [ "$ABI" = "1.3" ]; then - HOST_CC=gcc-2.95 - HOST_CXX=g++-2.95 - (cd $src && ln -s GNUmakefile.in GNUmakefile) - fi (PATH="$old_path" \ PATH="$HOME/usr/pkg/guile-1.6/bin:$PATH" \ CFLAGS="-O2 -g" \ diff --git a/cygwin/mknetrel.doc b/cygwin/mknetrel.doc index 6239e1c4f9..842f207b2e 100644 --- a/cygwin/mknetrel.doc +++ b/cygwin/mknetrel.doc @@ -4,12 +4,7 @@ # mknetrel.doc -- fixup doc # -if [ "$ABI" = "1.3" ]; then - docprefix=$prefix -else - docprefix=$prefix/share -fi - +docprefix=$prefix/share docdir=$docprefix/doc cygdocdir=$docdir/Cygwin @@ -17,9 +12,6 @@ infodir=$docprefix/info mandir=$docprefix/man packagedocdir=$docdir/$base-$ver -if [ "$ABI" = "1.3" ]; then -fixdoc () { :; } -else fixdoc () { # cd $inst || exit 1 @@ -34,4 +26,3 @@ fixdoc () { done true } -fi -- 2.39.5