From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-gnome, devel: removes guile-1.8 specific code and dependency Date: Tue, 7 Oct 2014 19:54:30 -0300 Message-ID: <20141007195430.217ab315@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/46QrO7ci+S5kkAKswbl4+1." X-Trace: ger.gmane.org 1412722531 27113 80.91.229.3 (7 Oct 2014 22:55:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Oct 2014 22:55:31 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Wed Oct 08 00:55:24 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xbdf5-0001CD-S7 for guile-devel@m.gmane.org; Wed, 08 Oct 2014 00:55:20 +0200 Original-Received: from localhost ([::1]:32918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbdf5-0002wU-EE for guile-devel@m.gmane.org; Tue, 07 Oct 2014 18:55:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbdev-0002vA-3E for guile-devel@gnu.org; Tue, 07 Oct 2014 18:55:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xbdeo-0001SM-3w for guile-devel@gnu.org; Tue, 07 Oct 2014 18:55:09 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:50583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbden-0000iL-Pt for guile-devel@gnu.org; Tue, 07 Oct 2014 18:55:02 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 33D7EA04C2A6 for ; Wed, 8 Oct 2014 00:54:40 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id f2BiL5wjKKwE for ; Wed, 8 Oct 2014 00:32:52 +0200 (CEST) Original-Received: from capac (unknown [189.60.186.149]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 98E64A04C2A4 for ; Wed, 8 Oct 2014 00:54:32 +0200 (CEST) X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17571 Archived-At: --MP_/46QrO7ci+S5kkAKswbl4+1. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, guile-gnome devel: removes guile-1.8 specific code and dependency Attached, patch review welcome. Happy hacking, David --MP_/46QrO7ci+S5kkAKswbl4+1. Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0015-removes-guile-1.8-specific-code-and-dependency.patch =46rom 681b47b766d0c2235fe396e002fcce5a03c80a17 Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Tue, 7 Oct 2014 19:48:33 -0300 Subject: [PATCH] removes guile-1.8 specific code and dependency * configure.ac: 1.8 removed from the supported guile version list * glib/gnome/gobject/utils.scm: * glib/gnome/gw/support/gtk-doc.scm: * glib/gnome/gw/support/modules.scm: * glib/gnome/gw/support/slib.scm: code related to the support of guile versions prior to guile 2 has been removed. In addition, as when/unless macros have been introduced in guile 2.0.5, its definition has also been removed. --- configure.ac | 2 +- glib/gnome/gobject/utils.scm | 40 +++++++++--------------------------= ---- glib/gnome/gw/support/gtk-doc.scm | 6 ------ glib/gnome/gw/support/modules.scm | 10 ---------- glib/gnome/gw/support/slib.scm | 12 +++--------- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/configure.ac b/configure.ac index dcb1487..0fa5e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ AC_HELP_STRING([--disable-deprecated],[Disable wrapping o= f functions deprecated # Check for Guile # GUILE_EFFECTIVE_VERSION=3Dno -all_versions=3D"2.2 2.0 1.8" +all_versions=3D"2.2 2.0" for v in $all_versions; do if test $GUILE_EFFECTIVE_VERSION =3D no; then AC_MSG_NOTICE([checking for Guile $v.x]) diff --git a/glib/gnome/gobject/utils.scm b/glib/gnome/gobject/utils.scm index 7a36bbb..5383a36 100644 --- a/glib/gnome/gobject/utils.scm +++ b/glib/gnome/gobject/utils.scm @@ -41,8 +41,7 @@ ;;; {Miscellaneous} ;;; =20 -(cond-expand - (guile-2 +(eval-when (expand load eval) (define-syntax define-macro-with-docs (lambda (x) "Define a defmacro with documentation." @@ -50,14 +49,6 @@ ((_ (f . args) doc b0 b* ...) #'(define-macro (f . args) doc b0 b* ...)))))) - (else - (define-macro (define-macro-with-docs form docs . body) - `(begin - (define-macro ,form ,@body) - (set-object-property! ,(car form) 'documentation ,docs))) - (define-macro (unless test . body) - `(if (not ,test) (begin ,@body))) - (export unless))) =20 (define-macro-with-docs (define-with-docs name docs val) "Define @var{name} as @var{val}, documenting the value with @@ -202,24 +193,11 @@ Uses @code{gtype-name->scheme-name}." (resolve-interface ',mod))) args)))) =20 -(define-macro (unless test . body) - `(if (not ,test) (begin ,@body))) - -(cond-expand - (guile-2 - (define-macro (with-accessors names . body) - `(let (,@(map (lambda (name) - ;; Ew, fixme. - `(,name (make-procedure-with-setter - (lambda (x) (slot-ref x ',name)) - (lambda (x y) (slot-set! x ',name y))))) - names)) - ,@body))) - (else - (define-macro (with-accessors names . body) - `(let (,@(map (lambda (name) - `(,name ,(make-procedure-with-setter - (lambda (x) (slot-ref x name)) - (lambda (x y) (slot-set! x name y))))) - names)) - ,@body)))) +(define-macro (with-accessors names . body) + `(let (,@(map (lambda (name) + ;; Ew, fixme. + `(,name (make-procedure-with-setter + (lambda (x) (slot-ref x ',name)) + (lambda (x y) (slot-set! x ',name y))))) + names)) + ,@body)) diff --git a/glib/gnome/gw/support/gtk-doc.scm b/glib/gnome/gw/support/gtk-= doc.scm index 463bfc8..4accfd9 100644 --- a/glib/gnome/gw/support/gtk-doc.scm +++ b/glib/gnome/gw/support/gtk-doc.scm @@ -138,13 +138,7 @@ ;; is (for-each (lambda (pair) - (cond-expand - (guile-2 (define-parsed-entity! (car pair) (cdr pair))) - (else - (set! ssax:predefined-parsed-entities - (assoc-set! ssax:predefined-parsed-entities - (car pair) (cdr pair)))))) '((nbsp . " ") (percnt . "%") (oacute . "=C3=B3") diff --git a/glib/gnome/gw/support/modules.scm b/glib/gnome/gw/support/modu= les.scm index 7ed28d0..4ebbcff 100644 --- a/glib/gnome/gw/support/modules.scm +++ b/glib/gnome/gw/support/modules.scm @@ -30,16 +30,6 @@ #:export-syntax (re-export-modules) #:export (export-all-lazy!)) =20 -(cond-expand - (guile-2) - (else - (define-macro (eval-when conditions . forms) - (if (or (memq 'eval conditions) - (memq 'load conditions)) - `(begin . ,forms) - '(begin))) - (export eval-when))) - (define (force-bindings module) (cond ((and (eq? (module-kind module) 'interface) (module-binder module)) diff --git a/glib/gnome/gw/support/slib.scm b/glib/gnome/gw/support/slib.scm index 8b979ed..7c47558 100644 --- a/glib/gnome/gw/support/slib.scm +++ b/glib/gnome/gw/support/slib.scm @@ -33,12 +33,6 @@ (define (require feature) #f) ; noop (define (require-if condition feature) #f) ; noop =20 -(cond-expand - (guile-2 - (include-from-path "gnome/gw/support/glob.scm") - (include-from-path "gnome/gw/support/genwrite.scm") - (include-from-path "gnome/gw/support/printf.scm")) - (else - (load "glob.scm") - (load "genwrite.scm") - (load "printf.scm"))) +(include-from-path "gnome/gw/support/glob.scm") +(include-from-path "gnome/gw/support/genwrite.scm") +(include-from-path "gnome/gw/support/printf.scm") --=20 2.1.1 --MP_/46QrO7ci+S5kkAKswbl4+1.--