generic-poky/meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch
Tom Rini 57f771164d 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>
2011-07-21 10:59:18 +01:00

34 lines
1.3 KiB
Diff

Upstream-Status="Inappropriate [Would break behavior on Windows]"
We can't use #!/full/path/to/python -u as this can be longer than shebang
allows for. In order to be appropraite for upstream more work would be
needed to make sure that the main xml2po code doesn't rely on python
being invoked with -u (force stdin/out/err to be used raw).
---
xml2po/xml2po/Makefile.am | 1 -
xml2po/xml2po/xml2po.py.in | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
Index: gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
===================================================================
--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/Makefile.am
+++ gnome-doc-utils-0.20.6/xml2po/xml2po/Makefile.am
@@ -7,7 +7,6 @@ CLEANFILES = xml2po
xml2po: xml2po.py.in
sed -e "s/^VERSION =.*/VERSION = \"@VERSION@\"/" \
- -e "s+^#!.*python.*+#!$(PYTHON)+" \
< $(srcdir)/xml2po.py.in > xml2po
chmod +x xml2po
Index: gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
===================================================================
--- gnome-doc-utils-0.20.6.orig/xml2po/xml2po/xml2po.py.in
+++ gnome-doc-utils-0.20.6/xml2po/xml2po/xml2po.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
# Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.