summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff/groff-1.22.3
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/groff/groff-1.22.3')
-rw-r--r--meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-rw-r--r--meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch102
-rw-r--r--meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch34
-rw-r--r--meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch20
4 files changed, 0 insertions, 186 deletions
diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index b61b432818..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
19===================================================================
20--- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
21+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
22@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
deleted file mode 100644
index f1db5b0653..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
+++ /dev/null
@@ -1,102 +0,0 @@
1From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 6 Apr 2017 01:46:00 -0700
4Subject: [PATCH] replace "perl -w" with "use warnings"
5
6The shebang's max length is usually 128 as defined in
7/usr/include/linux/binfmts.h:
8 #define BINPRM_BUF_SIZE 128
9
10There would be errors when @PERL@ is longer than 128, use
11'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w'
12doesn't work:
13
14/usr/bin/env: perl -w: No such file or directory
15
16So replace "perl -w" with "use warnings" to make it work.
17
18Upstream-Status: Pending
19
20Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
21---
22 font/devpdf/util/BuildFoundries.pl | 3 ++-
23 src/devices/gropdf/gropdf.pl | 3 ++-
24 src/devices/gropdf/pdfmom.pl | 3 ++-
25 src/utils/afmtodit/afmtodit.pl | 3 ++-
26 4 files changed, 8 insertions(+), 4 deletions(-)
27
28diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
29index 39f2f0d..a2bfd8e 100644
30--- a/font/devpdf/util/BuildFoundries.pl
31+++ b/font/devpdf/util/BuildFoundries.pl
32@@ -1,4 +1,4 @@
33-#!/usr/bin/perl -w
34+#!/usr/bin/perl
35 #
36 # BuildFoundries : Given a Foundry file generate groff and download files
37 # Deri James : Monday 07 Feb 2011
38@@ -22,6 +22,7 @@
39 # along with this program. If not, see <http://www.gnu.org/licenses/>.
40
41 use strict;
42+use warnings;
43
44 my $where=shift||'';
45 my $devps=shift||'../devps';
46diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
47index 035d123..b933b32 100644
48--- a/src/devices/gropdf/gropdf.pl
49+++ b/src/devices/gropdf/gropdf.pl
50@@ -1,4 +1,4 @@
51-#!@PERL@ -w
52+#!@PERL@
53 #
54 # gropdf : PDF post processor for groff
55 #
56@@ -21,6 +21,7 @@
57 # along with this program. If not, see <http://www.gnu.org/licenses/>.
58
59 use strict;
60+use warnings;
61 use Getopt::Long qw(:config bundling);
62 use Compress::Zlib;
63
64diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
65index beec820..4b46ea4 100644
66--- a/src/devices/gropdf/pdfmom.pl
67+++ b/src/devices/gropdf/pdfmom.pl
68@@ -1,4 +1,4 @@
69-#!@PERL@ -w
70+#!@PERL@
71 #
72 # pdfmom : Frontend to run groff -mom to produce PDFs
73 # Deri James : Friday 16 Mar 2012
74@@ -24,6 +24,7 @@
75 # along with this program. If not, see <http://www.gnu.org/licenses/>.
76
77 use strict;
78+use warnings;
79 use File::Temp qw/tempfile/;
80 my @cmd;
81 my $dev='pdf';
82diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
83index 4f2ce83..5c078ff 100644
84--- a/src/utils/afmtodit/afmtodit.pl
85+++ b/src/utils/afmtodit/afmtodit.pl
86@@ -1,4 +1,4 @@
87-#! /usr/bin/perl -w
88+#! /usr/bin/perl
89 # -*- Perl -*-
90 # Copyright (C) 1989-2014 Free Software Foundation, Inc.
91 # Written by James Clark (jjc@jclark.com)
92@@ -19,6 +19,7 @@
93 # along with this program. If not, see <http://www.gnu.org/licenses/>.
94
95 use strict;
96+use warnings;
97
98 @afmtodit.tables@
99
100--
1012.10.2
102
diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
deleted file mode 100644
index c73328a186..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Correct the install path of man.local to fix following error:
2 /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
3
4Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
5Upstream-Status: Pending
6
7diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
8index 1506232..f1468c5 100644
9--- a/tmac/Makefile.sub
10+++ b/tmac/Makefile.sub
11@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
12 $(RM) $(DESTDIR)$(mdocdir)/$$f; \
13 $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
14 done
15- -test -f $(DESTDIR)$(localtmacdir)/man.local \
16+ -test -f $(DESTDIR)$(tmacdir)/man.local \
17 || $(INSTALL_DATA) $(srcdir)/man.local \
18- $(DESTDIR)$(localtmacdir)/man.local
19+ $(DESTDIR)$(tmacdir)/man.local
20 -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
21 || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
22
23@@ -164,9 +164,9 @@ uninstall_sub:
24 $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
25 $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
26 $(RM) $(DESTDIR)$(tmacdir)/www.tmac
27- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
28+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
29 $(srcdir)/man.local; then \
30- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
31+ $(RM) $(DESTDIR)$(tmacdir)/man.local; \
32 fi
33 -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
34 $(srcdir)/mdoc.local; then \
diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
deleted file mode 100644
index ff8f320592..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1groff searchs fonts which are provided by ghostscript on build host.
2It causes non-determinism issue. So not search font dirs on host.
3
4Upstream-Status: Inappropriate [cross build specific]
5
6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7
8diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
9index a6e968f..8094642 100644
10--- a/font/devpdf/Foundry.in
11+++ b/font/devpdf/Foundry.in
12@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
13 #======================================================================
14
15 #Foundry|Name|Searchpath
16-foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
17+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
18 #Define Flags for afmtodit
19
20 r=-i 0 -m