From: Jan Nieuwenhuizen Date: Fri, 17 Sep 2004 14:07:07 +0000 (+0000) Subject: Getting close to 2.6.0 release. X-Git-Tag: release/2.3.17~16 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8f95885d55ba3454b44b64d6bdfa697624ba3717;p=lilypond.git Getting close to 2.6.0 release. --- diff --git a/ChangeLog b/ChangeLog index a758aa2992..676d9710ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-09-17 Jan Nieuwenhuizen + + * buildscripts/guile-gnome.sh: Getting close to 2.6.0 release. + 2004-09-16 Juergen Reuter * Documentation/user/notation.itely (Ancient flags): Removed diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh index 7ee64aff4a..7ebc6dbd9e 100644 --- a/buildscripts/guile-gnome.sh +++ b/buildscripts/guile-gnome.sh @@ -16,6 +16,7 @@ OPT=$HOME/usr/pkg # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck") EXTRA=${EXTRA-libgnomecanvas} +GGVERSION=2.5.992 export AUTOMAKE=automake-1.8 export ACLOCAL=aclocal-1.8 @@ -124,7 +125,7 @@ LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH ## 5. get guile-gnome -if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then +if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then if [ -n "$BLOEDIGE_RAND" ]; then if false; then # rotty @@ -145,7 +146,7 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then tla get wingo@pobox.com--2004-main/guile-gnome-dists--release guile-gnome cd guile-gnome - tla build-config -r configs/gnu.org/guile-gnome-platform-2.5.990 + tla build-config -r configs/gnu.org/guile-gnome-platform-$GGVERSION cd src EXTRA="pkg atk defs glib gstreamer gtk gtksourceview libgda libglade libgnome libgnomeui pango libgnomecanvas" EXTRA= @@ -156,7 +157,6 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then done cd libgnomecanvas - #patch -p1 < ~/canvas-pats cd .. fi @@ -165,313 +165,11 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then fi cd .. else - wget http://ambient.2y.net/wingo/tmp/guile-gnome-platform-2.5.990.tar.gz - tar xzf guile-gnome-platform-2.5.990.tar.gz - ln -s guile-gnome-platform-2.5.990 guile-gnome + wget http://ambient.2y.net/wingo/tmp/guile-gnome-platform-$GGVERSION.tar.gz + tar xzf guile-gnome-platform-$GGVERSION.tar.gz + ln -s guile-gnome-platform-$GGVERSION guile-gnome 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