diff options
Diffstat (limited to 'meta/recipes-extended/groff')
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-Include-config.h.patch | 208 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch | 106 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/0001-support-musl.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/groff/groff_1.23.0.bb (renamed from meta/recipes-extended/groff/groff_1.22.4.bb) | 30 |
8 files changed, 128 insertions, 398 deletions
diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch deleted file mode 100644 index 46065bc513..0000000000 --- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 6cfa9f8126c1d6ec26f120d273e714fb19108873 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 4 Aug 2019 16:32:41 -0700 -Subject: [PATCH] Include config.h - -This helps avoid the include conflicts where <stdlib.h> is including -<math.h> and since -I./lib is used and a local math.h wrapper is -residing in there, the build breaks since stdlib.h really wants the -standard system math.h to be included, this ensures that right macros -are predefined and included before stdlib.h is included - -fixes -In file included from src/libs/libgroff/assert.cpp:20: -In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-r0/recipe-sysroot/usr/include/c++/v1/stdlib.h:100: -./lib/math.h:38:3: error: "Please include config.h first." - #error "Please include config.h first." - ^ -./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN' - -We delete eqn.cpp and qen.hpp in do_configure -to ensure they're regenerated and deterministic. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libs/libgroff/assert.cpp | 4 + - src/libs/libgroff/curtime.cpp | 4 + - src/libs/libgroff/device.cpp | 4 + - src/libs/libgroff/error.cpp | 4 + - src/libs/libgroff/fatal.cpp | 4 + - src/libs/libgroff/string.cpp | 4 + - src/libs/libgroff/strsave.cpp | 4 + - src/preproc/eqn/eqn.cpp | 450 ++++++++++++++++++---------------- - src/preproc/eqn/eqn.hpp | 12 +- - src/preproc/eqn/eqn.ypp | 4 + - src/preproc/eqn/other.cpp | 4 + - src/preproc/eqn/text.cpp | 4 + - src/preproc/pic/object.cpp | 4 + - 13 files changed, 285 insertions(+), 221 deletions(-) - -diff --git a/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp -index aceed05..97780d6 100644 ---- a/src/libs/libgroff/assert.cpp -+++ b/src/libs/libgroff/assert.cpp -@@ -16,6 +16,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> - #include <stdlib.h> - #include "assert.h" -diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp -index 72fe067..9ddba08 100644 ---- a/src/libs/libgroff/curtime.cpp -+++ b/src/libs/libgroff/curtime.cpp -@@ -15,6 +15,10 @@ for more details. - The GNU General Public License version 2 (GPL2) is available in the - internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <errno.h> - #include <limits.h> - #include <stdlib.h> -diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp -index 0d28b85..c211f85 100644 ---- a/src/libs/libgroff/device.cpp -+++ b/src/libs/libgroff/device.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - #include "device.h" - #include "defs.h" -diff --git a/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp -index 9a18803..7b63d3d 100644 ---- a/src/libs/libgroff/error.cpp -+++ b/src/libs/libgroff/error.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -diff --git a/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp -index c0dcb35..fd6003e 100644 ---- a/src/libs/libgroff/fatal.cpp -+++ b/src/libs/libgroff/fatal.cpp -@@ -16,6 +16,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - - #define FATAL_ERROR_EXIT_CODE 3 -diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp -index 46c015c..449f3a6 100644 ---- a/src/libs/libgroff/string.cpp -+++ b/src/libs/libgroff/string.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - - #include "lib.h" -diff --git a/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp -index f95c05e..d875045 100644 ---- a/src/libs/libgroff/strsave.cpp -+++ b/src/libs/libgroff/strsave.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <string.h> - #include <stdlib.h> - -diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp -index fb318c3..b7b647e 100644 ---- a/src/preproc/eqn/eqn.ypp -+++ b/src/preproc/eqn/eqn.ypp -@@ -16,6 +16,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - %{ -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -diff --git a/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp -index 8db993f..38db396 100644 ---- a/src/preproc/eqn/other.cpp -+++ b/src/preproc/eqn/other.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - - #include "eqn.h" -diff --git a/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp -index f3d06f9..3b244d5 100644 ---- a/src/preproc/eqn/text.cpp -+++ b/src/preproc/eqn/text.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <ctype.h> - #include <stdlib.h> - #include "eqn.h" -diff --git a/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp -index d8ba610..f26a831 100644 ---- a/src/preproc/pic/object.cpp -+++ b/src/preproc/pic/object.cpp -@@ -17,6 +17,10 @@ for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -+#if HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - - #include "pic.h" --- -2.22.0 - 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 9105da6457..6dc84c9062 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,27 +1,25 @@ -From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001 +From aa1f37f1e0ff0dc0eeb199b52959e0deb275721e Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Sat, 7 Mar 2020 00:59:13 +0000 Subject: [PATCH] Make manpages mulitlib identical -Upstream-Status: Pending +Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com] Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> + --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index d18c49b..6175fe9 100644 +index f7ab410..7e1f3fb 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -917,7 +917,7 @@ SUFFIXES += .man - -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \ - -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \ +@@ -891,7 +891,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" \ - -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \ + -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \ - -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \ - -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \ - -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ --- -2.23.0 - + -e "s|[@]TMAC_AN_PREFIX[@]|\\\\%$(tmac_an_prefix)|g" \ + -e "s|[@]TMAC_M_PREFIX[@]|\\\\%$(tmac_m_prefix)|g" \ + -e "s|[@]TMAC_MDIR[@]|`echo $(tmacdir) | sed -f $(makevarescape)`/mm|g" \ diff --git a/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch new file mode 100644 index 0000000000..eae5dc9998 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch @@ -0,0 +1,51 @@ +From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <g.branden.robinson@gmail.com> +Date: Sat, 16 Sep 2023 16:28:00 -0500 +Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps). + +* doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize + target dependencies. Resolve race by requiring "grn" and "soelim" to + be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`. + +Fixes <https://savannah.gnu.org/bugs/?64681>. Thanks to Alexander +Kanavin for the report. + +ANNOUNCE: Acknowledge Alexander. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + doc/doc.am | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/doc/doc.am b/doc/doc.am +index cddc51907..d3c9ab6b7 100644 +--- a/doc/doc.am ++++ b/doc/doc.am +@@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@ + ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.ps: grn soelim + doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.ps: $(doc_srcdir)/webpage.ms + $(GROFF_V)$(MKDIR_P) `dirname $@` \ +@@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms + && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \ + $(doc_srcdir)/pic.ms > pic.html + +-doc/webpage.html: tbl +-doc/webpage.html: tmac/www.tmac +-doc/webpage.html: $(DOC_GNU_EPS) ++# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and ++# soelim even though the document doesn't require them. ++doc/webpage.html: grn soelim ++doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl + doc/webpage.html: $(doc_srcdir)/groff.css +-doc/webpage.html: $(doc_srcdir)/webpage.ms ++doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS) + $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ + && cd $(doc_builddir) \ + && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \ diff --git a/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch new file mode 100644 index 0000000000..3e81b86ac8 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch @@ -0,0 +1,31 @@ +From f21e9f13beb57a1e0666edf9693d7c83f2189897 Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <g.branden.robinson@gmail.com> +Date: Fri, 22 Sep 2023 01:27:57 -0500 +Subject: [PATCH] [build]: meintro_fr.ps depends on tbl. + +* doc/doc.am (doc/meintro_fr.ps): Depend on tbl, resolving race in + sufficiently parallelized builds. Overlooked in commit 92349ae223, + 2022-05-30. + +Fixes <https://savannah.gnu.org/bugs/?64695>. Thanks to Alexander +Kanavin for the report. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + doc/doc.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/doc.am b/doc/doc.am +index d3c9ab6b7..0f95c7774 100644 +--- a/doc/doc.am ++++ b/doc/doc.am +@@ -334,7 +334,7 @@ SUFFIXES += .me.in .me + + # Use '-K utf8', not '-k', in case 'configure' didn't find uchardet. + # The French translation uses tbl; its English counterpart does not. +-doc/meintro_fr.ps: doc/meintro_fr.me preconv ++doc/meintro_fr.ps: doc/meintro_fr.me preconv tbl + $(GROFF_V)$(MKDIR_P) `dirname $@` \ + && $(DOC_GROFF) -K utf8 -t -Tps -me -mfr $< >$@ + diff --git a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch deleted file mode 100644 index eda6a40f51..0000000000 --- a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Sat, 11 May 2019 17:03:03 +0800 -Subject: [PATCH 1/2] replace "perl -w" with "use warnings" - -The shebang's max length is usually 128 as defined in -/usr/include/linux/binfmts.h: - #define BINPRM_BUF_SIZE 128 - -There would be errors when @PERL@ is longer than 128, use -'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' -doesn't work: - -/usr/bin/env: perl -w: No such file or directory - -So replace "perl -w" with "use warnings" to make it work. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - -Rebase to 1.22.4. - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - font/devpdf/util/BuildFoundries.pl | 3 ++- - src/devices/gropdf/gropdf.pl | 3 ++- - src/devices/gropdf/pdfmom.pl | 3 ++- - src/utils/afmtodit/afmtodit.pl | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl -index f8af826..9584e28 100644 ---- a/font/devpdf/util/BuildFoundries.pl -+++ b/font/devpdf/util/BuildFoundries.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/usr/bin/perl - # - # BuildFoundries : Given a Foundry file generate groff and download files - # Deri James : Monday 07 Feb 2011 -@@ -22,6 +22,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - use strict; -+use warnings; - - (my $progname = $0) =~s @.*/@@; - my $where=shift||''; -diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl -index 2ec52d0..ce5a06f 100644 ---- a/src/devices/gropdf/gropdf.pl -+++ b/src/devices/gropdf/gropdf.pl -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # - # gropdf : PDF post processor for groff - # -@@ -21,6 +21,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - use strict; -+use warnings; - use Getopt::Long qw(:config bundling); - - use constant -diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl -index c9b08b2..61124f3 100644 ---- a/src/devices/gropdf/pdfmom.pl -+++ b/src/devices/gropdf/pdfmom.pl -@@ -1,4 +1,4 @@ --#!@PERL@ -w -+#!@PERL@ - # - # pdfmom : Frontend to run groff -mom to produce PDFs - # Deri James : Friday 16 Mar 2012 -@@ -23,6 +23,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - use strict; -+use warnings; - use File::Temp qw/tempfile/; - my @cmd; - my $dev='pdf'; -diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl -index 954c58e..81a6c97 100644 ---- a/src/utils/afmtodit/afmtodit.pl -+++ b/src/utils/afmtodit/afmtodit.pl -@@ -1,4 +1,4 @@ --#! /usr/bin/perl -w -+#! /usr/bin/perl - # -*- Perl -*- - # Copyright (C) 1989-2018 Free Software Foundation, Inc. - # Written by James Clark (jjc@jclark.com) -@@ -19,6 +19,7 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - use strict; -+use warnings; - - @afmtodit.tables@ - --- -2.7.4 - diff --git a/meta/recipes-extended/groff/files/0001-support-musl.patch b/meta/recipes-extended/groff/files/0001-support-musl.patch deleted file mode 100644 index a837b11b1b..0000000000 --- a/meta/recipes-extended/groff/files/0001-support-musl.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 695965c27be74acb5968f19d51af86065c4b71a9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 13 May 2019 09:48:14 +0800 -Subject: [PATCH] support musl - -... -|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration -| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit) -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36, -| from ./lib/math.h:27, -| from ./src/include/driver.h:27, -| from src/devices/grodvi/dvi.cpp:20: -|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)' -| signbit(float __x) -| ^~~~~~~ -... - -Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=453ff940449bbbde9ec00f0bbf82a359c5598fc7] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gnulib_m4/signbit.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gnulib_m4/signbit.m4 b/gnulib_m4/signbit.m4 -index 9e7884d..8b9c70c 100644 ---- a/gnulib_m4/signbit.m4 -+++ b/gnulib_m4/signbit.m4 -@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_signbit="guessing yes" ;; - # If we don't know, assume the worst. --- -2.7.4 - 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 c80a2a5c38..23992576f9 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,7 @@ -From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001 +From eb16276c3e2e34aa2e57f6a0e68554657b90cd28 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 11 May 2019 17:06:29 +0800 -Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on +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] @@ -10,23 +10,30 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> Rebase to 1.22.4 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- - font/devpdf/Foundry.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 93e9b66..235b23b 100644 +index e5aba65..5441734 100644 --- a/font/devpdf/Foundry.in +++ b/font/devpdf/Foundry.in -@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb - #====================================================================== +@@ -20,7 +20,7 @@ - #Foundry|Name|Searchpath --foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different) -+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different) - #Define Flags for afmtodit + #======================================================================= + #Foundry|Name|Search path +-foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/gsfonts:/usr/share/fonts/default/Type1:/usr/share/fonts/default/Type1/adobestd35:/usr/share/fonts/type1/urw-base35:/opt/local/share/fonts/urw-fonts:/usr/local/share/fonts/ghostscript ++foundry||(gs) + + # Enable the font description files for grops (generated from Adobe + # foundry font files) to be used with gropdf. afmtodit must not be +@@ -72,7 +72,7 @@ EURO|N||||*../devps/freeeuro.pfa + # URW fonts are typically shipped with Ghostscript, but can be replaced. + + #Foundry|Name|Search path +-foundry|U|@urwfontsdir@:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/default/Type1:/usr/share/fonts/default/Type1/adobestd35:/usr/share/fonts/type1/urw-base35:/opt/local/share/fonts/urw-fonts:/usr/local/share/fonts/ghostscript:(gs) ++foundry|U|(gs) + + # Define flags for afmtodit. - r=-i 0 -m --- -2.7.4 - diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.23.0.bb index d0b543ab6e..0fc4f831d8 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.23.0.bb @@ -3,33 +3,28 @@ DESCRIPTION = "The groff (GNU troff) software is a typesetting package which rea formatting commands and produces formatted output." SECTION = "base" HOMEPAGE = "http://www.gnu.org/software/groff/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ - file://0001-replace-perl-w-with-use-warnings.patch \ - file://groff-not-search-fonts-on-build-host.patch \ - file://0001-support-musl.patch \ - file://0001-Include-config.h.patch \ - file://0001-Make-manpages-mulitlib-identical.patch \ -" + file://groff-not-search-fonts-on-build-host.patch \ + file://0001-Make-manpages-mulitlib-identical.patch \ + file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \ + file://0001-build-meintro_fr.ps-depends-on-tbl.patch \ + " -SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" -SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293" +SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13" -# Remove at the next upgrade -PR = "r1" - -DEPENDS = "bison-native" +DEPENDS = "bison-native groff-native" RDEPENDS:${PN} += "perl sed" inherit autotools-brokensep texinfo multilib_script pkgconfig -MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog" +MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/grog" -EXTRA_OECONF = "--without-x --without-doc" -PARALLEL_MAKE = "" +EXTRA_OECONF = "--without-x --with-urw-fonts-dir=/completely/bogus/dir/" +EXTRA_OEMAKE:class-target = "GROFFBIN=groff GROFF_BIN_PATH=${STAGING_BINDIR_NATIVE}" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no' PAGE=A4" @@ -66,6 +61,9 @@ do_install:append() { # not ship /usr/bin/grap2graph and its releated man files rm -rf ${D}${bindir}/grap2graph rm -rf ${D}${mandir}/man1/grap2graph* + + # strip hosttool path out of generated files + sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${docdir}/${BP}/examples/hdtbl/*.roff } do_install:append:class-native() { |