* [PATCH 0/2] Current Groff is really GPLv3!
@ 2013-08-09 20:46 Saul Wold
2013-08-09 20:46 ` [PATCH 1/2] groff: Add GPLv2 version Saul Wold
2013-08-09 20:46 ` [PATCH 2/2] groff: Fix License to be GPLv3 Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: Saul Wold @ 2013-08-09 20:46 UTC (permalink / raw)
To: openembedded-core
Turns out that a groff update was done sometime ago, and while committer
noted the license checksum changed, they did not verify the true nature
of the change. I caught this by total chance looking at the license
manifest directory.
Saul Wold (2):
groff: Add GPLv2 version
groff: Fix License to be GPLv3
.../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch | 35 ++++++++++++++++
.../groff/groff-1.18.1.4/man-local.patch | 32 +++++++++++++++
.../groff/groff-1.18.1.4/mdoc-local.patch | 31 +++++++++++++++
meta/recipes-extended/groff/groff_1.18.1.4.bb | 46 ++++++++++++++++++++++
meta/recipes-extended/groff/groff_1.22.2.bb | 2 +-
5 files changed, 145 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
create mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
--
1.8.1.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] groff: Add GPLv2 version
2013-08-09 20:46 [PATCH 0/2] Current Groff is really GPLv3! Saul Wold
@ 2013-08-09 20:46 ` Saul Wold
2013-08-09 20:46 ` [PATCH 2/2] groff: Fix License to be GPLv3 Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2013-08-09 20:46 UTC (permalink / raw)
To: openembedded-core
Apparrently a LICENSE change was missed, so we add the GPLv2 version back in
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch | 35 ++++++++++++++++
.../groff/groff-1.18.1.4/man-local.patch | 32 +++++++++++++++
.../groff/groff-1.18.1.4/mdoc-local.patch | 31 +++++++++++++++
meta/recipes-extended/groff/groff_1.18.1.4.bb | 46 ++++++++++++++++++++++
4 files changed, 144 insertions(+)
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
create mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
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
new file mode 100644
index 0000000..90ad8e3
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
@@ -0,0 +1,35 @@
+---
+ groff-1.18.1.4/Makefile.in | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -460,27 +460,22 @@ OTHERDIRS=\
+ src/roff/grog \
+ src/roff/nroff \
+ contrib/mm \
+ contrib/pic2graph \
+ contrib/eqn2graph \
+- contrib/groffer \
+- contrib/mom \
+- doc
++ contrib/groffer
+ ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+ $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+ EXTRADIRS=\
+ font/devps/generate \
+ font/devdvi/generate \
+ font/devlj4/generate \
+- src/xditview \
+ doc
+ NOMAKEDIRS=\
+ arch/djgpp \
+ contrib/mm/examples \
+ contrib/mm/mm \
+- contrib/mom/examples \
+- contrib/mom/momdoc \
+ src/libs/snprintf
+ DISTDIRS=\
+ $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \
+ $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
+ 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
new file mode 100644
index 0000000..34b4248
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
@@ -0,0 +1,32 @@
+Index: groff-1.18.1.4/tmac/man.local
+===================================================================
+--- groff-1.18.1.4.orig/tmac/man.local 2000-10-26 22:15:17.000000000 +0800
++++ groff-1.18.1.4/tmac/man.local 2010-08-24 14:17:52.070006664 +0800
+@@ -1,2 +1,27 @@
+ .\" This file is loaded after an-old.tmac.
+ .\" Put any local modifications to an-old.tmac here.
++.
++.if n \{\
++. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
++. \" than utf8.
++. if !'\*[.T]'utf8' \
++. tr \[oq]'
++.
++. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
++. \" grotty.
++. if '\V[GROFF_SGR]'' \
++. output x X tty: sgr 0
++.
++. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
++. \" searching in man pages easier.
++. if '\*[.T]'utf8' \
++. char \- \N'45'
++.
++. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
++. \" as those in command-line options. This is a bug in those pages, but
++. \" too many fonts are missing the Unicode HYPHEN character, so we render
++. \" this as the ASCII-compatible HYPHEN-MINUS instead.
++. if '\*[.T]'utf8' \
++. char - \N'45'
++.\}
++
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
new file mode 100644
index 0000000..140a544
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
@@ -0,0 +1,31 @@
+Index: groff-1.18.1.4/tmac/mdoc.local
+===================================================================
+--- groff-1.18.1.4.orig/tmac/mdoc.local 2001-03-23 08:17:51.000000000 +0800
++++ groff-1.18.1.4/tmac/mdoc.local 2010-08-24 14:20:22.014006846 +0800
+@@ -1,2 +1,26 @@
+ .\" This file is loaded after doc.tmac.
+ .\" Put any local modifications to doc.tmac here.
++.
++.if n \{\
++. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
++. \" than utf8.
++. if !'\*[.T]'utf8' \
++. tr \[oq]'
++.
++. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
++. \" grotty.
++. if '\V[GROFF_SGR]'' \
++. output x X tty: sgr 0
++.
++. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
++. \" searching in man pages easier.
++. if '\*[.T]'utf8' \
++. char \- \N'45'
++.
++. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
++. \" as those in command-line options. This is a bug in those pages, but
++. \" too many fonts are missing the Unicode HYPHEN character, so we render
++. \" this as the ASCII-compatible HYPHEN-MINUS instead.
++. if '\*[.T]'utf8' \
++. char - \N'45'
++.\}
diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb
new file mode 100644
index 0000000..cf3adea
--- /dev/null
+++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb
@@ -0,0 +1,46 @@
+SUMMARY = "GNU Troff software"
+DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \
+formatting commands and produces formatted output."
+SECTION = "console/utils"
+PRIORITY = "required"
+HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
+LICENSE = "GPLv2"
+PR = "r1"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3"
+
+SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
+ file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
+ file://man-local.patch \
+ file://mdoc-local.patch"
+
+inherit autotools
+
+EXTRA_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}"
+
+SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287"
+SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d"
+PARALLEL_MAKE = ""
+
+
+do_configure (){
+ oe_runconf
+}
+
+do_install_prepend() {
+ install -m 0755 -d ${D}
+}
+
+
+do_install_append() {
+ mkdir -p ${D}${sysconfdir}/groff
+ cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/
+ cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/
+}
+
+pkg_postinst_${PN}() {
+ ln -s ${bindir}/tbl ${bindir}/gtbl
+ echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> ${sysconfdir}/profile
+ echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> ${sysconfdir}/profile
+}
+
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] groff: Fix License to be GPLv3
2013-08-09 20:46 [PATCH 0/2] Current Groff is really GPLv3! Saul Wold
2013-08-09 20:46 ` [PATCH 1/2] groff: Add GPLv2 version Saul Wold
@ 2013-08-09 20:46 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2013-08-09 20:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/groff/groff_1.22.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb
index dc964ae..9d2a3c7 100644
--- a/meta/recipes-extended/groff/groff_1.22.2.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The groff (GNU troff) software is a typesetting package which rea
formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
-LICENSE = "GPLv2"
+LICENSE = "GPLv3"
PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-09 20:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-09 20:46 [PATCH 0/2] Current Groff is really GPLv3! Saul Wold
2013-08-09 20:46 ` [PATCH 1/2] groff: Add GPLv2 version Saul Wold
2013-08-09 20:46 ` [PATCH 2/2] groff: Fix License to be GPLv3 Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.