summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/groff')
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch61
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch39
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch39
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch36
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch36
-rw-r--r--meta/recipes-extended/groff/groff_1.18.1.4.bb50
6 files changed, 0 insertions, 261 deletions
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch b/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch
deleted file mode 100644
index 4b0176fcdd..0000000000
--- a/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From fc289ab69c6d7e4ad489172509a85f68afec43ea Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 29 Jul 2016 03:19:39 -0400
4Subject: [PATCH] fix narrowing conversion error
5
6While gcc6 used, build old groff (for anti-GPLv3 reasons) failed:
7.....
8|groff-1.18.1.4/src/devices/grolbp/charset.h:69:1: error: narrowing
9conversion of '130' from 'int' to 'char' inside { } [-Wnarrowing]
10......
11
12In upstream git://git.savannah.gnu.org/groff.git,
13the following commit fix the issue, but the license is GPLV3,
14we could not backport it to the old groff which license is GPLV2.
15...
16commit d180038ae0da19655bc2760ae2043efa0550a76c
17Author: Werner LEMBERG <wl@gnu.org>
18Date: Wed Apr 16 21:11:07 2003 +0000
19 * src/devices/grolbp/charset.h (symset): Use `unsigned char'.
20...
21
22We use another different way to fix the issue.
23
24Upstream-Status: Pending
25
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27---
28 src/devices/grolbp/charset.h | 2 +-
29 src/devices/grolbp/lbp.cc | 4 ++--
30 2 files changed, 3 insertions(+), 3 deletions(-)
31
32diff --git a/src/devices/grolbp/charset.h b/src/devices/grolbp/charset.h
33index adc76f4..e9c6c5b 100644
34--- a/src/devices/grolbp/charset.h
35+++ b/src/devices/grolbp/charset.h
36@@ -1,6 +1,6 @@
37 // Definition of the WP54 character set
38
39-char symset[] = {
40+int symset[] = {
41 0x57,0x50,0x35,0x34,0x00,0x41,0x76,0x61,0x6e,0x74,0x47,0x61,
42 0x72,0x64,0x65,0x2d,0x42,0x6f,0x6f,0x6b,0x00,0x41,0x76,
43 0x61,0x6e,0x74,0x47,0x61,0x72,0x64,0x65,0x2d,0x44,0x65,
44diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc
45index 76db32a..00d4ca7 100644
46--- a/src/devices/grolbp/lbp.cc
47+++ b/src/devices/grolbp/lbp.cc
48@@ -152,8 +152,8 @@ static void wp54charset()
49 {
50 unsigned int i;
51 lbpputs("\033[714;100;29;0;32;120.}");
52- for (i = 0; i < sizeof(symset); i++)
53- lbpputc(symset[i]);
54+ for (i = 0; i < sizeof(symset)/sizeof(symset[0]); i++)
55+ lbpputc((char)symset[i]&0xFF);
56 lbpputs("\033[100;0 D");
57 return;
58 }
59--
602.8.1
61
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
deleted file mode 100644
index 559ae72898..0000000000
--- a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Inappropriate [embedded]
2
3Signed-off-by: Ming Liu <ming.liu@windriver.com>
4---
5 Makefile.sub | 10 +++++-----
6 1 file changed, 5 insertions(+), 5 deletions(-)
7
8--- a/contrib/groffer/Makefile.sub
9+++ b/contrib/groffer/Makefile.sub
10@@ -38,16 +38,16 @@ groffer: groffer.sh groffer2.sh version.
11 $(RM) $@;
12 sed \
13 -e "s|@g@|$(g)|g" \
14- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
15+ -e "s|@BINDIR@|$(bindir)|g" \
16 -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
17 -e "s|@VERSION@|$(version)$(revision)|g" \
18 $(srcdir)/groffer.sh >$@;
19 chmod +x $@
20
21 install_data: groffer
22- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
23- -$(RM) $(DESTDIR)$(bindir)/groffer
24- $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
25+ -test -d $(bindir) || $(mkinstalldirs) $(bindir)
26+ -$(RM) $(bindir)/groffer
27+ $(INSTALL_SCRIPT) groffer $(bindir)/groffer
28 -test -d $(DESTDIR)$(libdir)/groff/groffer || \
29 $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer
30 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
31@@ -58,7 +58,7 @@ install_data: groffer
32 $(DESTDIR)$(libdir)/groff/groffer/version.sh
33
34 uninstall_sub:
35- -$(RM) $(DESTDIR)$(bindir)/groffer
36+ -$(RM) $(bindir)/groffer
37 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
38 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
39 -rmdir $(DESTDIR)$(libdir)/groff/groffer
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
deleted file mode 100644
index c24eff9af5..0000000000
--- a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1
2Upstream-Status: Inappropriate [embedded]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5---
6 groff-1.18.1.4/Makefile.in | 7 +------
7 1 file changed, 1 insertion(+), 6 deletions(-)
8
9--- a/Makefile.in
10+++ b/Makefile.in
11@@ -460,27 +460,22 @@ OTHERDIRS=\
12 src/roff/grog \
13 src/roff/nroff \
14 contrib/mm \
15 contrib/pic2graph \
16 contrib/eqn2graph \
17- contrib/groffer \
18- contrib/mom \
19- doc
20+ contrib/groffer
21 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
22 $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
23 EXTRADIRS=\
24 font/devps/generate \
25 font/devdvi/generate \
26 font/devlj4/generate \
27- src/xditview \
28 doc
29 NOMAKEDIRS=\
30 arch/djgpp \
31 contrib/mm/examples \
32 contrib/mm/mm \
33- contrib/mom/examples \
34- contrib/mom/momdoc \
35 src/libs/snprintf
36 DISTDIRS=\
37 $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \
38 $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
39 TARGETS=all install install_bin install_data clean distclean mostlyclean \
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch b/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
deleted file mode 100644
index e3f1aa6a48..0000000000
--- a/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Inappropriate [embedded]
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: groff-1.18.1.4/tmac/man.local
6===================================================================
7--- groff-1.18.1.4.orig/tmac/man.local 2000-10-26 22:15:17.000000000 +0800
8+++ groff-1.18.1.4/tmac/man.local 2010-08-24 14:17:52.070006664 +0800
9@@ -1,2 +1,27 @@
10 .\" This file is loaded after an-old.tmac.
11 .\" Put any local modifications to an-old.tmac here.
12+.
13+.if n \{\
14+. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
15+. \" than utf8.
16+. if !'\*[.T]'utf8' \
17+. tr \[oq]'
18+.
19+. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
20+. \" grotty.
21+. if '\V[GROFF_SGR]'' \
22+. output x X tty: sgr 0
23+.
24+. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
25+. \" searching in man pages easier.
26+. if '\*[.T]'utf8' \
27+. char \- \N'45'
28+.
29+. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
30+. \" as those in command-line options. This is a bug in those pages, but
31+. \" too many fonts are missing the Unicode HYPHEN character, so we render
32+. \" this as the ASCII-compatible HYPHEN-MINUS instead.
33+. if '\*[.T]'utf8' \
34+. char - \N'45'
35+.\}
36+
diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch b/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
deleted file mode 100644
index 409c1a5a18..0000000000
--- a/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1
2Upstream-Status: Inappropriate [embedded]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: groff-1.18.1.4/tmac/mdoc.local
7===================================================================
8--- groff-1.18.1.4.orig/tmac/mdoc.local 2001-03-23 08:17:51.000000000 +0800
9+++ groff-1.18.1.4/tmac/mdoc.local 2010-08-24 14:20:22.014006846 +0800
10@@ -1,2 +1,26 @@
11 .\" This file is loaded after doc.tmac.
12 .\" Put any local modifications to doc.tmac here.
13+.
14+.if n \{\
15+. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
16+. \" than utf8.
17+. if !'\*[.T]'utf8' \
18+. tr \[oq]'
19+.
20+. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
21+. \" grotty.
22+. if '\V[GROFF_SGR]'' \
23+. output x X tty: sgr 0
24+.
25+. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
26+. \" searching in man pages easier.
27+. if '\*[.T]'utf8' \
28+. char \- \N'45'
29+.
30+. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
31+. \" as those in command-line options. This is a bug in those pages, but
32+. \" too many fonts are missing the Unicode HYPHEN character, so we render
33+. \" this as the ASCII-compatible HYPHEN-MINUS instead.
34+. if '\*[.T]'utf8' \
35+. char - \N'45'
36+.\}
diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb
deleted file mode 100644
index fc7eb44781..0000000000
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ /dev/null
@@ -1,50 +0,0 @@
1SUMMARY = "GNU Troff software"
2DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \
3formatting commands and produces formatted output."
4SECTION = "console/utils"
5HOMEPAGE = "http://www.gnu.org/software/groff/"
6LICENSE = "GPLv2"
7PR = "r1"
8
9LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3"
10
11SRC_URI = "${GNU_MIRROR}/${BPN}/old/${BP}.tar.gz \
12 file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
13 file://man-local.patch \
14 file://mdoc-local.patch \
15 file://groff-1.18.1.4-fix-bindir.patch \
16 file://fix-narrowing-conversion-error.patch \
17"
18
19inherit autotools texinfo
20
21EXTRA_OECONF="--without-x --prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}info --with-appresdir=${D}${datadir}"
22
23SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287"
24SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d"
25PARALLEL_MAKE = ""
26
27do_configure (){
28 oe_runconf
29}
30
31do_install_append() {
32 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
33 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
34 for i in afmtodit mmroff; do
35 if [ -f ${D}${bindir}/$i ]; then
36 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
37 fi
38 done
39
40 mkdir -p ${D}${sysconfdir}/groff
41 cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/
42 cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/
43}
44
45pkg_postinst_${PN}() {
46 ln -s tbl $D${bindir}/gtbl
47 echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> $D${sysconfdir}/profile
48 echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> $D${sysconfdir}/profile
49}
50
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 14:53:11 +0000