summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-19 08:41:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-22 13:13:43 +0000
commit4890cf6ca08f54ac825b2a81b4a2d349e19210b6 (patch)
tree0020a6b291e34709f91e7f8c1ccc9999bad91c9e
parent15fcdd1d48bfa20c5183766e14c89d45ea1477a6 (diff)
downloadpoky-4890cf6ca08f54ac825b2a81b4a2d349e19210b6.tar.gz
texi2html: Upgrade to 5.0
Add patch to update GETTEXT_MACRO_VERSION to 0.18 (From OE-Core rev: 9d634d7fa355918d42f5279bc2a62c183027f5fd) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch44
-rw-r--r--meta/recipes-extended/texi2html/texi2html_1.82.bb14
-rw-r--r--meta/recipes-extended/texi2html/texi2html_5.0.bb25
3 files changed, 69 insertions, 14 deletions
diff --git a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
new file mode 100644
index 0000000000..35c119b732
--- /dev/null
+++ b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
@@ -0,0 +1,44 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: texi2html-5.0/po_document/Makefile.in.in
7===================================================================
8--- texi2html-5.0.orig/po_document/Makefile.in.in
9+++ texi2html-5.0/po_document/Makefile.in.in
10@@ -9,7 +9,7 @@
11 # General Public License and is *not* in the public domain.
12 #
13 # Origin: gettext-0.17
14-GETTEXT_MACRO_VERSION = 0.17
15+GETTEXT_MACRO_VERSION = 0.18
16
17 PACKAGE = @PACKAGE@
18 VERSION = @VERSION@
19Index: texi2html-5.0/po_messages/Makefile.in.in
20===================================================================
21--- texi2html-5.0.orig/po_messages/Makefile.in.in
22+++ texi2html-5.0/po_messages/Makefile.in.in
23@@ -9,7 +9,7 @@
24 # General Public License and is *not* in the public domain.
25 #
26 # Origin: gettext-0.17
27-GETTEXT_MACRO_VERSION = 0.17
28+GETTEXT_MACRO_VERSION = 0.18
29
30 PACKAGE = @PACKAGE@
31 VERSION = @VERSION@
32Index: texi2html-5.0/m4/po.m4
33===================================================================
34--- texi2html-5.0.orig/m4/po.m4
35+++ texi2html-5.0/m4/po.m4
36@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
37
38 dnl Release version of the gettext macros. This is used to ensure that
39 dnl the gettext macros and po/Makefile.in.in are in sync.
40- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
41+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
42
43 dnl Perform the following tests also if --disable-nls has been given,
44 dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bb b/meta/recipes-extended/texi2html/texi2html_1.82.bb
deleted file mode 100644
index f19b576527..0000000000
--- a/meta/recipes-extended/texi2html/texi2html_1.82.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Perl script that converts Texinfo to HTML"
2HOMEPAGE = "http://www.nongnu.org/texi2html/"
3SECTION = "console/utils"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
6
7PR = "r0"
8
9SRC_URI = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
10
11SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
12SRC_URI[sha256sum] = "d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
13
14inherit autotools
diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb
new file mode 100644
index 0000000000..068f8bcde0
--- /dev/null
+++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb
@@ -0,0 +1,25 @@
1DESCRIPTION = "Perl script that converts Texinfo to HTML"
2HOMEPAGE = "http://www.nongnu.org/texi2html/"
3SECTION = "console/utils"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
6
7PR = "r0"
8
9SRC_URI = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2 \
10 file://fix_gettext_version.patch"
11
12SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
13SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"
14
15inherit autotools gettext
16
17do_configure_prepend() {
18 # Make a directory for the old gettext setup
19 mkdir ${S}/po
20}
21
22do_configure_append() {
23 # Clean up the phony po directory
24 rm -rf ${S}/po
25}