summaryrefslogtreecommitdiff
path: root/editors/openoffice-3/files/patch-python-2.6.2-svnversion
blob: 5006464fe0f3c0cdf0a96014566549b4ee0b3675 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
http://bugs.python.org/file14047

--- python/Python-2.6.1.patch~	2011-11-06 00:03:55.000000000 +0900
+++ python/Python-2.6.1.patch	2011-11-06 07:51:41.000000000 +0900
@@ -1,3 +1,48 @@
+--- misc/Python-2.6.1/configure.in	Wed Jun 11 09:41:16 2008
++++ misc/build/Python-2.6.1/configure.in	Fri Apr 17 09:02:52 2009
+@@ -767,7 +767,7 @@
+ then
+ 	SVNVERSION="svnversion \$(srcdir)"
+ else
+-	SVNVERSION="echo exported"
++	SVNVERSION="echo Unversioned directory"
+ fi
+ 
+ case $MACHDEP in
+--- misc/Python-2.6.1/Makefile.pre.in	Wed Jun 11 09:41:16 2008
++++ misc/build/Python-2.6.1/Makefile.pre.in	Fri Apr 17 09:02:52 2009
+@@ -501,7 +501,7 @@
+ 		$(SIGNAL_OBJS) \
+ 		$(MODOBJS) \
+ 		$(srcdir)/Modules/getbuildinfo.c
+-	$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
++	$(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
+ 
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
+ 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
+--- misc/Python-2.6.1/Modules/getbuildinfo.c	Wed Jun 11 09:41:16 2008
++++ misc/build/Python-2.6.1/Modules/getbuildinfo.c Fri Apr 17 09:02:52 2009
+@@ -48,5 +48,5 @@
+ 	static const char svnversion[] = SVNVERSION;
+ 	if (svnversion[0] != '$')
+ 		return svnversion; /* it was interpolated, or passed on command line */
+-	return "exported";
++	return "Unversioned directory";
+ }
+--- misc/Python-2.6.1/Python/sysmodule.c	Wed Jun 11 09:41:16 2008
++++ misc/build/Python-2.6.1/Python/sysmodule.c Fri Apr 17 09:02:52 2009
+@@ -1161,7 +1161,7 @@
+ 
+ 
+ 	svnversion = _Py_svnversion();
+-	if (strcmp(svnversion, "exported") != 0)
++	if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
+ 		svn_revision = svnversion;
+ 	else if (istag) {
+ 		len = strlen(_patchlevel_revision);
+
+
+
 --- misc/Python-2.6.1/Include/pyport.h	Wed Jun 11 09:41:16 2008
 +++ misc/build/Python-2.6.1/Include/pyport.h	Fri Apr 17 09:02:52 2009
 @@ -449,11 +449,6 @@