summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSteffen Sledz <sledz@dresearch-fe.de>2012-03-30 11:45:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-30 17:20:24 +0100
commit3eb0125bde07bc9d055e164064c0be8ad3e33607 (patch)
tree16dfee24ea8ab9ff0fabd5d8e49f7b3958116a95 /meta
parent5cdb58f683d76e4008eae2f8afa2314824a74966 (diff)
downloadast2050-yocto-poky-3eb0125bde07bc9d055e164064c0be8ad3e33607.zip
ast2050-yocto-poky-3eb0125bde07bc9d055e164064c0be8ad3e33607.tar.gz
docbook-utils-native: fix syntax problem in jw.in
Fix runtime error occurred e.g. with docbook-to-man calls: grep: character class syntax is [[:space:]], not [:space:] grep: character class syntax is [[:space:]], not [:space:] jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook". See also: <https://qa.mandriva.com/show_bug.cgi?id=61127> (From OE-Core rev: 627998726ca3ee2ed2510c0f666747f688d06c56) Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch29
-rw-r--r--meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb7
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch b/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
new file mode 100644
index 0000000..db079d6
--- /dev/null
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+Fix runtime error occurred e.g. with docbook-to-man calls:
+
+ grep: character class syntax is [[:space:]], not [:space:]
+ grep: character class syntax is [[:space:]], not [:space:]
+ jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook".
+
+See also:
+
+ <https://qa.mandriva.com/show_bug.cgi?id=61127>
+
+Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
+
+diff -Nurd docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in 2012-03-29 07:50:00.789564826 +0200
++++ docbook-utils-0.6.14/bin/jw.in 2012-03-29 07:52:10.371302967 +0200
+@@ -80,9 +80,9 @@
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+ SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+ SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
index 96459dc..2a89479 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -7,9 +7,12 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native"
-PR = "r2"
+PR = "r3"
-SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
+SRC_URI = "\
+ ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz \
+ file://re.patch \
+"
SRC_URI[md5sum] = "6b41b18c365c01f225bc417cf632d81c"
SRC_URI[sha256sum] = "48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9"
OpenPOWER on IntegriCloud