From patchwork Tue Nov 10 11:33:27 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaipaul Cheernam X-Patchwork-Id: 103560 Received: from PA4PR04CU001.outbound.protection.outlook.com (PA4PR04CU001.outbound.protection.outlook.com [40.107.162.25]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17627.1794310413992854354 for ; Tue, 10 Nov 2026 03:33:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@est.tech header.s=selector1 header.b=0MJt7c3A; spf=pass (domain: est.tech, ip: 40.107.162.25, mailfrom: jaipaul.cheernam@est.tech) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nD9GmhYKGfghfhVLS6lz+2qPma2XjPPinAbJjaaRfJVqvrUDa4skT7VWVoAwfwoK2p++WZb5857/pj9dU2nisF0r9luaAaoVnz0whMAgl35iyqVPTd4PwjhKC7vCAXYGlGdo3SocCasC+iHxY/m67QvWiU7YncfCF/lBexXiWLi2/pzV2xoYn6WCLk11EozkeMG5em24VUIX6tNmqQjXsN+RqrCHRBAk8m8BnakaAVy3MkLLDDuJ0ouu77o5eGBlS8BOIXBk8xFtEN8ipMZFo61T9xJLKqlbucXeeYKUco/kWfUiMLN9kMRa+QX+8aYbzL142SNJlmBrzC+mqxYq0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EnHqhnnKMm8rs0/oMCB8qsSdc0OLx7mLAlsBo9+TkBI=; b=H29OPPp07t1/SX0DHf92aywHNmOZ/y9px6V5UALcfxBOxGoP9lY5W3GPVTEJsfFFHaTiDXHvm+NwDpjTBNfeJ9MSUFaBgK+5/wXmFFKdLa1e7cf5RJKSn2PfvY4Z8u43tfv1ZEe+psxpb/92tik5URCgm6clxLzAr3UTis648aO+pMinMByDgAs3pLkHiDlPJnaiPCZQIHuOzrjs/mSMlFXPGd7jdemiRXSEVB18HwU7ovJjUeWs7s6TMcvcycy71WYe5wcP/E2/8Ejl1M15lmntprxnTIwtZ/K9r1fmPmufq1xdQy9Tz56w3gS+Sb4RsCJFE/FxfhYvRYL3HNaMKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=est.tech; dmarc=pass action=none header.from=est.tech; dkim=pass header.d=est.tech; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=est.tech; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EnHqhnnKMm8rs0/oMCB8qsSdc0OLx7mLAlsBo9+TkBI=; b=0MJt7c3AZfO1sA7N1RFzUthh2+bJeiHcpnhBVqh3sQQvWmVTxCeRm7zYisMsqL/NG/LtOwCgK7d+UXuskUWP5+J/mvGyUhndWFvgo4ScJm7Dd/inTlycZUT1IsYrSzfLusGjqrZh356piKb8mKYQU+lYE5e9ha83zNHTGC2OpdVfViEvvj802lKdCAOfITHLGV4557bgYhM+7CizSwmN2XP1VNVFm5W1UUZduYk5AnWCmgJa9KGufD6xtd0+DSezweY7u/N82CHiiwKPunFDOxm9AdC2m5qW0e2zWl/NsGtFO7fAVkfAAj+BA6HIywAZlwM3xRKDX4EbY2B/klenLw== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=est.tech; Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) by VI0P189MB3113.EURP189.PROD.OUTLOOK.COM (2603:10a6:800:2cd::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.8; Tue, 10 Nov 2026 11:33:29 +0000 Received: from AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb]) by AM6P189MB3107.EURP189.PROD.OUTLOOK.COM ([fe80::bc97:3847:8f02:acb%6]) with mapi id 15.21.0592.010; Tue, 10 Nov 2026 11:33:28 +0000 From: Jaipaul Cheernam To: openembedded-core@lists.openembedded.org Subject: [PATCH v2] groff: Upgrade 1.24.2 -> 1.25.0 Date: Tue, 10 Nov 2026 12:33:27 +0100 Message-ID: <20261110113327.80833-1-jaipaul.cheernam@est.tech> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261109134034.74458-17-jaipaul.cheernam@est.tech> References: <20261109134034.74458-17-jaipaul.cheernam@est.tech> X-ClientProxiedBy: LO4P123CA0186.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a4::11) To AM6P189MB3107.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:6c0::19) Return-Path: jaipaul.cheernam@est.tech MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6P189MB3107:EE_|VI0P189MB3113:EE_ X-MS-Office365-Filtering-Correlation-Id: f3043063-a974-4f1d-0534-08df3f1e7106 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|260925021311599003|260925021911599003|260925022911599003|10067099003|11063799006|56012099006|261022105027099003|261022075727099003|261021121427099003|261021123027099003|261009223027099003|261102123227099003|261026121527099003|261026140227099003|261028144727099003|18002099003|22082099003|6133799003; X-Microsoft-Antispam-Message-Info: ZpIitkK9tkQiyvYhBiojGm0oVP4IGYepmFQlslusrdFZHepIciglixzqFfYNJ/Xk16N+YD9HmIP+bLQk1B4VwtBo58LydjtYABtV1DmjPh5qLAs3xTdZmtA1nsa8YRRgsdzgzii1YGp+YghQCV2sKqzJVtj7sSApuFYUdMRnxpIwOIoZLwXsSILG6upfrKoBRdP7m9zgcikMAdBdoPzNZ7XQnLoIO0sGnZyqa3B8AZ12kaRU7VuyczJv5Rna79/RuOM1vUihDTUKY18T9KPtjLNkrVZSXH8Ldk+VTNQ9+1knoOqv6ArlY5Pqc8cVQWWk3ZVIkfqnfR1U4u1/T0lGhT1fkHJBtCNYkiQyAKpBnE1hMVpZP8zNQ+24NT4GifOa8o1fsh7alhVMzh0JR+YgNnyAcNEHxIYdaPMsdKVRx5m3NlV1I35DlYi4qljsGNJcevXGHKUE3kynOOfs9PsmPUGIga9PaWBcKkXpT3X3OSIm/GD7Ku4/+h0uHOZ7fhBWgC9wUd8WcGlSis/UhsY6mQvFKEHOe+WtM9VgoHax7vW/8vrlouabBSvMnrQ81eyBdoDMECU5IbNzCqMrpZoAWh4DeYJdinwPXH0bMTlY97x71gk01G6e04Y3OV+xwTUC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6P189MB3107.EURP189.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(376014)(1800799024)(366016)(260925021311599003)(260925021911599003)(260925022911599003)(10067099003)(11063799006)(56012099006)(261022105027099003)(261022075727099003)(261021121427099003)(261021123027099003)(261009223027099003)(261102123227099003)(261026121527099003)(261026140227099003)(261028144727099003)(18002099003)(22082099003)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZUNknC9kXn+jsHFTgN8Do5OMyhIcKLFT06cx6m2HVQVQAF+brWhnE8KGyAcI6ptcql+ApLK9lty4409ob//4zHpHtUL0eK5sWxQSHp6aUkqDsSiRr6pgvK3gNK0N7N/zRMz03Exqc6rCOwavbvD7yr3gO9gHKPaPIjvdNkL5TsSglUvFODU6sytx1dUP6Rnv7uUJ7xR8pb34fqK2hiI+63MEN1DHga2OkvJ10K+Cm8QGOvKFYCMNWnlI1z2ouAybMpq1DciCMNSnE8WzFwO6ffGoAFmWVkodM21qGLFwO09zgrkixSYF+xmfeoN68AZ3vl+TUkRBaXheYlnY15rPfeAJRU9f5WSB236DCCavzARdrsxaHqADiokObxHEerA/61xbowCOcqe42KCH4tinmpiHwa6B6zESO8fa4HesnsWoE+LifO5IWs8heFDoy+wO2x1rdR8U5w/v82/z/w3VE3ag8mkaYEOXmo5FD6XguHjafywia3dAiUhVtkePxDGngg9rnNLvlF1A0DJIqnZoQzdu5VToNom9sMud+HQwzLAjT4lMjL89y8lhW3Laaxpbhyw28baSUbzhqlxzZ3G3v0vBcGsYqXtlcIiEcq458GWdjtpmBLfmH4OIyvNJ4XWbpnEdXr0y1buqSVopVAeLSPpzWR1BpWipCOZaN5MJAGqxN/TpSoskz9g+RcSWRGGooKu+cdYBmrM79gV4fzS672LFBNTlcRsvdWALhj2j/vI9aUy9MXEa24v9i3acnp+X/CFxkRFObrFuIPUgbwUSh8QLUkvZ/qowmw+2LU2ZjfWLrNcmrP3ifDt2o2gf3LGmVEM9uuKMNMA+y8sHxTRk41MY78t30PmfCjFP/3pAklv1mO1YUTLxbR7Ri+IOqH5XPmIlx0sT3hKEwzKbVccnaNRcMHLSIFpob/l0cLTiTD4n/Tf6vvGvd6Wbz5BHPBVI/qGVZ4NPFF8gP2seFkfKKkGDYT5Pmg8gfZkujVijpDCCZag8ErTT61gsiTNfaNVoK0zK9HEXf7DA0SJbihk/14Cj+hZGyooukqv5M9Z6BQL7Ivim5HIU8hzU4wylmzyt9v082VKRrI3u2JfKlgzUuatKoqRWtJtEn3jeWbV9YzA6R/yKu/N/r0ZbT9z+j2FJTtjZffQNNjIGV8qD8oRQtYp0QyejPT2jRmPrtYZwlOaCpK+8O2olxL86RKnulVMRBIFPkeavS7tUh+gmNhqlfeG6q/awgbrka8LwR+Q5u9hIHnwgSslzgoxiTJOjoR4IqPW2oCZ5ox/dE+ixAP0Ml7rD017dWhXdRV2L9x3PyVQBU21dbXWUs+rvPPkM+e42r9tiSH6eCat+9cdvBsweaBjPoV+lYAYhqGp5LWNKJzWv1gQTXhQsCyCCTYbbQezJE6peOi3Kw0dlgTUakpAKNUmBlaLsEZdCDwHr/Ge4IFGhegmIi0pz5Yfk7tKUdAEWfsYyno2EZDdXEO3NuLJ8yvROzqpAt3rJJgBOMb794GFriNDHMhlGpE6cXsqhxq0Nn+6c1xCQrLo/W7zaPAfOpsbRJPW721QkJ37aw1NuTnWHZIFj3nymMdViJ6pL01JDJbZcJz1BoPD7RotEeLpeQlu5t99ygDScVvvCpvxdD3o4IWqZIRD26a19pBeL8g+XTqxO5LZAkStEqR3P4FPnJWn96eqhT3AFcBwdBAg0pIPgzaBAGmmmJq6rSyvVo6E811p6TtKs3Eo/Ffp14IzaZXDaTtAic8NY/1yAKaLPrFA= X-OriginatorOrg: est.tech X-MS-Exchange-CrossTenant-Network-Message-Id: f3043063-a974-4f1d-0534-08df3f1e7106 X-MS-Exchange-CrossTenant-AuthSource: AM6P189MB3107.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2026 11:33:28.8958 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d2585e63-66b9-44b6-a76e-4f4b217d97fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QQPY/FZZN6whwcDzhsBU4TNkpOhSh7HTzc8rKO16ne5u/v4nefgDpYLpJiu2QGNCcEdHCBVgw60mWAU01c2e2Z//nCxMBLeJxo005SzUxok= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0P189MB3113 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 10 Nov 2026 11:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249917 - Drop builddep.patch as fix is part of release - Refresh exisitng patches - Fix cross-compilation of man pages by using native soelim and stripping build paths. Signed-off-by: Jaipaul Cheernam --- Changes since v1: - Fix cross-compilation of man pages by using native soelim and stripping build paths. ...001-Make-manpages-mulitlib-identical.patch | 7 ++-- ...groff-not-found-in-cross-compilation.patch | 15 ++++----- ...E_DATE_EPOCH-for-reproducible-builds.patch | 7 ++-- .../groff/files/build-less.patch | 22 +++++++++++-- .../groff/files/builddep.patch | 33 ------------------- ...groff-not-search-fonts-on-build-host.patch | 13 ++++---- .../{groff_1.24.2.bb => groff_1.25.0.bb} | 11 ++++--- 7 files changed, 44 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-extended/groff/files/builddep.patch rename meta/recipes-extended/groff/{groff_1.24.2.bb => groff_1.25.0.bb} (89%) diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch index 6dc84c9062..093f447bc2 100644 --- a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch +++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch @@ -1,20 +1,19 @@ -From aa1f37f1e0ff0dc0eeb199b52959e0deb275721e Mon Sep 17 00:00:00 2001 +From 3497a04ab9bf74f7d686ebbd3bc5997227083f6c Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Sat, 7 Mar 2020 00:59:13 +0000 Subject: [PATCH] Make manpages mulitlib identical Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Jeremy Puhlman - --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index f7ab410..7e1f3fb 100644 +index 32deb25..b74e100 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -891,7 +891,7 @@ SUFFIXES += .man +@@ -860,7 +860,7 @@ SUFFIXES += .man -e "s|[@]PAGE[@]|\\\\%$(PAGE)|g" \ -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \ -e "s|[@]PSPRINT[@]|`echo $(PSPRINT) | sed -f $(makevarescape)`|g" \ diff --git a/meta/recipes-extended/groff/files/0001-groff-fix-test-groff-not-found-in-cross-compilation.patch b/meta/recipes-extended/groff/files/0001-groff-fix-test-groff-not-found-in-cross-compilation.patch index e9214519e7..c1db0134f8 100644 --- a/meta/recipes-extended/groff/files/0001-groff-fix-test-groff-not-found-in-cross-compilation.patch +++ b/meta/recipes-extended/groff/files/0001-groff-fix-test-groff-not-found-in-cross-compilation.patch @@ -1,4 +1,4 @@ -From c0f835a59d7b33452f280c8a73c3214e0a3a3d9f Mon Sep 17 00:00:00 2001 +From f0dfb4b314893769659b25da145d602d1dd87499 Mon Sep 17 00:00:00 2001 From: Zhang Peng Date: Fri, 6 Mar 2026 05:18:33 +0000 Subject: [PATCH] groff: fix test-groff not found in cross-compilation @@ -29,7 +29,7 @@ Signed-off-by: Zhang Peng 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am -index b99e869..120d3ee 100644 +index 98d1def..57a3b3e 100644 --- a/contrib/mom/mom.am +++ b/contrib/mom/mom.am @@ -24,7 +24,7 @@ mom_srcdir = $(top_srcdir)/contrib/mom @@ -42,12 +42,12 @@ index b99e869..120d3ee 100644 GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ $(PDFMOMBIN) $(FFLAG) $(MFLAG) -M$(mom_srcdir) -K utf8 -p -e -t \ diff --git a/doc/doc.am b/doc/doc.am -index 6cf9db5..906a989 100644 +index 8220a5d..e159f70 100644 --- a/doc/doc.am +++ b/doc/doc.am -@@ -54,7 +54,7 @@ groffmanpagesoption = -P-e - endif - +@@ -65,7 +65,7 @@ endif # HAVE_URW_FONTS + # Use this macro to render a document if it has forward internal + # references. DOC_PDFMOM = \ - GROFF_COMMAND=test-groff \ + GROFF_COMMAND=$(abs_top_builddir)/test-groff \ @@ -77,6 +77,3 @@ index a65898a..9c6a8b6 100644 -exec $builddir/groff "$@" +exec $GROFF_BIN_PATH/groff "$@" --- -2.51.2 - diff --git a/meta/recipes-extended/groff/files/0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch b/meta/recipes-extended/groff/files/0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch index 8ab3668edc..512ba81585 100644 --- a/meta/recipes-extended/groff/files/0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch +++ b/meta/recipes-extended/groff/files/0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch @@ -1,4 +1,4 @@ -From f28f0c4d8dfdfb1c173d21df6ffbe35448fada9f Mon Sep 17 00:00:00 2001 +From ac24fa823dbe17630cfe7e1e9ec56abd5767cd4c Mon Sep 17 00:00:00 2001 From: Zhang Peng Date: Mon, 9 Mar 2026 20:10:00 +0800 Subject: [PATCH] gropdf: use SOURCE_DATE_EPOCH for reproducible builds @@ -17,7 +17,7 @@ Signed-off-by: Zhang Peng 1 file changed, 7 insertions(+) diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl -index f519a53..3a79b4c 100644 +index cf996d8..3d7ec2d 100644 --- a/src/devices/gropdf/gropdf.pl +++ b/src/devices/gropdf/gropdf.pl @@ -30,6 +30,13 @@ use POSIX qw(mktime); @@ -34,6 +34,3 @@ index f519a53..3a79b4c 100644 use constant { WIDTH => 0, --- -2.50.0 - diff --git a/meta/recipes-extended/groff/files/build-less.patch b/meta/recipes-extended/groff/files/build-less.patch index dc560fbb30..62cd9f1718 100644 --- a/meta/recipes-extended/groff/files/build-less.patch +++ b/meta/recipes-extended/groff/files/build-less.patch @@ -1,12 +1,25 @@ +From d30928c7ee37eabf32075d88b1e6a406968651c2 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 19 May 2026 15:15:07 +0100 +Subject: [PATCH] groff: build less in groff-native + Build less bits of groff to save time and reduce random build failures from missing dependencies in this logic. Upstream-Status: Inappropriate Signed-off-by: Ross Burton +--- + Makefile.am | 15 --------------- + 1 file changed, 15 deletions(-) ---- a/Makefile.am~ 2026-05-15 13:23:08.000000000 +0100 -+++ b/Makefile.am 2026-05-15 13:29:17.053867035 +0100 -@@ -556,15 +556,0 @@ +diff --git a/Makefile.am b/Makefile.am +index b74e100..9b5ecec 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -553,21 +553,6 @@ AM_CFLAGS = + include $(top_srcdir)/lib/gnulib.mk + include $(top_srcdir)/arch/mingw/mingw.am + include $(top_srcdir)/arch/misc/misc.am -include $(top_srcdir)/contrib/chem/chem.am -include $(top_srcdir)/contrib/eqn2graph/eqn2graph.am -include $(top_srcdir)/contrib/gdiffmk/gdiffmk.am @@ -22,3 +35,6 @@ Signed-off-by: Ross Burton -include $(top_srcdir)/contrib/rfc1345/rfc1345.am -include $(top_srcdir)/contrib/sboxes/sboxes.am -include $(top_srcdir)/doc/doc.am + include $(top_srcdir)/font/devX100/devX100.am + include $(top_srcdir)/font/devX100-12/devX100-12.am + include $(top_srcdir)/font/devX75/devX75.am diff --git a/meta/recipes-extended/groff/files/builddep.patch b/meta/recipes-extended/groff/files/builddep.patch deleted file mode 100644 index 71c23d60b5..0000000000 --- a/meta/recipes-extended/groff/files/builddep.patch +++ /dev/null @@ -1,33 +0,0 @@ -[mom]: Fix example build dependencies - -We are seeing occasional failures for eqn being missing when building -mom examples, e.g.: - -| groff-1.24.0/groff: error: couldn't exec eqn: Permission denied -| pdfmom: fatal error: groff-1.24.0/test-groff exited with status 24 -| make[2]: *** [Makefile:19256: contrib/mom/examples/slide-demo.pdf] Error 1 - -It may find eqn from the host system if installed too. - -Fix the build dependencies to add eqn, pic, tbl and preconv since a -quick strace indicates them all being used here - -Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/groff.git/commit/?id=3f7d8ea20f91a8abf248fbf7ec73049cd8c3c9c2] - -Signed-off-by: Richard Purdie - -Index: groff-1.24.0/contrib/mom/mom.am -=================================================================== ---- groff-1.24.0.orig/contrib/mom/mom.am -+++ groff-1.24.0/contrib/mom/mom.am -@@ -144,8 +144,8 @@ SUFFIXES += .mom .pdf - && LC_ALL=C $(MOMPDFMOM) $< >$@ - - $(MOMPROCESSEDEXAMPLEFILES): $(MOMNORMALFILES) \ -- test-groff groff troff gropdf pdfmom penguin.ps penguin.pdf \ -- font/devpdf/stamp tmac/pdf.tmac -+ test-groff groff troff gropdf pdfmom eqn pic tbl preconv \ -+ penguin.ps penguin.pdf font/devpdf/stamp tmac/pdf.tmac - - penguin.ps: - $(AM_V_at)cp $(mom_srcdir)/examples/penguin.ps $@ diff --git a/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch b/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch index 111dbd385e..b1e7a08cf3 100644 --- a/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch +++ b/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch @@ -1,7 +1,8 @@ -From eb16276c3e2e34aa2e57f6a0e68554657b90cd28 Mon Sep 17 00:00:00 2001 +From 6c2c062e9ccd4235a6262e1effbdd40ec7d35b25 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Sat, 11 May 2019 17:06:29 +0800 Subject: [PATCH] groff searchs fonts which are provided by ghostscript on + build host. It causes non-determinism issue. So not search font dirs on host. Upstream-Status: Inappropriate [cross build specific] @@ -13,25 +14,24 @@ Signed-off-by: Hongxu Jia Rebase to 1.24.0 Signed-off-by: Zhang Peng - --- font/devpdf/Foundry.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in -index e5aba65..5441734 100644 +index 56297fc..3a43aaa 100644 --- a/font/devpdf/Foundry.in +++ b/font/devpdf/Foundry.in -@@ -23,7 +23,7 @@ +@@ -21,7 +21,7 @@ #======================================================================= #Foundry|Name|Search path --foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/urw-base35/:/usr/share/fonts/urw-base35:/opt/local/share/fonts/urw-fonts/:/usr/local/share/fonts/ghostscript/:/usr/share/fonts/type1/gsfonts/:/usr/share/fonts/type1/:/usr/share/fonts/default/Type1/adobestd35/:/usr/share/fonts/default/Type1/:/usr/share/ghostscript/Resource/Font +-foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/urw-base35/:/usr/share/fonts/urw-base35:/opt/local/share/fonts/urw-fonts/:/usr/local/share/fonts/ghostscript/:/usr/share/fonts/type1/gsfonts/:/usr/share/fonts/type1/:/usr/share/fonts/default/Type1/adobestd35/:/usr/share/fonts/default/Type1/ +foundry||(gs) # Enable the font description files for grops (generated from Adobe # foundry font files) to be used with gropdf. afmtodit must not be -@@ -79,7 +79,7 @@ EURO|N||||*../devps/freeeuro.pfa +@@ -73,7 +73,7 @@ EURO|N||||*../devps/freeeuro.pfa # URW fonts are typically shipped with Ghostscript, but can be replaced. #Foundry|Name|Search path @@ -39,3 +39,4 @@ index e5aba65..5441734 100644 +foundry|U|(gs) # Define flags for afmtodit. + diff --git a/meta/recipes-extended/groff/groff_1.24.2.bb b/meta/recipes-extended/groff/groff_1.25.0.bb similarity index 89% rename from meta/recipes-extended/groff/groff_1.24.2.bb rename to meta/recipes-extended/groff/groff_1.25.0.bb index e13996500f..a13236d92c 100644 --- a/meta/recipes-extended/groff/groff_1.24.2.bb +++ b/meta/recipes-extended/groff/groff_1.25.0.bb @@ -11,13 +11,11 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-Make-manpages-mulitlib-identical.patch \ file://0001-groff-fix-test-groff-not-found-in-cross-compilation.patch \ - file://0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch \ - file://builddep.patch \ " SRC_URI:append:class-native = "file://build-less.patch" -SRC_URI[sha256sum] = "f9c1efd5bebbe37fc6e1063db7473ce8df1e3e0be4ff0f43ce04fce57e9c5dd9" +SRC_URI[sha256sum] = "24d103a07eb79e418963bce206c8771b649871f83bda2fd4c2e65529c1c56921" DEPENDS = "bison-native groff-native" RDEPENDS:${PN} += "perl sed" @@ -27,7 +25,7 @@ inherit autotools-brokensep texinfo multilib_script pkgconfig MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/grog" EXTRA_OECONF = "--without-x --with-urw-fonts-dir=/completely/bogus/dir/" -EXTRA_OEMAKE:class-target = "GROFFBIN=groff GROFF_BIN_PATH=${STAGING_BINDIR_NATIVE}" +EXTRA_OEMAKE:class-target = "GROFFBIN=groff GROFF_BIN_PATH=${STAGING_BINDIR_NATIVE} SOELIMBIN=${STAGING_BINDIR_NATIVE}/soelim" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" @@ -71,6 +69,11 @@ do_install:append() { if [ -d ${D}${docdir}/${BP}/examples/hdtbl/ ]; then sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${docdir}/${BP}/examples/hdtbl/*.roff fi + + # Remove build paths from generated groff.7 for reproducibility. + if [ -f ${D}${mandir}/man7/groff.7 ]; then + sed -i -e 's:${S}/::g' ${D}${mandir}/man7/groff.7 + fi } do_install:append:class-native() {