summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-07-18 08:14:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-21 10:59:18 +0100
commit57f771164d0936cff47f6a0dd24376ded60401b7 (patch)
tree78823883484be586d9a26b95cde581e4b4b8ef62
parent198581ffddb2e2e1f428dc1784dd4506f55fc7ee (diff)
downloadpoky-57f771164d0936cff47f6a0dd24376ded60401b7.tar.gz
gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR
In oe.dev we can just sed over the binary but in newer versions of this program we need to fix the in use copy too. As noted in the patch header, this isn't appropriate for upstream as it could change behavior on Windows. (From OE-Core rev: cf2fae0ea64ad1b24cbd50545ffffa80e3ef8510) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch33
-rw-r--r--meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb5
2 files changed, 36 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
new file mode 100644
index 0000000000..a285ad2789
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
@@ -0,0 +1,33 @@
1Upstream-Status="Inappropriate [Would break behavior on Windows]"
2
3We can't use #!/full/path/to/python -u as this can be longer than shebang
4allows for. In order to be appropraite for upstream more work would be
5needed to make sure that the main xml2po code doesn't rely on python
6being invoked with -u (force stdin/out/err to be used raw).
7---
8 xml2po/xml2po/Makefile.am | 1 -
9 xml2po/xml2po/xml2po.py.in | 2 +-
10 2 files changed, 1 insertion(+), 2 deletions(-)
11
12Index: gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
13===================================================================
14--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/Makefile.am
15+++ gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
16@@ -7,7 +7,6 @@ CLEANFILES = xml2po
17
18 xml2po: xml2po.py.in
19 sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
20- -e "s+^#!.*python.*+#!$(PYTHON)+" \
21 < $(srcdir)/xml2po.py.in > xml2po
22 chmod +x xml2po
23
24Index: gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
25===================================================================
26--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/xml2po.py.in
27+++ gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
28@@ -1,4 +1,4 @@
29-#!/usr/bin/python -u
30+#!/usr/bin/env python
31 # -*- encoding: utf-8 -*-
32 # Copyright (c) 2004, 2005, 2006 Danilo Ĺ egan <danilo@gnome.org>.
33 # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index 4554122ddc..1ec10760db 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,9 +1,10 @@
1require gnome-doc-utils.inc 1require gnome-doc-utils.inc
2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ 2LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" 3 file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
4PR = "r3" 4PR = "r4"
5 5
6SRC_URI += "file://xsltproc_nonet.patch" 6SRC_URI += "file://xsltproc_nonet.patch \
7 file://use-usr-bin-env-for-python-in-xml2po.patch"
7 8
8SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391" 9SRC_URI[archive.md5sum] = "8f6e05071599bc073007830ea0a68391"
9SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf" 10SRC_URI[archive.sha256sum] = "091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"