From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id E8B7C72670 for ; Thu, 25 Dec 2014 02:20:02 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail1.windriver.com (8.14.9/8.14.5) with ESMTP id sBP2K13I002023 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Wed, 24 Dec 2014 18:20:01 -0800 (PST) Received: from pek-hjia-d1.corp.ad.wrs.com (128.224.162.194) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.174.1; Wed, 24 Dec 2014 18:20:00 -0800 From: Hongxu Jia To: , Date: Thu, 25 Dec 2014 10:19:55 +0800 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: <960042129c61baae9bdf304c256f8d2e8dd578da.1419309149.git.hongxu.jia@windriver.com> References: <960042129c61baae9bdf304c256f8d2e8dd578da.1419309149.git.hongxu.jia@windriver.com> MIME-Version: 1.0 Subject: [PATCH V2 6/6] groff: upgrade 1.22.3 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2014 02:20:05 -0000 Content-Type: text/plain Rebase groff-1.22.2-correct-man.local-install-path.patch to 1.22.3 Refer what debian did, we add perl to RRECOMMENDS_${PN}, here is the explanation in groff 1.22.3 README: ... Additionally, producing `PDF' output directly with the `gropdf' device needs a working installation of `perl'. The same is true for some other preprocessors like `chem'. ... Signed-off-by: Hongxu Jia --- ...off-1.22.2-correct-man.local-install-path.patch | 32 --------------- .../groff-correct-man.local-install-path.patch | 45 ++++++++++++++++++++++ .../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++-- 3 files changed, 49 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (89%) diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch deleted file mode 100644 index f7e9a74..0000000 --- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -Correct the install path of man.local to fix following error: - /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' - -Signed-off-by: Zhenhua Luo -Upstream-Status: Pending - ---- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800 -+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800 -@@ -114,9 +114,9 @@ - rm -f $(DESTDIR)$(mdocdir)/$$f; \ - $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ - done -- -test -f $(DESTDIR)$(localtmacdir)/man.local || \ -+ -test -f $(DESTDIR)$(tmacdir)/man.local || \ - $(INSTALL_DATA) $(srcdir)/man.local \ -- $(DESTDIR)$(localtmacdir)/man.local -+ $(DESTDIR)$(tmacdir)/man.local - -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \ - $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local - -@@ -158,9 +158,9 @@ - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac - -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac - -rm -f $(DESTDIR)$(tmacdir)/www.tmac -- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ -+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ - $(srcdir)/man.local; then \ -- rm -f $(DESTDIR)$(localtmacdir)/man.local; \ -+ rm -f $(DESTDIR)$(tmacdir)/man.local; \ - fi - -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ - $(srcdir)/mdoc.local; then \ diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch new file mode 100644 index 0000000..e5db6cf --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-correct-man.local-install-path.patch @@ -0,0 +1,45 @@ +Correct the install path of man.local to fix following error: + + /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' + +Signed-off-by: Zhenhua Luo +Upstream-Status: Pending + +Rebase to 1.22.3 +Signed-off-by: Hongxu Jia +--- + tmac/Makefile.sub | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub +index 1506232..f1468c5 100644 +--- a/tmac/Makefile.sub ++++ b/tmac/Makefile.sub +@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ + $(RM) $(DESTDIR)$(mdocdir)/$$f; \ + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ + done +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ ++ -test -f $(DESTDIR)$(tmacdir)/man.local \ + || $(INSTALL_DATA) $(srcdir)/man.local \ +- $(DESTDIR)$(localtmacdir)/man.local ++ $(DESTDIR)$(tmacdir)/man.local + -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ + || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local + +@@ -164,9 +164,9 @@ uninstall_sub: + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac + $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac + $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ ++ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \ + $(srcdir)/man.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ ++ $(RM) $(DESTDIR)$(tmacdir)/man.local; \ + fi + -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ + $(srcdir)/mdoc.local; then \ +-- +1.9.1 + diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.3.bb similarity index 89% rename from meta/recipes-extended/groff/groff_1.22.2.bb rename to meta/recipes-extended/groff/groff_1.22.3.bb index 63f0425..bd42593 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -9,14 +9,15 @@ PR = "r1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ - file://groff-1.22.2-correct-man.local-install-path.patch \ + file://groff-correct-man.local-install-path.patch \ " -SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" -SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" +SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" +SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" DEPENDS = "groff-native" DEPENDS_class-native = "" +RRECOMMENDS_${PN} = "perl" inherit autotools texinfo -- 1.9.1