gbranden pushed a commit to branch master
in repository groff.
commit 33fcda9b107fb662cbf7792e2a472a5de59a36bc
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 11 04:17:45 2025 -0500
[build]: Fix Savannah #67013 (`PAGE` -> "DESC").
Write any desired paper format to generated DESC files.
* font/devdvi/devdvi.am (font/devdvi/DESC):
* font/devlbp/devlbp.am (font/devlbp/DESC):
* font/devlj4/devlj4.am (font/devlj4/DESC):
* font/devpdf/devpdf.am (font/devpdf/DESC):
* font/devps/devps.am (font/devps/DESC): Write the "configure"d paper
format to generated device description files, instead of only ever
"a4" or "letter".
* NEWS: Add item.
---
ChangeLog | 15 +++++++++++++++
NEWS | 8 ++++++++
font/devdvi/devdvi.am | 8 ++------
font/devlbp/devlbp.am | 8 ++------
font/devlj4/devlj4.am | 8 ++------
font/devpdf/devpdf.am | 9 ++-------
font/devps/devps.am | 8 ++------
7 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1ec94f4da..4e3b1d794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2025-04-11 G. Branden Robinson <[email protected]>
+
+ * font/devdvi/devdvi.am (font/devdvi/DESC):
+ * font/devlbp/devlbp.am (font/devlbp/DESC):
+ * font/devlj4/devlj4.am (font/devlj4/DESC):
+ * font/devpdf/devpdf.am (font/devpdf/DESC):
+ * font/devps/devps.am (font/devps/DESC): Write the "configure"d
+ paper format to generated device description files, instead of
+ only ever "a4" or "letter".
+
+ * NEWS: Add item.
+
+ Fixes <https://savannah.gnu.org/bugs/?67013>. Thanks to Lennart
+ Jablonka for prompting this idea.
+
2025-04-11 G. Branden Robinson <[email protected]>
* Makefile.am: Drop comments documenting `PAGE` and
diff --git a/NEWS b/NEWS
index d3db3630e..131d68d1e 100644
--- a/NEWS
+++ b/NEWS
@@ -726,6 +726,14 @@ Miscellaneous
* Support for terminal devices using the CCSID 1047 (EBCDIC) encoding
has been withdrawn.
+* You can now specify any paper format you like--including the file
+ specification "/etc/papersize" for systems using "libpaper"--as the
+ default that the groff build writes to generated device description
+ files ("DESC") for the "dvi", "lbp", "lj4", "pdf", and "ps" output
+ drivers. (The paper format must still be valid; see groff_font(5)).
+
+ Example: ./configure PAGE=/etc/papersize --prefix=/opt/gnu
+
* Building groff no longer requires the PSUtils package.
* Building groff no longer requires the makeinfo package. Since groff
diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am
index 07716e4f0..c058d3eba 100644
--- a/font/devdvi/devdvi.am
+++ b/font/devdvi/devdvi.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2025 Free Software Foundation, Inc.
#
# This file is part of 'groff'.
#
@@ -88,11 +88,7 @@ MOSTLYCLEANFILES += font/devdvi/DESC
font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& cat $(devdvi_srcdir)/DESC.in >$@ \
- && if test "$(PAGE)" = A4; then \
- echo "papersize a4" >>$@; \
- else \
- echo "papersize letter" >>$@; \
- fi \
+ && echo "papersize $(PAGE)" >>$@ \
&& (test -z '$(DVIPRINT)' \
|| echo print '$(DVIPRINT)' >>$@)
diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am
index 0702a2088..2c815edc2 100644
--- a/font/devlbp/devlbp.am
+++ b/font/devlbp/devlbp.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2025 Free Software Foundation, Inc.
#
# This file is part of 'groff'.
#
@@ -44,11 +44,7 @@ MOSTLYCLEANFILES += font/devlbp/DESC
font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& cat $(devlbp_srcdir)/DESC.in >$@ \
- && if test "$(PAGE)" = A4; then \
- echo "papersize a4" >>$@; \
- else \
- echo "papersize letter" >>$@; \
- fi \
+ && echo "papersize $(PAGE)" >>$@ \
&& (test -z '$(LBPPRINT)' \
|| echo print '$(LBPPRINT)' >>$@)
diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am
index 9f17c4d72..b60bb780d 100644
--- a/font/devlj4/devlj4.am
+++ b/font/devlj4/devlj4.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2025 Free Software Foundation, Inc.
#
# This file is part of 'groff'.
#
@@ -89,11 +89,7 @@ font/devlj4/DESC: $(devlj4_srcdir)/DESC.in
&& echo "res $(LJ4RES)" >$@ \
&& echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ \
&& cat $(devlj4_srcdir)/DESC.in >>$@ \
- && if test "$(PAGE)" = A4; then \
- echo "papersize a4" >>$@; \
- else \
- echo "papersize letter" >>$@; \
- fi \
+ && echo "papersize $(PAGE)" >>$@ \
&& (test -z '$(LJ4PRINT)' \
|| echo print '$(LJ4PRINT)' >>$@)
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index cfe237f36..d325129cf 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2025 Free Software Foundation, Inc.
# Written by Deri James <[email protected]>
# Automake migration by Bertrand Garrigues
# <[email protected]>
@@ -91,12 +91,7 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
&& cat $(devpdf_srcdir)/DESC.in \
>$(top_builddir)/font/devpdf/DESC \
- && if test "$(PAGE)" = A4; then \
- echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \
- else \
- echo "papersize letter" \
- >>$(top_builddir)/font/devpdf/DESC; \
- fi
+ && echo "papersize $(PAGE)" >>$@
font/devpdf/Foundry: $(devpdf_srcdir)/Foundry.in
$(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/
diff --git a/font/devps/devps.am b/font/devps/devps.am
index c44065759..c2c2103a9 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2022 Free Software Foundation, Inc.
+# Copyright (C) 2014-2025 Free Software Foundation, Inc.
#
# This file is part of 'groff'.
#
@@ -151,11 +151,7 @@ font/devps/DESC: $(devps_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) font/devps \
&& cat $(devps_srcdir)/DESC.in >[email protected] \
&& echo broken $(BROKEN_SPOOLER_FLAGS) >>[email protected] \
- && if test "$(PAGE)" = A4; then \
- echo "papersize a4" >>[email protected]; \
- else \
- echo "papersize letter" >>[email protected]; \
- fi \
+ && echo "papersize $(PAGE)" >>[email protected] \
&& (test -z '$(PSPRINT)' \
|| echo print '$(PSPRINT)' >>[email protected])
$(AM_V_at)mv [email protected] $@
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
