[Libreoffice-commits] .: Branch 'libreoffice-3-5' - python/makefile.mk python/Python-2.6.1-svn-1.7.patch

[Petr Mladek]

 python/Python-2.6.1-svn-1.7.patch |   12 ++++++++++++
 python/makefile.mk                |    3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 1d8e343b4e9865569e8aa15745725a8b04c691ce
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu May 17 22:49:33 2012 +0200

    python: svn 1.7 breaks the build because...
    
    ... the output of "svninfo" in a directory that doesn't contain a .svn
    changed
    
    Change-Id: I16b132663a7c8d9fd60eafafecfc7f9e82b69b29
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/python/Python-2.6.1-svn-1.7.patch b/python/Python-2.6.1-svn-1.7.patch
new file mode 100644
index 0000000..b3d0014
--- /dev/null
+++ b/python/Python-2.6.1-svn-1.7.patch
@@ -0,0 +1,12 @@
+--- misc/build/Python-2.6.1/Makefile.pre.in	2012-05-17 22:05:39.445274789 +0200
++++ misc/build.new/Python-2.6.1/Makefile.pre.in	2012-05-17 22:05:15.214276225 +0200
+@@ -34,7 +34,8 @@
+ LINKCC=		@LINKCC@
+ AR=		@AR@
+ RANLIB=		@RANLIB@
+-SVNVERSION=	@SVNVERSION@
++# svnversion 1.7 changed its output from "exported" to "Unversioned directory"
++SVNVERSION="echo exported"
+ 
+ # Shell used by make (some versions default to the login shell, which is bad)
+ SHELL=		/bin/sh
diff --git a/python/makefile.mk b/python/makefile.mk
index 1af56e5..e89bb54 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -57,7 +57,8 @@ PATCH_FILES=\
     Python-2.6.1-sysbase.patch \
     Python-2.6.1-nohardlink.patch \
     Python-2.6.1-py2422.patch \
-    Python-2.6.1-py4768.patch
+    Python-2.6.1-py4768.patch \
+    Python-2.6.1-svn-1.7.patch
 
 CONFIGURE_DIR=