From 565a01ef66f84bedbe39a6e3d3faf2a4f86bd331 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 30 Nov 2023 23:14:51 -0500 Subject: [PATCH] Replace gnulib patch with new common helper macro. Using the new DX_PATCH_GNULIB macro allows m4 to implement the conditional dependency patches that were previously being done in bootstrap. --- bootstrap | 8 +------- common | 2 +- configure.ac | 4 +++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bootstrap b/bootstrap index 4b7c11d..dd1c530 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012, 2021 Nick Bowler +# Copyright © 2011-2012, 2021, 2023 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -40,12 +40,6 @@ fi $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in || die "Failed to fixup Gnulib makefile fragment." -# Rewrite if ! ... construts produced by gnulib conditional dependencies -# as these fail in heirloom-sh. -sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \ - m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit -mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit - # Punt some automake-generated files so that Gentoo's wrapper script # doesn't try to detect the automake version in use. rm -f Makefile.in aclocal.m4 diff --git a/common b/common index 03a2675..1566158 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 03a26752c80546ac8cf8fc81807bb5a153786599 +Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180 diff --git a/configure.ac b/configure.ac index 5099990..fe3dae9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl Copyright © 2019-2022 Nick Bowler +dnl Copyright © 2019-2023 Nick Bowler dnl dnl Based on original work Copyright © 1999-2013 Jiri (George) Lebl. dnl @@ -6,6 +6,8 @@ dnl License GPLv2+: GNU General Public License version 2 or any later version. dnl This is free software: you are free to change and redistribute it. dnl There is NO WARRANTY, to the extent permitted by law. +DX_PATCH_GNULIB + AC_INIT([GObject Builder], [2.0.20a], [nbowler@draconx.ca], [gob-dx]) AC_CONFIG_SRCDIR([src/treefuncs.def]) AC_CONFIG_AUX_DIR([build-aux]) -- 2.43.0