Skip to contentSkip to conversation

pull request 20120404

PATCH Applied Steffen Sledz 2 participants 3 messages Apr 4, 2012 – Apr 9, 2012

lore
Share & tools
lore
#0 lore raw

cover pull request 20120404

Hi Tom,

please pull this commit backported from oe-core fixing a problem with docbook-utils-native.

Thx,
Steffen

The following changes since commit 71df8a759f91e821a2daee22f34eaa3a31708775:

python-2.6.6: Fix python-2.6.6 build failure on linux-3.x (2012-03-27 13:08:38 +0200)

are available in the git repository at:
git://github.com/sledz/oe pull-request-1
https://github.com/sledz/oe/tree/pull-request-1

Steffen Sledz (1):
docbook-utils-native: fix syntax problem in jw.in

 .../docbook-utils/docbook-utils-0.6.14/re.patch    |   29 ++++++++++++++++++++
 .../docbook-utils/docbook-utils-native_0.6.14.bb   |    8 ++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 recipes/docbook-utils/docbook-utils-0.6.14/re.patch
Signature · 1 line
1.7.7
#1 lore raw

PATCH 1/1 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>

---
 .../docbook-utils/docbook-utils-0.6.14/re.patch    |   29 ++++++++++++++++++++
 .../docbook-utils/docbook-utils-native_0.6.14.bb   |    8 ++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 recipes/docbook-utils/docbook-utils-0.6.14/re.patch
recipes/docbook-utils/docbook-utils-0.6.14/re.patch new file +29 -0
new file mode 100644
index 0000000..db079d6
@@ -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 <[email protected]>
+
+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
+ 
recipes/docbook-utils/docbook-utils-native_0.6.14.bb +6 -2
index 7d342ed..29815e3 100644
@@ -1,9 +1,13 @@
 SECTION = "console/utils"
 LICENSE = "GPL"
 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 \
+	file://re.patch \
+"
 
-SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz"
 SRC_URI[md5sum] = "6b41b18c365c01f225bc417cf632d81c"
 SRC_URI[sha256sum] = "48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9"
 
Signature · 1 line
1.7.7
Applied
#2 lore raw
In reply to Steffen Sledz
Quoted 15 lines · Steffen Sledz

Hi Tom,

please pull this commit backported from oe-core fixing a problem with docbook-utils-native.

Thx,
Steffen

The following changes since commit 71df8a759f91e821a2daee22f34eaa3a31708775:

python-2.6.6: Fix python-2.6.6 build failure on linux-3.x (2012-03-27 13:08:38 +0200)

are available in the git repository at:
git://github.com/sledz/oe pull-request-1
https://github.com/sledz/oe/tree/pull-request-1

Quoted 7 lines

Steffen Sledz (1):
docbook-utils-native: fix syntax problem in jw.in

 .../docbook-utils/docbook-utils-0.6.14/re.patch    |   29 ++++++++++++++++++++
 .../docbook-utils/docbook-utils-native_0.6.14.bb   |    8 ++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 recipes/docbook-utils/docbook-utils-0.6.14/re.patch

Applied, thanks!

Signature · 1 line
Tom