From 96ba985da85bbdb5acadbbd82164f3953834009b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 5 Dec 2022 10:32:38 +0800 Subject: texinfo: upgrade 7.0 -> 7.0.1 dont-depend-on-help2man.patch refreshed for 7.0.1 Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni --- .../texinfo/texinfo/dont-depend-on-help2man.patch | 6 +- meta/recipes-extended/texinfo/texinfo_7.0.1.bb | 90 ++++++++++++++++++++++ meta/recipes-extended/texinfo/texinfo_7.0.bb | 90 ---------------------- 3 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 meta/recipes-extended/texinfo/texinfo_7.0.1.bb delete mode 100644 meta/recipes-extended/texinfo/texinfo_7.0.bb (limited to 'meta') diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch index 969e2844cd..825887cc2e 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -1,4 +1,4 @@ -From a2230125082000a1b28b3867f86baa8d80b63df2 Mon Sep 17 00:00:00 2001 +From 451a9b9c3874872d575693fc7733fae02690a7d3 Mon Sep 17 00:00:00 2001 From: Edwin Plauchu Date: Tue, 29 Nov 2016 13:43:24 -0600 Subject: [PATCH] dont-depend-on-help2man @@ -14,7 +14,7 @@ Signed-off-by: Edwin Plauchu 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am -index a1f5b54..5cff41f 100644 +index 407a38c..6b5ff3e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -55,7 +55,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ @@ -24,8 +24,8 @@ index a1f5b54..5cff41f 100644 - $(man_MANS) $(TXI_XLATE) \ + $(TXI_XLATE) \ $(refcard_files) \ + gendocs.chapter/gendocs_template \ texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ - texinfo-ja.tex short-sample-ja.texi \ diff --git a/man/Makefile.am b/man/Makefile.am index d0cd72c..a19e52a 100644 --- a/man/Makefile.am diff --git a/meta/recipes-extended/texinfo/texinfo_7.0.1.bb b/meta/recipes-extended/texinfo/texinfo_7.0.1.bb new file mode 100644 index 0000000000..f0f9211594 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo_7.0.1.bb @@ -0,0 +1,90 @@ +SUMMARY = "Documentation system for on-line information and printed output" +DESCRIPTION = "Texinfo is a documentation system that can produce both \ +online information and printed output from a single source file. The \ +GNU Project uses the Texinfo file format for most of its documentation." +HOMEPAGE = "http://www.gnu.org/software/texinfo/" +SECTION = "console/utils" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +PROVIDES:append:class-native = " texinfo-replacement-native" + +def compress_pkg(d): + if bb.data.inherits_class('compress_doc', d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS:info += "${@compress_pkg(d)}" + +DEPENDS = "zlib ncurses texinfo-replacement-native" +DEPENDS:class-native = "zlib-native ncurses-native" + +TARGET_PATCH = "file://use_host_makedoc.patch" +TARGET_PATCH:class-native = "" + +SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ + file://disable-native-tools.patch \ + file://link-zip.patch \ + file://dont-depend-on-help2man.patch \ + ${TARGET_PATCH} \ + " + +SRC_URI[sha256sum] = "53c01dd34c9bf116866d03aabd38c5cd9ee95ac10043d61aa33dec0d27825d8d" + +tex_texinfo = "texmf/tex/texinfo" + +inherit gettext autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" + +do_configure:prepend () { + # autotools_do_configure updates po/Makefile.in.in, we also need + # update po_document. + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ +} + +do_compile:prepend() { + if [ -d tools ];then + oe_runmake -C tools/gnulib/lib + fi +} + +do_install:append() { + mkdir -p ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} + sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi + sed -i -e 's,${HOSTTOOLS_DIR},,' ${D}${bindir}/texindex +} + +do_install:append:class-native() { + install -m 755 info/makedoc ${D}${bindir} +} + +PACKAGES += "info info-doc" + +FILES:info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" +FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ + ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ + ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" + +FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +RDEPENDS:${PN} = "perl" +FILES:${PN}-doc = "${infodir}/texi* \ + ${datadir}/${tex_texinfo} \ + ${mandir}/man1 ${mandir}/man5" + +# Lie about providing the Locale::gettext_xs module. It is not actually built, +# but the code will test for it and if not found use Locale::gettext_pp instead. +# However, this causes a file dependency on perl(Locale::gettext_xs) to be +# generated, which must be satisfied. +RPROVIDES:${PN} += "perl(Locale::gettext_xs)" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/texinfo/texinfo_7.0.bb b/meta/recipes-extended/texinfo/texinfo_7.0.bb deleted file mode 100644 index a8933f2b7e..0000000000 --- a/meta/recipes-extended/texinfo/texinfo_7.0.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Documentation system for on-line information and printed output" -DESCRIPTION = "Texinfo is a documentation system that can produce both \ -online information and printed output from a single source file. The \ -GNU Project uses the Texinfo file format for most of its documentation." -HOMEPAGE = "http://www.gnu.org/software/texinfo/" -SECTION = "console/utils" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -PROVIDES:append:class-native = " texinfo-replacement-native" - -def compress_pkg(d): - if bb.data.inherits_class('compress_doc', d): - compress = d.getVar("DOC_COMPRESS") - if compress == "gz": - return "gzip" - elif compress == "bz2": - return "bzip2" - elif compress == "xz": - return "xz" - return "" - -RDEPENDS:info += "${@compress_pkg(d)}" - -DEPENDS = "zlib ncurses texinfo-replacement-native" -DEPENDS:class-native = "zlib-native ncurses-native" - -TARGET_PATCH = "file://use_host_makedoc.patch" -TARGET_PATCH:class-native = "" - -SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://disable-native-tools.patch \ - file://link-zip.patch \ - file://dont-depend-on-help2man.patch \ - ${TARGET_PATCH} \ - " - -SRC_URI[sha256sum] = "9261d4ee11cdf6b61895e213ffcd6b746a61a64fe38b9741a3aaa73125b35170" - -tex_texinfo = "texmf/tex/texinfo" - -inherit gettext autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" - -EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" - -do_configure:prepend () { - # autotools_do_configure updates po/Makefile.in.in, we also need - # update po_document. - cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ -} - -do_compile:prepend() { - if [ -d tools ];then - oe_runmake -C tools/gnulib/lib - fi -} - -do_install:append() { - mkdir -p ${D}${datadir}/${tex_texinfo} - install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi - sed -i -e 's,${HOSTTOOLS_DIR},,' ${D}${bindir}/texindex -} - -do_install:append:class-native() { - install -m 755 info/makedoc ${D}${bindir} -} - -PACKAGES += "info info-doc" - -FILES:info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" -FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ - ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ - ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" - -FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" -RDEPENDS:${PN} = "perl" -FILES:${PN}-doc = "${infodir}/texi* \ - ${datadir}/${tex_texinfo} \ - ${mandir}/man1 ${mandir}/man5" - -# Lie about providing the Locale::gettext_xs module. It is not actually built, -# but the code will test for it and if not found use Locale::gettext_pp instead. -# However, this causes a file dependency on perl(Locale::gettext_xs) to be -# generated, which must be satisfied. -RPROVIDES:${PN} += "perl(Locale::gettext_xs)" - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg