gbranden pushed a commit to branch master
in repository groff.
commit 131de13dc20e6185019c4fdf1da42f75ec3d8fef
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Aug 13 18:05:01 2025 -0500
[devpdf]: Fix Savannah #67415.
* font/devpdf/devpdf.am: Rationalize use of make(1) macros for
intelligibility and to fix a missing-prerequisite bug.
(DEVPDFFONTFILES_FROM_DEVPS): Rename this...
(devpdffont_descriptions_from_devps): ...to this. Not all "files" are
font descriptions, and we need a macro to track only the latter.
(DEVPDFFONTFILES_FOR_URW): Rename this...
(devpdffont_descriptions_for_urw): ...to this for similar reasons.
(DEVPDFFONTFILES): Rename and rescope this...
(devpdffontdescriptions): ...to this. Retain the "SS" font
description file in its expansion but drop "symbolsl.{afm,pfb}" and
"download"...
(devpdffontdata): ...moving them here, along with the expansion of
`devpdffontdescriptions`.
(font/devpdf/download): Depend on the expansion of
`devpdffont_descriptions_from_devps`.
Fixes <https://savannah.gnu.org/bugs/?67415>. Thanks to Bjarni Ingi
Gislason for the report and analysis. Problem introduced (I think--its
exposure required "make --shuffle") by me in commit bace292caf, 29 June.
---
ChangeLog | 25 +++++++++++++++++++++++++
font/devpdf/devpdf.am | 29 ++++++++++++++---------------
2 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed1b6fcdf..938cbf219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2025-08-13 G. Branden Robinson <[email protected]>
+
+ * font/devpdf/devpdf.am: Rationalize use of make(1) macros for
+ intelligibility and to fix a missing-prerequisite bug.
+ (DEVPDFFONTFILES_FROM_DEVPS): Rename this...
+ (devpdffont_descriptions_from_devps): ...to this. Not all
+ "files" are font descriptions, and we need a macro to track only
+ the latter.
+ (DEVPDFFONTFILES_FOR_URW): Rename this...
+ (devpdffont_descriptions_for_urw): ...to this for similar
+ reasons.
+ (DEVPDFFONTFILES): Rename and rescope this...
+ (devpdffontdescriptions): ...to this. Retain the "SS" font
+ description file in its expansion but drop "symbolsl.{afm,pfb}"
+ and "download"...
+ (devpdffontdata): ...moving them here, along with the expansion
+ of `devpdffontdescriptions`.
+ (font/devpdf/download): Depend on the expansion of
+ `devpdffont_descriptions_from_devps`.
+
+ Fixes <https://savannah.gnu.org/bugs/?67415>. Thanks to Bjarni
+ Ingi Gislason for the report and analysis. Problem introduced
+ {I think--its exposure required "make --shuffle"} by me in
+ commit bace292caf, 29 June.
+
2025-08-11 G. Branden Robinson <[email protected]>
* src/preproc/tbl/table.cpp (table::print_single_hrule): When
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 558d19078..9bcf1040c 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -20,7 +20,7 @@
devpdf_srcdir = $(top_srcdir)/font/devpdf
devpdf_builddir = $(top_builddir)/font/devpdf
-DEVPDFFONTFILES_FROM_DEVPS = \
+devpdffont_descriptions_from_devps = \
font/devpdf/S \
font/devpdf/ZD \
font/devpdf/ZCMI \
@@ -67,7 +67,7 @@ DEVPDFFONTFILES_FROM_DEVPS = \
font/devpdf/KOM
if HAVE_URW_FONTS
-DEVPDFFONTFILES_FOR_URW = \
+devpdffont_descriptions_for_urw = \
font/devpdf/U-S \
font/devpdf/U-ZD \
font/devpdf/U-ZCMI \
@@ -105,17 +105,16 @@ DEVPDFFONTFILES_FOR_URW = \
font/devpdf/U-TR
endif
-DEVPDFFONTFILES = $(DEVPDFFONTFILES_FROM_DEVPS) \
+devpdffontdescriptions = $(devpdffont_descriptions_from_devps) \
+ $(devpdffont_descriptions_for_urw) \
font/devpdf/DESC \
- font/devpdf/SS \
- font/devpdf/symbolsl.afm \
- font/devpdf/symbolsl.pfb \
- font/devpdf/download
+ font/devpdf/SS
devpdffontdir = $(fontdir)/devpdf
-devpdffontdata = \
- $(DEVPDFFONTFILES) \
- $(DEVPDFFONTFILES_FOR_URW) \
+devpdffontdata = $(devpdffontdescriptions) \
+ font/devpdf/symbolsl.afm \
+ font/devpdf/symbolsl.pfb \
+ font/devpdf/download \
font/devpdf/Foundry
devpdffont_DATA = $(devpdffontdata)
MOSTLYCLEANFILES += $(devpdffontdata)
@@ -146,7 +145,7 @@ EXTRA_DIST += \
all: font/devpdf/stamp
-$(DEVPDFFONTFILES_FROM_DEVPS):
+$(devpdffont_descriptions_from_devps):
$(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf
$(AM_V_at)for f in $@; do \
cp -f $(top_srcdir)/font/devps/`basename $$f` \
@@ -222,10 +221,11 @@ endif
# This is kind of a cheat, but works because BuildFoundries produces so
# many artifacts.
-$(DEVPDFFONTFILES_FOR_URW) $(DEFAULT_BASE35_FONTS) \
+$(devpdffont_descriptions_for_urw) $(DEFAULT_BASE35_FONTS) \
$(URW_BASE35_FONTS): font/devpdf/download
font/devpdf/download: $(devpdffontencdata) $(devpdffontmapdata) \
+ $(devpdffont_descriptions_from_devps) \
font/devpdf/DESC font/devpdf/Foundry font/devpdf/util/BuildFoundries
$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
&&
PATH="$(abs_top_builddir)$(GROFF_PATH_SEPARATOR)$(abs_top_builddir)/build-aux$(GROFF_PATH_SEPARATOR)$(PATH)"
\
@@ -237,10 +237,9 @@ font/devpdf/download: $(devpdffontencdata)
$(devpdffontmapdata) \
&& mv [email protected] $@
# PDFs to be produced by troff should depend on this stamp file to
-# ensure that gropdf's device and font description files are available.
+# ensure that gropdf's supporting files are available.
MOSTLYCLEANFILES += font/devpdf/stamp
-font/devpdf/stamp: font/devpdf/DESC $(DEVPDFFONTFILES) \
- font/devpdf/download
+font/devpdf/stamp: $(devpdffontdata)
$(AM_V_at)>$@
font_devpdf_default_test=\
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
