Re: guile-cairo - patch

[David Pirotte <david@altosw.be>]

[-- Attachment #1.1: Type: text/plain, Size: 965 bytes --]

Hello Daniel,

> Here comes 1 (attached) patch, which fixes both 'make check'
> and 'make distcheck'.
> ...

Here is another patch, to be applied after the previous one, see the
commit log ... [1]

David

[1]	a bit more on this ...

1-

This patch removes the call to m4_esyscmd, which itself called
build-aux/git-version-gen which i removed from the EXTRA_DIST target in
the previous patch.

2-

Speaking about version, you might consider - I won't do that myself, as
I can't regenerate, hence I can't fully check - to update the
doc/guile-cairo.texi file to call

		@include version.texi

... instead of manually set VERSION and UPDATED  because when automake
detect the above, it generates the version.texi file which contains the
above and more ... and then as a dev, you'd have one and only one
location to take care of when updating the version - s/w wise, we still
have to manually update the NEW file [and the web-pages (?)]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0002-Build-review-configure.ac.patch --]
[-- Type: text/x-patch, Size: 1554 bytes --]

From 5d701e9d16add264cc8dc1f4b17fc5e5c1029201 Mon Sep 17 00:00:00 2001
From: David Pirotte <david@altosw.be>
Date: Thu, 23 Mar 2023 23:34:28 -0300
Subject: [PATCH 2/2] Build review - configure.ac

* configure.ac: Manually set the version in the AC_INIT call. Removing
  the AC_SUBST(VERSION, x.y.z) call, it is generated.
---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 274d825..27aa373 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ define(GUILE_CAIRO_CONFIGURE_COPYRIGHT,[[
 Copyright (C) 2007, 2011-2012, 2014, 2017, 2020 Andy Wingo <wingo@pobox.com>
 Copyright (C) 2011 Patrick Bernaud <patrickb@chez.com>
 Copyright (C) 2018 Daniel Llorens <daniel.llorens@bluewin.ch>
-Copyright (C) 2018 David Pirotte <david@altosw.be>
+Copyright (C) 2018, 2023 David Pirotte <david@altosw.be>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as
@@ -24,7 +24,7 @@ License along with this program.  If not, see
 AC_PREREQ(2.52)
 
 AC_INIT([guile-cairo],
-        m4_esyscmd([build-aux/git-version-gen --match v1.11.2\* .tarball-version]),
+        [1.12.0],
         [guile-user@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE([1.14 gnu -Wno-portability -Wno-syntax \
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
-AC_SUBST(VERSION, 1.12.0)
 
 AC_ISC_POSIX
 AC_PROG_CC
-- 
2.39.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]