Author: pfg
Date: Sat Sep 3 01:35:21 2016
New Revision: 1759046
URL: http://svn.apache.org/viewvc?rev=1759046&view=rev
Log:
Update Python to version 2.7.12.
This is the latest bugfix release in the 2.7.x series (Released 2016-06-28).
We expect this to be the best release that still guarantees some
compatibility with previous versions while still letting us use some of
the features in newer language versions.
It is also easier to keep up to date with upstream and with newer
compilers.
Tested on FreeBSD, but shouldn't have problems on other platforms.
Added:
openoffice/trunk/main/python/python-2.7.12-mingw.patch
- copied, changed from r1759004,
openoffice/trunk/main/python/python-2.7.9-mingw.patch
openoffice/trunk/main/python/python-2.7.12-nohardlink.patch
- copied, changed from r1759004,
openoffice/trunk/main/python/python-2.7.9-nohardlink.patch
openoffice/trunk/main/python/python-2.7.12-pcbuild.patch
- copied, changed from r1759004,
openoffice/trunk/main/python/python-2.7.9-pcbuild.patch
openoffice/trunk/main/python/python-2.7.12-sysbase.patch
- copied, changed from r1759004,
openoffice/trunk/main/python/python-2.7.9-sysbase.patch
Removed:
openoffice/trunk/main/python/python-2.7.9-mingw.patch
openoffice/trunk/main/python/python-2.7.9-nohardlink.patch
openoffice/trunk/main/python/python-2.7.9-pcbuild.patch
openoffice/trunk/main/python/python-2.7.9-sysbase.patch
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/python/makefile.mk
openoffice/trunk/main/python/prj/d.lst
openoffice/trunk/main/python/python-freebsd.patch
openoffice/trunk/main/python/python-md5.patch
openoffice/trunk/main/python/python-solaris.patch
openoffice/trunk/main/python/python-solver-before-std.patch
openoffice/trunk/main/python/python-ssl.patch
openoffice/trunk/main/python/pyversion.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Sep 3 01:35:21 2016
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = 5eebcaa0030dc4061156d3429657fb83
- name = Python-2.7.9.tgz
- URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz
+ MD5 = 88d61f82e3616a4be952828b3694109d
+ name = Python-2.7.12.tgz
+ URL1 = http://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
Modified: openoffice/trunk/main/python/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Sat Sep 3 01:35:21 2016
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83
+TARFILE_MD5=88d61f82e3616a4be952828b3694109d
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
@@ -109,7 +109,9 @@ BUILD_ACTION=$(ENV_BUILD) make && make i
#.ENDIF #"$(WINDOWS_VISTA_PSDK)"!=""
#.ENDIF
-BUILD_DIR=PCbuild
+# Requires adapting for according to the MSVC compiler version.
+# Normally PCBuild will carry the latest supported build files.
+BUILD_DIR=PC/VS9.0
# Build python executable and then runs a minimal script. Running the minimal
script
# ensures that certain *.pyc files are generated which would otherwise be
created on
Modified: openoffice/trunk/main/python/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/prj/d.lst?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/prj/d.lst (original)
+++ openoffice/trunk/main/python/prj/d.lst Sat Sep 3 01:35:21 2016
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multipro
mkdir: %_DEST%\lib%_EXT%\python\unittest
mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
-..\%__SRC%\misc\build\Python-2.7.9\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\lib-old\*
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\lib-tk\*
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\site-packages\*
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\encodings\*
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\email\mime\*
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\compiler\*
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\hotshot\*
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\distutils\*
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\distutils\command\*
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\dom\*
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\parsers\*
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\sax\*
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\curses\*
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\plat-linux2\*
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\config\*
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\logging\*
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\idlelib\*
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\idlelib\Icons\*
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\wsgiref\*
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\*
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\fixes\*
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\pgen2\*
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\sqlite3\*
%_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\ctypes\*
%_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\ctypes\macholib\*
%_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.9\Lib\importlib\*
%_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\multiprocessing\*
%_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\multiprocessing\dummy\*
%_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.9\Lib\unittest\*
%_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.9\Makefile
%_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.12\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-old\*
%_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-tk\*
%_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\site-packages\*
%_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\encodings\*
%_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\email\*
%_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\email\mime\*
%_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\compiler\*
%_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\hotshot\*
%_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\*
%_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\command\*
%_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\dom\*
%_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\parsers\*
%_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\sax\*
%_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\curses\*
%_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\plat-linux2\*
%_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\config\*
%_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\bsddb\*
%_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\logging\*
%_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\idlelib\*
%_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\idlelib\Icons\*
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\wsgiref\*
%_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\lib2to3\*
%_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\lib2to3\fixes\*
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\lib2to3\pgen2\*
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\sqlite3\*
%_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\ctypes\*
%_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\ctypes\macholib\*
%_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.12\Lib\importlib\*
%_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\multiprocessing\*
%_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\multiprocessing\dummy\*
%_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.12\Lib\unittest\*
%_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.12\Makefile
%_DEST%\lib%_EXT%\python\python2.7\config\Makefile
..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py
%_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
-..\%__SRC%\misc\build\Python-2.7.9\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.12\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.9\pyconfig.h
%_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.12\pyconfig.h
%_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\*
%_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0
%_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.9\libpython2.7.dll
%_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.12\libpython2.7.dll
%_DEST%\bin%_EXT%\libpython2.7.dll
# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python.exe
%_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python27.dll
%_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python27.lib
%_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_socket.pyd
%_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_ssl.pyd
%_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\select.pyd
%_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\unicodedata.pyd
%_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\winsound.pyd
%_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\pyexpat.pyd
%_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_testcapi.pyd
%_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_multiprocessing.pyd
%_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_msi.pyd
%_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_elementtree.pyd
%_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_ctypes.pyd
%_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python.exe
%_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python27.dll
%_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\python27.lib
%_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_socket.pyd
%_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_ssl.pyd
%_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\select.pyd
%_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\unicodedata.pyd
%_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\winsound.pyd
%_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\pyexpat.pyd
%_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_testcapi.pyd
%_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_multiprocessing.pyd
%_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_msi.pyd
%_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_elementtree.pyd
%_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.12\PCbuild\_ctypes.pyd
%_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
Copied: openoffice/trunk/main/python/python-2.7.12-mingw.patch (from r1759004,
openoffice/trunk/main/python/python-2.7.9-mingw.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.12-mingw.patch?p2=openoffice/trunk/main/python/python-2.7.12-mingw.patch&p1=openoffice/trunk/main/python/python-2.7.9-mingw.patch&r1=1759004&r2=1759046&rev=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.9-mingw.patch (original)
+++ openoffice/trunk/main/python/python-2.7.12-mingw.patch Sat Sep 3 01:35:21
2016
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.9/Include/pyport.h
misc/build/Python-2.7.9/Include/pyport.h
---- misc/Python-2.7.9/Include/pyport.h 2014-06-29 21:05:24.000000000 -0500
-+++ misc/build/Python-2.7.9/Include/pyport.h 2016-01-01 17:49:55.171717963
-0500
+diff -ru misc/Python-2.7.12/Include/pyport.h
misc/build/Python-2.7.12/Include/pyport.h
+--- misc/Python-2.7.12/Include/pyport.h 2016-06-25 16:49:30.000000000
-0500
++++ misc/build/Python-2.7.12/Include/pyport.h 2016-09-02 16:42:21.498048000
-0500
@@ -9,6 +9,30 @@
#include <inttypes.h>
#endif
@@ -32,10 +32,10 @@ diff -ru misc/Python-2.7.9/Include/pypor
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-diff -ru misc/Python-2.7.9/Lib/distutils/ccompiler.py
misc/build/Python-2.7.9/Lib/distutils/ccompiler.py
---- misc/Python-2.7.9/Lib/distutils/ccompiler.py 2014-06-29
21:05:25.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/distutils/ccompiler.py 2016-01-01
17:49:55.172717391 -0500
-@@ -895,6 +895,7 @@
+diff -ru misc/Python-2.7.12/Lib/distutils/ccompiler.py
misc/build/Python-2.7.12/Lib/distutils/ccompiler.py
+--- misc/Python-2.7.12/Lib/distutils/ccompiler.py 2016-06-25
16:49:30.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/distutils/ccompiler.py 2016-09-02
16:42:21.499097000 -0500
+@@ -896,6 +896,7 @@
# on a cygwin built python we can use gcc like an ordinary UNIXish
# compiler
('cygwin.*', 'unix'),
@@ -43,10 +43,10 @@ diff -ru misc/Python-2.7.9/Lib/distutils
('os2emx', 'emx'),
# OS name mappings
-diff -ru misc/Python-2.7.9/Lib/distutils/command/build_ext.py
misc/build/Python-2.7.9/Lib/distutils/command/build_ext.py
---- misc/Python-2.7.9/Lib/distutils/command/build_ext.py 2014-06-29
21:05:25.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/distutils/command/build_ext.py 2016-01-01
17:49:55.173717798 -0500
-@@ -221,7 +221,7 @@
+diff -ru misc/Python-2.7.12/Lib/distutils/command/build_ext.py
misc/build/Python-2.7.12/Lib/distutils/command/build_ext.py
+--- misc/Python-2.7.12/Lib/distutils/command/build_ext.py 2016-06-25
16:49:30.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/distutils/command/build_ext.py
2016-09-02 16:42:21.499914000 -0500
+@@ -223,7 +223,7 @@
# for extensions under Cygwin and AtheOS Python's library directory
must be
# appended to library_dirs
@@ -55,7 +55,7 @@ diff -ru misc/Python-2.7.9/Lib/distutils
if sys.executable.startswith(os.path.join(sys.exec_prefix,
"bin")):
# building third party extensions
self.library_dirs.append(os.path.join(sys.prefix, "lib",
-@@ -723,7 +723,7 @@
+@@ -725,7 +725,7 @@
# don't extend ext.libraries, it may be shared with other
# extensions, it is a reference to the original list
return ext.libraries + [pythonlib]
@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.9/Lib/distutils
template = "python%d.%d"
pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-diff -ru misc/Python-2.7.9/Lib/distutils/command/install.py
misc/build/Python-2.7.9/Lib/distutils/command/install.py
---- misc/Python-2.7.9/Lib/distutils/command/install.py 2014-06-29
21:05:25.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/distutils/command/install.py 2016-01-01
17:49:55.174717925 -0500
+diff -ru misc/Python-2.7.12/Lib/distutils/command/install.py
misc/build/Python-2.7.12/Lib/distutils/command/install.py
+--- misc/Python-2.7.12/Lib/distutils/command/install.py 2016-06-25
16:49:30.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/distutils/command/install.py 2016-09-02
16:42:21.500659000 -0500
@@ -348,9 +348,10 @@
# Convert directories from Unix /-separated syntax to the local
@@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.9/Lib/distutils
def handle_extra_path (self):
-diff -ru misc/Python-2.7.9/Lib/distutils/spawn.py
misc/build/Python-2.7.9/Lib/distutils/spawn.py
---- misc/Python-2.7.9/Lib/distutils/spawn.py 2014-06-29 21:05:26.000000000
-0500
-+++ misc/build/Python-2.7.9/Lib/distutils/spawn.py 2016-01-01
17:49:55.175718681 -0500
+diff -ru misc/Python-2.7.12/Lib/distutils/spawn.py
misc/build/Python-2.7.12/Lib/distutils/spawn.py
+--- misc/Python-2.7.12/Lib/distutils/spawn.py 2016-06-25 16:49:30.000000000
-0500
++++ misc/build/Python-2.7.12/Lib/distutils/spawn.py 2016-09-02
16:42:21.501126000 -0500
@@ -212,7 +212,7 @@
paths = path.split(os.pathsep)
base, ext = os.path.splitext(executable)
@@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.9/Lib/distutils
executable = executable + '.exe'
if not os.path.isfile(executable):
-diff -ru misc/Python-2.7.9/Lib/distutils/sysconfig.py
misc/build/Python-2.7.9/Lib/distutils/sysconfig.py
---- misc/Python-2.7.9/Lib/distutils/sysconfig.py 2014-06-29
21:05:26.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/distutils/sysconfig.py 2016-01-01
17:49:55.175718681 -0500
+diff -ru misc/Python-2.7.12/Lib/distutils/sysconfig.py
misc/build/Python-2.7.12/Lib/distutils/sysconfig.py
+--- misc/Python-2.7.12/Lib/distutils/sysconfig.py 2016-06-25
16:49:30.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/distutils/sysconfig.py 2016-09-02
16:42:21.501681000 -0500
@@ -450,6 +450,9 @@
global _config_vars
if _config_vars is None:
@@ -127,21 +127,21 @@ diff -ru misc/Python-2.7.9/Lib/distutils
if func:
func()
else:
-diff -ru misc/Python-2.7.9/Lib/distutils/unixccompiler.py
misc/build/Python-2.7.9/Lib/distutils/unixccompiler.py
---- misc/Python-2.7.9/Lib/distutils/unixccompiler.py 2014-06-29
21:05:26.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/distutils/unixccompiler.py 2016-01-01
17:49:55.176718668 -0500
-@@ -80,7 +80,7 @@
- shared_lib_extension = ".so"
- dylib_lib_extension = ".dylib"
+diff -ru misc/Python-2.7.12/Lib/distutils/unixccompiler.py
misc/build/Python-2.7.12/Lib/distutils/unixccompiler.py
+--- misc/Python-2.7.12/Lib/distutils/unixccompiler.py 2016-06-25
16:49:30.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/distutils/unixccompiler.py 2016-09-02
16:44:54.962041000 -0500
+@@ -82,7 +82,7 @@
+ xcode_stub_lib_extension = ".tbd"
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+ xcode_stub_lib_format = dylib_lib_format
- if sys.platform == "cygwin":
+ if sys.platform == "cygwin" or sys.platform == "winmingw":
exe_extension = ".exe"
def preprocess(self, source,
-diff -ru misc/Python-2.7.9/Lib/os.py misc/build/Python-2.7.9/Lib/os.py
---- misc/Python-2.7.9/Lib/os.py 2014-06-29 21:05:30.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/os.py 2016-01-01 17:49:55.177718586 -0500
+diff -ru misc/Python-2.7.12/Lib/os.py misc/build/Python-2.7.12/Lib/os.py
+--- misc/Python-2.7.12/Lib/os.py 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/os.py 2016-09-02 16:42:21.503786000 -0500
@@ -38,7 +38,21 @@
except AttributeError:
return [n for n in dir(module) if n[0] != '_']
@@ -165,10 +165,10 @@ diff -ru misc/Python-2.7.9/Lib/os.py mis
name = 'posix'
linesep = '\n'
from posix import *
-diff -ru misc/Python-2.7.9/Lib/socket.py misc/build/Python-2.7.9/Lib/socket.py
---- misc/Python-2.7.9/Lib/socket.py 2014-06-29 21:05:30.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/socket.py 2016-01-01 17:49:55.178717595
-0500
-@@ -153,7 +153,7 @@
+diff -ru misc/Python-2.7.12/Lib/socket.py
misc/build/Python-2.7.12/Lib/socket.py
+--- misc/Python-2.7.12/Lib/socket.py 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/socket.py 2016-09-02 16:42:21.504874000
-0500
+@@ -157,7 +157,7 @@
'sendall', 'setblocking',
'settimeout', 'gettimeout', 'shutdown')
@@ -177,10 +177,10 @@ diff -ru misc/Python-2.7.9/Lib/socket.py
_socketmethods = _socketmethods + ('ioctl',)
if sys.platform == "riscos":
-diff -ru misc/Python-2.7.9/Makefile.pre.in
misc/build/Python-2.7.9/Makefile.pre.in
---- misc/Python-2.7.9/Makefile.pre.in 2014-06-29 21:05:39.000000000 -0500
-+++ misc/build/Python-2.7.9/Makefile.pre.in 2016-01-01 17:49:55.179718421
-0500
-@@ -121,6 +121,16 @@
+diff -ru misc/Python-2.7.12/Makefile.pre.in
misc/build/Python-2.7.12/Makefile.pre.in
+--- misc/Python-2.7.12/Makefile.pre.in 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Makefile.pre.in 2016-09-02 16:42:21.506300000
-0500
+@@ -126,6 +126,16 @@
BLDSHARED= @BLDSHARED@ $(LDFLAGS)
LDCXXSHARED= @LDCXXSHARED@
DESTSHARED= $(BINLIBDEST)/lib-dynload
@@ -197,7 +197,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
# Executable suffix (.exe on Windows and Mac OS X)
EXE= @EXEEXT@
-@@ -214,7 +224,7 @@
+@@ -226,7 +236,7 @@
# Modules
MODULE_OBJS= \
Modules/config.o \
@@ -206,7 +206,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
Modules/main.o \
Modules/gcmodule.o
-@@ -599,6 +609,10 @@
+@@ -671,6 +681,10 @@
-DVPATH='"$(VPATH)"' \
-o $@ $(srcdir)/Modules/getpath.c
@@ -217,7 +217,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
Modules/python.o: $(srcdir)/Modules/python.c
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
-@@ -647,6 +661,12 @@
+@@ -728,6 +742,12 @@
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
$(srcdir)/Objects/unicodetype_db.h
@@ -230,7 +230,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
STRINGLIB_HEADERS= \
$(srcdir)/Include/bytes_methods.h \
$(srcdir)/Objects/stringlib/count.h \
-@@ -861,7 +881,11 @@
+@@ -947,7 +967,11 @@
# Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
@@ -242,7 +242,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
@for i in X $(SHAREDMODS); do \
if test $$i != X; then \
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-@@ -869,7 +893,11 @@
+@@ -955,7 +979,11 @@
fi; \
done
@@ -254,7 +254,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
@for i in $(DESTDIRS); \
do \
if test ! -d $(DESTDIR)$$i; then \
-@@ -982,7 +1010,11 @@
+@@ -1072,7 +1100,11 @@
unittest unittest/test \
lib-old \
curses pydoc_data $(MACHDEPS)
@@ -266,7 +266,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
if test ! -d $(DESTDIR)$$i; then \
-@@ -1042,6 +1074,26 @@
+@@ -1132,6 +1164,26 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -293,7 +293,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-@@ -1068,6 +1120,7 @@
+@@ -1158,6 +1210,7 @@
# Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
@@ -301,7 +301,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
export PATH; PATH="`pwd`:$$PATH"; \
export PYTHONPATH; PYTHONPATH="$(srcdir)/Lib:$(abs_builddir)/`cat
pybuilddir.txt`"; \
-@@ -1081,6 +1134,7 @@
+@@ -1171,6 +1224,7 @@
PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -309,7 +309,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
python-config: $(srcdir)/Misc/python-config.in
# Substitution happens here, as the completely-expanded BINDIR
-@@ -1174,6 +1228,15 @@
+@@ -1264,6 +1318,15 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
@@ -325,7 +325,7 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
sharedinstall: sharedmods
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
--prefix=$(prefix) \
-@@ -1181,6 +1244,7 @@
+@@ -1271,6 +1334,7 @@
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
@@ -333,9 +333,9 @@ diff -ru misc/Python-2.7.9/Makefile.pre.
# Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the
-diff -ru misc/Python-2.7.9/Modules/Setup.config.in
misc/build/Python-2.7.9/Modules/Setup.config.in
---- misc/Python-2.7.9/Modules/Setup.config.in 2014-06-29 21:05:40.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/Setup.config.in 2016-01-01
17:49:55.179718421 -0500
+diff -ru misc/Python-2.7.12/Modules/Setup.config.in
misc/build/Python-2.7.12/Modules/Setup.config.in
+--- misc/Python-2.7.12/Modules/Setup.config.in 2016-06-25 16:49:31.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/Setup.config.in 2016-09-02
16:42:21.507091000 -0500
@@ -9,5 +9,9 @@
# The signal module
@USE_SIGNAL_MODULE@signal signalmodule.c
@@ -346,9 +346,9 @@ diff -ru misc/Python-2.7.9/Modules/Setup
+
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
-diff -ru misc/Python-2.7.9/Modules/Setup.dist
misc/build/Python-2.7.9/Modules/Setup.dist
---- misc/Python-2.7.9/Modules/Setup.dist 2014-06-29 21:05:40.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/Setup.dist 2016-01-01 17:49:55.180717640
-0500
+diff -ru misc/Python-2.7.12/Modules/Setup.dist
misc/build/Python-2.7.12/Modules/Setup.dist
+--- misc/Python-2.7.12/Modules/Setup.dist 2016-06-25 16:49:31.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/Setup.dist 2016-09-02
16:42:21.507936000 -0500
@@ -114,7 +114,7 @@
posix posixmodule.c # posix (UNIX) system calls
@@ -358,9 +358,9 @@ diff -ru misc/Python-2.7.9/Modules/Setup
# if $HOME is not set
_sre _sre.c # Fredrik Lundh's new regular expressions
_codecs _codecsmodule.c # access to the builtin codecs and
codec registry
-diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/configure
misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure
---- misc/Python-2.7.9/Modules/_ctypes/libffi/configure 2014-06-29
21:05:40.000000000 -0500
-+++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure 2016-01-01
17:49:55.235718066 -0500
+diff -ru misc/Python-2.7.12/Modules/_ctypes/libffi/configure
misc/build/Python-2.7.12/Modules/_ctypes/libffi/configure
+--- misc/Python-2.7.12/Modules/_ctypes/libffi/configure 2016-06-25
16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Modules/_ctypes/libffi/configure 2016-09-02
16:42:21.516830000 -0500
@@ -18807,6 +18807,12 @@
fi
@@ -374,9 +374,9 @@ diff -ru misc/Python-2.7.9/Modules/_ctyp
ac_config_commands="$ac_config_commands include"
ac_config_commands="$ac_config_commands src"
-diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/configure.ac
misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure.ac
---- misc/Python-2.7.9/Modules/_ctypes/libffi/configure.ac 2014-06-29
21:05:40.000000000 -0500
-+++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure.ac
2016-01-01 17:49:55.236718053 -0500
+diff -ru misc/Python-2.7.12/Modules/_ctypes/libffi/configure.ac
misc/build/Python-2.7.12/Modules/_ctypes/libffi/configure.ac
+--- misc/Python-2.7.12/Modules/_ctypes/libffi/configure.ac 2016-06-25
16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Modules/_ctypes/libffi/configure.ac
2016-09-02 16:42:21.517727000 -0500
@@ -613,6 +613,12 @@
fi
AC_SUBST(toolexeclibdir)
@@ -390,9 +390,9 @@ diff -ru misc/Python-2.7.9/Modules/_ctyp
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src
-diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in
misc/build/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in
---- misc/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in 2014-06-29
21:05:40.000000000 -0500
-+++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in
2016-01-01 17:49:55.236718053 -0500
+diff -ru misc/Python-2.7.12/Modules/_ctypes/libffi/include/ffi.h.in
misc/build/Python-2.7.12/Modules/_ctypes/libffi/include/ffi.h.in
+--- misc/Python-2.7.12/Modules/_ctypes/libffi/include/ffi.h.in 2016-06-25
16:49:31.000000000 -0500
++++ misc/build/Python-2.7.12/Modules/_ctypes/libffi/include/ffi.h.in
2016-09-02 16:42:21.518314000 -0500
@@ -433,7 +433,11 @@
ffi_type *rtype,
ffi_type **atypes);
@@ -405,9 +405,9 @@ diff -ru misc/Python-2.7.9/Modules/_ctyp
void (*fn)(void),
void *rvalue,
void **avalue);
-diff -ru misc/Python-2.7.9/Modules/config.c.in
misc/build/Python-2.7.9/Modules/config.c.in
---- misc/Python-2.7.9/Modules/config.c.in 2014-06-29 21:05:42.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/config.c.in 2016-01-01
17:49:55.237718460 -0500
+diff -ru misc/Python-2.7.12/Modules/config.c.in
misc/build/Python-2.7.12/Modules/config.c.in
+--- misc/Python-2.7.12/Modules/config.c.in 2016-06-25 16:49:31.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/config.c.in 2016-09-02
16:42:21.518926000 -0500
@@ -48,6 +48,9 @@
{"__builtin__", NULL},
{"sys", NULL},
@@ -418,9 +418,9 @@ diff -ru misc/Python-2.7.9/Modules/confi
/* This lives in gcmodule.c */
{"gc", initgc},
-diff -ru misc/Python-2.7.9/Modules/posixmodule.c
misc/build/Python-2.7.9/Modules/posixmodule.c
---- misc/Python-2.7.9/Modules/posixmodule.c 2014-06-29 21:05:43.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/posixmodule.c 2016-01-01
17:49:55.241719248 -0500
+diff -ru misc/Python-2.7.12/Modules/posixmodule.c
misc/build/Python-2.7.12/Modules/posixmodule.c
+--- misc/Python-2.7.12/Modules/posixmodule.c 2016-06-25 16:49:31.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/posixmodule.c 2016-09-02
16:42:21.523456000 -0500
@@ -132,6 +132,15 @@
#define HAVE_FSYNC 1
#define fsync _commit
@@ -460,7 +460,7 @@ diff -ru misc/Python-2.7.9/Modules/posix
#if defined(PYCC_VACPP) && defined(PYOS_OS2)
#include <io.h>
#endif /* OS2 */
-@@ -575,7 +593,7 @@
+@@ -630,7 +648,7 @@
*/
#include <crt_externs.h>
static char **environ;
@@ -469,7 +469,7 @@ diff -ru misc/Python-2.7.9/Modules/posix
extern char **environ;
#endif /* !_MSC_VER */
-@@ -994,7 +1012,7 @@
+@@ -1049,7 +1067,7 @@
int st_ctime_nsec;
};
@@ -478,7 +478,7 @@ diff -ru misc/Python-2.7.9/Modules/posix
static void
FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, time_t *time_out, int* nsec_out)
-@@ -1514,7 +1532,7 @@
+@@ -1568,7 +1586,7 @@
return v;
}
@@ -487,10 +487,10 @@ diff -ru misc/Python-2.7.9/Modules/posix
/* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
where / can be used in place of \ and the trailing slash is optional.
-diff -ru misc/Python-2.7.9/Modules/socketmodule.c
misc/build/Python-2.7.9/Modules/socketmodule.c
---- misc/Python-2.7.9/Modules/socketmodule.c 2014-06-29 21:05:43.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/socketmodule.c 2016-01-01
17:49:55.244718023 -0500
-@@ -317,7 +317,7 @@
+diff -ru misc/Python-2.7.12/Modules/socketmodule.c
misc/build/Python-2.7.12/Modules/socketmodule.c
+--- misc/Python-2.7.12/Modules/socketmodule.c 2016-06-25 16:49:31.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/socketmodule.c 2016-09-02
16:42:21.526595000 -0500
+@@ -339,7 +339,7 @@
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
* EAI_* constants are defined in (the already included) ws2tcpip.h.
*/
@@ -499,9 +499,9 @@ diff -ru misc/Python-2.7.9/Modules/socke
# include "addrinfo.h"
#endif
-diff -ru misc/Python-2.7.9/PC/_winreg.c misc/build/Python-2.7.9/PC/_winreg.c
---- misc/Python-2.7.9/PC/_winreg.c 2014-06-29 21:05:46.000000000 -0500
-+++ misc/build/Python-2.7.9/PC/_winreg.c 2016-01-01 17:49:55.246717928
-0500
+diff -ru misc/Python-2.7.12/PC/_winreg.c misc/build/Python-2.7.12/PC/_winreg.c
+--- misc/Python-2.7.12/PC/_winreg.c 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.12/PC/_winreg.c 2016-09-02 16:42:21.528227000
-0500
@@ -1792,6 +1792,9 @@
}
@@ -512,9 +512,9 @@ diff -ru misc/Python-2.7.9/PC/_winreg.c
PyMODINIT_FUNC init_winreg(void)
{
-diff -ru misc/Python-2.7.9/Python/dynload_win.c
misc/build/Python-2.7.9/Python/dynload_win.c
---- misc/Python-2.7.9/Python/dynload_win.c 2014-06-29 21:05:47.000000000
-0500
-+++ misc/build/Python-2.7.9/Python/dynload_win.c 2016-01-01
17:49:55.246717928 -0500
+diff -ru misc/Python-2.7.12/Python/dynload_win.c
misc/build/Python-2.7.12/Python/dynload_win.c
+--- misc/Python-2.7.12/Python/dynload_win.c 2016-06-25 16:49:32.000000000
-0500
++++ misc/build/Python-2.7.12/Python/dynload_win.c 2016-09-02
16:42:21.528984000 -0500
@@ -28,6 +28,7 @@
/* Case insensitive string compare, to avoid any dependencies on particular
C RTL implementations */
@@ -531,9 +531,9 @@ diff -ru misc/Python-2.7.9/Python/dynloa
/* Function to return the name of the "python" DLL that the supplied module
-diff -ru misc/Python-2.7.9/Python/frozenmain.c
misc/build/Python-2.7.9/Python/frozenmain.c
---- misc/Python-2.7.9/Python/frozenmain.c 2014-06-29 21:05:47.000000000
-0500
-+++ misc/build/Python-2.7.9/Python/frozenmain.c 2016-01-01
17:49:55.247717915 -0500
+diff -ru misc/Python-2.7.12/Python/frozenmain.c
misc/build/Python-2.7.12/Python/frozenmain.c
+--- misc/Python-2.7.12/Python/frozenmain.c 2016-06-25 16:49:32.000000000
-0500
++++ misc/build/Python-2.7.12/Python/frozenmain.c 2016-09-02
16:46:11.594746000 -0500
@@ -3,7 +3,7 @@
#include "Python.h"
@@ -543,7 +543,7 @@ diff -ru misc/Python-2.7.9/Python/frozen
extern void PyWinFreeze_ExeInit(void);
extern void PyWinFreeze_ExeTerm(void);
extern int PyInitFrozenExtensions(void);
-@@ -32,12 +32,12 @@
+@@ -32,13 +32,13 @@
setbuf(stderr, (char *)NULL);
}
@@ -551,14 +551,15 @@ diff -ru misc/Python-2.7.9/Python/frozen
+#ifdef MS_WINDOWS && !defined(__MINGW32__)
PyInitFrozenExtensions();
#endif /* MS_WINDOWS */
- Py_SetProgramName(argv[0]);
+ if (argc >= 1)
+ Py_SetProgramName(argv[0]);
Py_Initialize();
-#ifdef MS_WINDOWS
+#ifdef MS_WINDOWS && !defined(__MINGW32__)
PyWinFreeze_ExeInit();
#endif
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
if (inspect && isatty((int)fileno(stdin)))
sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
@@ -567,490 +568,4 @@ diff -ru misc/Python-2.7.9/Python/frozen
PyWinFreeze_ExeTerm();
#endif
Py_Finalize();
-diff -ru misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure
---- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/configure 2016-01-01 17:49:55.307717091 -0500
-@@ -638,8 +638,10 @@
- LIBOBJS
- TRUE
- MACHDEP_OBJS
-+GETPATH_OBJS
- DYNLOADFILE
- DLINCLDIR
-+USE_PASSWORD_MODULE
- THREADOBJ
- LDLAST
- USE_THREAD_MODULE
-@@ -3367,6 +3369,13 @@
- LDFLAGS="$SGI_ABI $LDFLAGS"
- MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
- fi
-+case $MACHDEP in
-+ *mingw*|*MINGW*|*MinGW*)
-+ MACHDEP="winmingw32"
-+ ac_sys_system=`uname -s`
-+ ac_sys_release=`uname -r`
-+ ;;
-+esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP" >&5
- $as_echo "$MACHDEP" >&6; }
-
-@@ -5280,7 +5289,7 @@
- if test -z "$enable_shared"
- then
- case $ac_sys_system in
-- CYGWIN* | atheos*)
-+ CYGWIN* | MINGW* | atheos*)
- enable_shared="yes";;
- *)
- enable_shared="no";;
-@@ -5349,7 +5358,7 @@
- BeOS*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDLIBRARY='libpython$(VERSION).dll.a'
- DLLLIBRARY='libpython$(VERSION).dll'
- ;;
-@@ -5405,7 +5413,7 @@
- esac
- else # shared is disabled
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- BLDLIBRARY='$(LIBRARY)'
- LDLIBRARY='libpython$(VERSION).dll.a'
- ;;
-@@ -7820,6 +7829,10 @@
-
-
-
-+ac_cv_sizeof_off_t=`echo $ac_cv_sizeof_off_t | tr -d '\015'`
-+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
-+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
-+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable large
file support" >&5
- $as_echo_n "checking whether to enable large file support... " >&6; }
- if test "$have_long_long" = yes
-@@ -8136,7 +8149,7 @@
- *) SO=.sl;;
- esac
- ;;
-- CYGWIN*) SO=.dll;;
-+ CYGWIN* | MINGW*) SO=.dll;;
- *) SO=.so;;
- esac
- else
-@@ -8300,7 +8313,7 @@
- SCO_SV*)
- LDSHARED='$(CC) -Wl,-G,-Bexport'
- LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
- LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
- atheos*)
-@@ -8396,7 +8409,7 @@
- LINKFORSHARED="-Xlinker --export-dynamic"
- fi;;
- esac;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- if test $enable_shared = "no"
- then
- LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -8420,7 +8433,7 @@
- if test ! "$LIBRARY" = "$LDLIBRARY"
- then
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- # Cygwin needs CCSHARED when building extension DLLs
- # but not when building the interpreter DLL.
- CFLAGSFORSHARED='';;
-@@ -9671,7 +9684,7 @@
- #define HAVE_PTHREAD_SIGMASK 1
- _ACEOF
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
-
- $as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h
-
-@@ -9694,6 +9707,17 @@
- fi
-
-
-+case $MACHDEP in
-+winmingw*)
-+ THREADOBJ="Python/thread.o"
-+ USE_THREAD_MODULE="#"
-+ USE_PASSWORD_MODULE="#"
-+ ;;
-+*)
-+ USE_PASSWORD_MODULE=""
-+ ;;
-+esac
-+
- # Check for enable-ipv6
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is
specified" >&5
-@@ -10128,6 +10152,11 @@
- # Use dynload_next.c only on 10.2 and below, which don't have native
dlopen()
- Darwin/[0156]\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
-+ CYGWIN* | MINGW*)
-+ case $MACHDEP in
-+ winmingw*) DYNLOADFILE="dynload_win.o PC/import_nt.o
PC/dl_nt.o";;
-+ esac
-+ ;;
- *)
- # use dynload_shlib.c and dlopen() if we have it; otherwise stub
- # out any dynamic loading
-@@ -10147,6 +10176,21 @@
-
- fi
-
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GETPATH_OBJS" >&5
-+$as_echo_n "checking GETPATH_OBJS... " >&6; }
-+if test -z "$GETPATH_OBJS"
-+then
-+ case $MACHDEP in
-+ winmingw*)
-+ GETPATH_OBJS='PC/getpathp.o';;
-+ *)
-+ GETPATH_OBJS='Modules/getpath.o';;
-+ esac
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GETPATH_OBJS" >&5
-+$as_echo "$GETPATH_OBJS" >&6; }
-+
- # MACHDEP_OBJS can be set to platform-specific object files needed by Python
-
-
-@@ -11745,6 +11789,20 @@
-
- fi
-
-+case $MACHDEP in
-+winmingw*)
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks"
"ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-+_ACEOF
-+
-+
-+fi
-+
-+;;
-+*)
- ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks"
"ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
- if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
-
-@@ -11765,6 +11823,8 @@
- fi
-
-
-+;;
-+esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines
altzone" >&5
- $as_echo_n "checking for time.h that defines altzone... " >&6; }
-@@ -13148,6 +13208,7 @@
-
-
-
-+ac_cv_sizeof_wchar_t=`echo $ac_cv_sizeof_wchar_t | tr -d '\015'`
-
- if test "$enable_unicode" = "no"
- then
-diff -ru misc/Python-2.7.9/configure.ac misc/build/Python-2.7.9/configure.ac
---- misc/Python-2.7.9/configure.ac 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/configure.ac 2016-01-01 17:49:55.310717403
-0500
-@@ -491,6 +491,13 @@
- LDFLAGS="$SGI_ABI $LDFLAGS"
- MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
- fi
-+case $MACHDEP in
-+ *mingw*|*MINGW*|*MinGW*)
-+ MACHDEP="winmingw32"
-+ ac_sys_system=`uname -s`
-+ ac_sys_release=`uname -r`
-+ ;;
-+esac
- AC_MSG_RESULT($MACHDEP)
-
- # And add extra plat-mac for darwin
-@@ -824,7 +831,7 @@
- if test -z "$enable_shared"
- then
- case $ac_sys_system in
-- CYGWIN* | atheos*)
-+ CYGWIN* | MINGW* | atheos*)
- enable_shared="yes";;
- *)
- enable_shared="no";;
-@@ -876,7 +883,7 @@
- BeOS*)
- LDLIBRARY='libpython$(VERSION).so'
- ;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDLIBRARY='libpython$(VERSION).dll.a'
- DLLLIBRARY='libpython$(VERSION).dll'
- ;;
-@@ -932,7 +939,7 @@
- esac
- else # shared is disabled
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- BLDLIBRARY='$(LIBRARY)'
- LDLIBRARY='libpython$(VERSION).dll.a'
- ;;
-@@ -1714,6 +1721,10 @@
- #endif
- ])
-
-+ac_cv_sizeof_off_t=`echo $ac_cv_sizeof_off_t | tr -d '\015'`
-+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
-+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
-+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
- AC_MSG_CHECKING(whether to enable large file support)
- if test "$have_long_long" = yes
- then
-@@ -1919,7 +1930,7 @@
- *) SO=.sl;;
- esac
- ;;
-- CYGWIN*) SO=.dll;;
-+ CYGWIN* | MINGW*) SO=.dll;;
- *) SO=.so;;
- esac
- else
-@@ -2077,7 +2088,7 @@
- SCO_SV*)
- LDSHARED='$(CC) -Wl,-G,-Bexport'
- LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
- LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
- atheos*)
-@@ -2169,7 +2120,7 @@
- LINKFORSHARED="-Xlinker --export-dynamic"
- fi;;
- esac;;
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- if test $enable_shared = "no"
- then
- LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-@@ -2191,7 +2202,7 @@
- if test ! "$LIBRARY" = "$LDLIBRARY"
- then
- case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- # Cygwin needs CCSHARED when building extension DLLs
- # but not when building the interpreter DLL.
- CFLAGSFORSHARED='';;
-@@ -2601,7 +2612,7 @@
- fi
- AC_CHECK_FUNCS(pthread_sigmask,
- [case $ac_sys_system in
-- CYGWIN*)
-+ CYGWIN* | MINGW*)
- AC_DEFINE(HAVE_BROKEN_PTHREAD_SIGMASK, 1,
- [Define if pthread_sigmask() does not work on your system.])
- ;;
-@@ -2609,6 +2620,17 @@
- AC_CHECK_FUNCS(pthread_atfork)
- fi
-
-+AC_SUBST(USE_PASSWORD_MODULE)
-+case $MACHDEP in
-+winmingw*)
-+ THREADOBJ="Python/thread.o"
-+ USE_THREAD_MODULE="#"
-+ USE_PASSWORD_MODULE="#"
-+ ;;
-+*)
-+ USE_PASSWORD_MODULE=""
-+ ;;
-+esac
-
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
-@@ -2880,6 +2902,11 @@
- # Use dynload_next.c only on 10.2 and below, which don't have native
dlopen()
- Darwin/@<:@0156@:>@\..*) DYNLOADFILE="dynload_next.o";;
- atheos*) DYNLOADFILE="dynload_atheos.o";;
-+ CYGWIN* | MINGW*)
-+ case $MACHDEP in
-+ winmingw*) DYNLOADFILE="dynload_win.o PC/import_nt.o
PC/dl_nt.o";;
-+ esac
-+ ;;
- *)
- # use dynload_shlib.c and dlopen() if we have it; otherwise stub
- # out any dynamic loading
-@@ -2897,6 +2924,19 @@
- [Defined when any dynamic module loading is enabled.])
- fi
-
-+AC_SUBST(GETPATH_OBJS)
-+AC_MSG_CHECKING(GETPATH_OBJS)
-+if test -z "$GETPATH_OBJS"
-+then
-+ case $MACHDEP in
-+ winmingw*)
-+ GETPATH_OBJS='PC/getpathp.o';;
-+ *)
-+ GETPATH_OBJS='Modules/getpath.o';;
-+ esac
-+fi
-+AC_MSG_RESULT($GETPATH_OBJS)
-+
- # MACHDEP_OBJS can be set to platform-specific object files needed by Python
-
- AC_SUBST(MACHDEP_OBJS)
-@@ -3358,7 +3398,14 @@
- AC_CHECK_MEMBERS([struct stat.st_flags])
- AC_CHECK_MEMBERS([struct stat.st_gen])
- AC_CHECK_MEMBERS([struct stat.st_birthtime])
-+case $MACHDEP in
-+winmingw*)
-+AC_CHECK_MEMBERS([struct stat.st_blocks])
-+;;
-+*)
- AC_STRUCT_ST_BLOCKS
-+;;
-+esac
-
- AC_MSG_CHECKING(for time.h that defines altzone)
- AC_CACHE_VAL(ac_cv_header_time_altzone,[
-@@ -3979,6 +4026,7 @@
- AH_TEMPLATE(PY_UNICODE_TYPE,
- [Define as the integral type used for Unicode representation.])
-
-+ac_cv_sizeof_wchar_t=`echo $ac_cv_sizeof_wchar_t | tr -d '\015'`
- AC_SUBST(UNICODE_OBJS)
- if test "$enable_unicode" = "no"
- then
-diff -ru misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py
---- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/setup.py 2016-01-01 17:49:55.312719892 -0500
-@@ -287,6 +287,18 @@
- if not self.configure_ctypes(ext):
- return
-
-+ if self.get_platform() == "winmingw":
-+ if ext.name == '_ctypes_test':
-+ ext.libraries.append('oleaut32')
-+ elif ext.name == 'select':
-+ ext.libraries.append('ws2_32')
-+ elif ext.name == '_socket':
-+ ext.libraries.append('ws2_32')
-+ if ext.name == '_ctypes':
-+ ext.libraries.append('uuid')
-+ ext.libraries.append('oleaut32')
-+ ext.libraries.append('ole32')
-+
- try:
- build_ext.build_extension(self, ext)
- except (CCompilerError, DistutilsError), why:
-@@ -316,7 +328,7 @@
-
- # Workaround for Cygwin: Cygwin currently has fork issues when many
- # modules have been imported
-- if host_platform == 'cygwin':
-+ if host_platform in ['cygwin', 'winmingw']:
- self.announce('WARNING: skipping import check for Cygwin-based
"%s"'
- % ext.name)
- return
-@@ -1235,7 +1247,7 @@
-
- dbm_order = ['gdbm']
- # The standard Unix dbm module:
-- if host_platform not in ['cygwin']:
-+ if host_platform not in ['cygwin', 'winmingw']:
- config_args = [arg.strip("'")
- for arg in
sysconfig.get_config_var("CONFIG_ARGS").split()]
- dbm_args = [arg for arg in config_args
-@@ -1327,7 +1339,7 @@
- missing.append('resource')
-
- # Sun yellow pages. Some systems have the functions in libc.
-- if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
-+ if (host_platform not in ['cygwin', 'winmingw', 'atheos', 'qnx6']
and
- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
- if (self.compiler.find_library_file(lib_dirs, 'nsl')):
- libs = ['nsl']
-@@ -1549,7 +1561,7 @@
- macros = dict()
- libraries = []
-
-- elif host_platform == 'cygwin': # Cygwin
-+ elif host_platform == 'cygwin', 'winmingw': # Cygwin
- macros = dict()
- libraries = []
-
-@@ -1571,7 +1583,7 @@
- macros = dict()
- libraries = ['rt']
-
-- if host_platform == 'win32':
-+ if host_platform in ['win32', 'winmingw']:
- multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
- '_multiprocessing/semaphore.c',
- '_multiprocessing/pipe_connection.c',
-@@ -1590,6 +1602,7 @@
- if sysconfig.get_config_var('WITH_THREAD'):
- exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
- define_macros=macros.items(),
-+ libraries=libraries,
-
include_dirs=["Modules/_multiprocessing"]))
- else:
- missing.append('_multiprocessing')
-@@ -1723,6 +1736,10 @@
- '-framework', 'Carbon']) )
-
-
-+ if platform == 'winmingw':
-+ exts.append( Extension('_winreg', ['../PC/_winreg.c']) )
-+ exts.append( Extension('winsound', ['../PC/winsound.c'],
libraries = ['winmm']) )
-+
- self.extensions.extend(exts)
-
- # Call the method for detecting whether _tkinter can be compiled
-@@ -1932,7 +1949,7 @@
- added_lib_dirs.append('/usr/X11/lib')
-
- # If Cygwin, then verify that X is installed before proceeding
-- if host_platform == 'cygwin':
-+ if host_platform in ['cygwin', 'winmingw']:
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
- if x11_inc is None:
- return
-@@ -1955,7 +1972,7 @@
- libs.append('ld')
-
- # Finally, link with the X11 libraries (not appropriate on cygwin)
-- if host_platform != "cygwin":
-+ if not host_platform in ["cygwin", "winmingw"]:
- libs.append('X11')
-
- ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-@@ -2025,6 +2042,8 @@
- if (('--host=' in arg) or ('--build=' in arg))]
- if not self.verbose:
- config_args.append("-q")
-+ if self.get_platform() == "winmingw":
-+ config_args.append(" --build=mingw32")
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
+Only in misc/build/Python-2.7.12/Python: frozenmain.c.rej
Copied: openoffice/trunk/main/python/python-2.7.12-nohardlink.patch (from
r1759004, openoffice/trunk/main/python/python-2.7.9-nohardlink.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.12-nohardlink.patch?p2=openoffice/trunk/main/python/python-2.7.12-nohardlink.patch&p1=openoffice/trunk/main/python/python-2.7.9-nohardlink.patch&r1=1759004&r2=1759046&rev=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.9-nohardlink.patch (original)
+++ openoffice/trunk/main/python/python-2.7.12-nohardlink.patch Sat Sep 3
01:35:21 2016
@@ -1,6 +1,6 @@
---- misc/Python-2.7.9/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.9/Makefile.pre.in 2012-07-22 14:54:26.000000000
-0500
-@@ -491,7 +491,7 @@
+--- misc/Python-2.7.12/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.12/Makefile.pre.in 2012-07-22 14:54:26.000000000
-0500
+@@ -563,7 +563,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME)
$(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
Copied: openoffice/trunk/main/python/python-2.7.12-pcbuild.patch (from
r1759004, openoffice/trunk/main/python/python-2.7.9-pcbuild.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.12-pcbuild.patch?p2=openoffice/trunk/main/python/python-2.7.12-pcbuild.patch&p1=openoffice/trunk/main/python/python-2.7.9-pcbuild.patch&r1=1759004&r2=1759046&rev=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.9-pcbuild.patch (original)
+++ openoffice/trunk/main/python/python-2.7.12-pcbuild.patch Sat Sep 3
01:35:21 2016
@@ -1,6 +1,6 @@
-diff -u misc/Python-2.7.9/PCbuild/_bsddb.vcproj
misc/build/Python-2.7.9/PCbuild/_bsddb.vcproj
---- misc/Python-2.7.9/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_bsddb.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_bsddb.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_bsddb.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.9/PCbuild/_bsddb
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.9/PCbuild/_ctypes.vcproj
misc/build/Python-2.7.9/PCbuild/_ctypes.vcproj
---- misc/Python-2.7.9/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_ctypes.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_ctypes.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_ctypes.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.9/PCbuild/_ctype
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.9/PCbuild/_ctypes_test.vcproj
misc/build/Python-2.7.9/PCbuild/_ctypes_test.vcproj
---- misc/Python-2.7.9/PCbuild/_ctypes_test.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/_ctypes_test.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_ctypes_test.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_ctypes_test.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.9/PCbuild/_ctype
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_elementtree.vcproj
misc/build/Python-2.7.9/PCbuild/_elementtree.vcproj
---- misc/Python-2.7.9/PCbuild/_elementtree.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/_elementtree.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_elementtree.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_elementtree.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.9/PCbuild/_eleme
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_hashlib.vcproj
misc/build/Python-2.7.9/PCbuild/_hashlib.vcproj
---- misc/Python-2.7.9/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_hashlib.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_hashlib.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_hashlib.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.9/PCbuild/_hashl
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_msi.vcproj
misc/build/Python-2.7.9/PCbuild/_msi.vcproj
---- misc/Python-2.7.9/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_msi.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_msi.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_msi.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.9/PCbuild/_msi.v
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_multiprocessing.vcproj
misc/build/Python-2.7.9/PCbuild/_multiprocessing.vcproj
---- misc/Python-2.7.9/PCbuild/_multiprocessing.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/_multiprocessing.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_multiprocessing.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_multiprocessing.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_multiprocessing.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.9/PCbuild/_multi
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_socket.vcproj
misc/build/Python-2.7.9/PCbuild/_socket.vcproj
---- misc/Python-2.7.9/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_socket.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_socket.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_socket.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.9/PCbuild/_socke
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_sqlite3.vcproj
misc/build/Python-2.7.9/PCbuild/_sqlite3.vcproj
---- misc/Python-2.7.9/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_sqlite3.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_sqlite3.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_sqlite3.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -u misc/Python-2.7.9/PCbuild/_sqlit
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_ssl.vcproj
misc/build/Python-2.7.9/PCbuild/_ssl.vcproj
---- misc/Python-2.7.9/PCbuild/_ssl.vcproj 2014-12-10 07:59:58.000000000
-0800
-+++ misc/build/Python-2.7.9/PCbuild/_ssl.vcproj 2016-09-02
03:56:17.659101000 -0700
+diff -u misc/Python-2.7.12/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_ssl.vcproj 2014-12-10 07:59:58.000000000
-0800
++++ misc/build/Python-2.7.12/PC/VS9.0/_ssl.vcproj 2016-09-02
03:56:17.659101000 -0700
@@ -43,7 +43,7 @@
/>
<Tool
@@ -689,9 +689,9 @@ diff -u misc/Python-2.7.9/PCbuild/_ssl.v
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_testcapi.vcproj
misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj
---- misc/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_testcapi.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_testcapi.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -756,9 +756,9 @@ diff -u misc/Python-2.7.9/PCbuild/_testc
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/_tkinter.vcproj
misc/build/Python-2.7.9/PCbuild/_tkinter.vcproj
---- misc/Python-2.7.9/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/_tkinter.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.12/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/_tkinter.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/_tkinter.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,9 +823,9 @@ diff -u misc/Python-2.7.9/PCbuild/_tkint
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/bdist_wininst.vcproj
misc/build/Python-2.7.9/PCbuild/bdist_wininst.vcproj
---- misc/Python-2.7.9/PCbuild/bdist_wininst.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/bdist_wininst.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/bdist_wininst.vcproj
misc/build/Python-2.7.12/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/bdist_wininst.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/bdist_wininst.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
@@ -846,9 +846,9 @@ diff -u misc/Python-2.7.9/PCbuild/bdist_
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.9/PCbuild/bz2.vcproj
misc/build/Python-2.7.9/PCbuild/bz2.vcproj
---- misc/Python-2.7.9/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000
-0500
+diff -u misc/Python-2.7.12/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.12/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/bz2.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/bz2.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -913,9 +913,9 @@ diff -u misc/Python-2.7.9/PCbuild/bz2.vc
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/kill_python.vcproj
misc/build/Python-2.7.9/PCbuild/kill_python.vcproj
---- misc/Python-2.7.9/PCbuild/kill_python.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/kill_python.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.12/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/kill_python.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/kill_python.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -948,9 +948,9 @@ diff -u misc/Python-2.7.9/PCbuild/kill_p
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/make_buildinfo.vcproj
misc/build/Python-2.7.9/PCbuild/make_buildinfo.vcproj
---- misc/Python-2.7.9/PCbuild/make_buildinfo.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/make_buildinfo.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/make_buildinfo.vcproj
misc/build/Python-2.7.12/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/make_buildinfo.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/make_buildinfo.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -967,9 +967,9 @@ diff -u misc/Python-2.7.9/PCbuild/make_b
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/make_versioninfo.vcproj
misc/build/Python-2.7.9/PCbuild/make_versioninfo.vcproj
---- misc/Python-2.7.9/PCbuild/make_versioninfo.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/make_versioninfo.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/make_versioninfo.vcproj
misc/build/Python-2.7.12/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/make_versioninfo.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/make_versioninfo.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1002,9 +1002,9 @@ diff -u misc/Python-2.7.9/PCbuild/make_v
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/pcbuild.sln
misc/build/Python-2.7.9/PCbuild/pcbuild.sln
---- misc/Python-2.7.9/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/pcbuild.sln 2012-07-30
21:04:33.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.12/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.12/PC/VS9.0/pcbuild.sln 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/pcbuild.sln 2012-07-30
21:04:33.000000000 -0500
@@ -38,12 +38,12 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
@@ -1099,9 +1099,9 @@ diff -u misc/Python-2.7.9/PCbuild/pcbuil
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing",
"_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -u misc/Python-2.7.9/PCbuild/pyexpat.vcproj
misc/build/Python-2.7.9/PCbuild/pyexpat.vcproj
---- misc/Python-2.7.9/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/pyexpat.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.12/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/pyexpat.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/pyexpat.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.9/PCbuild/pyexpa
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/python.vcproj
misc/build/Python-2.7.9/PCbuild/python.vcproj
---- misc/Python-2.7.9/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/python.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/python.vcproj
misc/build/Python-2.7.12/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/python.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/python.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
@@ -1233,9 +1233,9 @@ diff -u misc/Python-2.7.9/PCbuild/python
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/pythoncore.vcproj
misc/build/Python-2.7.9/PCbuild/pythoncore.vcproj
---- misc/Python-2.7.9/PCbuild/pythoncore.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/pythoncore.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.12/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/pythoncore.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/pythoncore.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1306,9 +1306,9 @@ diff -u misc/Python-2.7.9/PCbuild/python
</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
-diff -u misc/Python-2.7.9/PCbuild/pythonw.vcproj
misc/build/Python-2.7.9/PCbuild/pythonw.vcproj
---- misc/Python-2.7.9/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/pythonw.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.12/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/pythonw.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/pythonw.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1373,9 +1373,9 @@ diff -u misc/Python-2.7.9/PCbuild/python
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/select.vcproj
misc/build/Python-2.7.9/PCbuild/select.vcproj
---- misc/Python-2.7.9/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/select.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/select.vcproj
misc/build/Python-2.7.12/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/select.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/select.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1440,9 +1440,9 @@ diff -u misc/Python-2.7.9/PCbuild/select
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/sqlite3.vcproj
misc/build/Python-2.7.9/PCbuild/sqlite3.vcproj
---- misc/Python-2.7.9/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/sqlite3.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.12/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/sqlite3.vcproj 2012-04-09 18:07:35.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/sqlite3.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1507,9 +1507,9 @@ diff -u misc/Python-2.7.9/PCbuild/sqlite
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/unicodedata.vcproj
misc/build/Python-2.7.9/PCbuild/unicodedata.vcproj
---- misc/Python-2.7.9/PCbuild/unicodedata.vcproj 2012-04-09
18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/unicodedata.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.12/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/unicodedata.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/unicodedata.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1574,9 +1574,9 @@ diff -u misc/Python-2.7.9/PCbuild/unicod
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/w9xpopen.vcproj
misc/build/Python-2.7.9/PCbuild/w9xpopen.vcproj
---- misc/Python-2.7.9/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/w9xpopen.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.12/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/w9xpopen.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/w9xpopen.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1641,9 +1641,9 @@ diff -u misc/Python-2.7.9/PCbuild/w9xpop
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.9/PCbuild/winsound.vcproj
misc/build/Python-2.7.9/PCbuild/winsound.vcproj
---- misc/Python-2.7.9/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/winsound.vcproj 2012-07-30
20:59:37.000000000 -0500
+diff -u misc/Python-2.7.12/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.12/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.12/PC/VS9.0/winsound.vcproj 2012-04-09
18:07:35.000000000 -0500
++++ misc/build/Python-2.7.12/PC/VS9.0/winsound.vcproj 2012-07-30
20:59:37.000000000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
Copied: openoffice/trunk/main/python/python-2.7.12-sysbase.patch (from
r1759004, openoffice/trunk/main/python/python-2.7.9-sysbase.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.12-sysbase.patch?p2=openoffice/trunk/main/python/python-2.7.12-sysbase.patch&p1=openoffice/trunk/main/python/python-2.7.9-sysbase.patch&r1=1759004&r2=1759046&rev=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.9-sysbase.patch (original)
+++ openoffice/trunk/main/python/python-2.7.12-sysbase.patch Sat Sep 3
01:35:21 2016
@@ -1,7 +1,7 @@
-diff -ruN misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure
---- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/configure 2016-01-01 15:18:37.398344671 -0500
-@@ -3199,7 +3199,9 @@
+diff -ruN misc/Python-2.7.12/configure misc/build/Python-2.7.12/configure
+--- misc/Python-2.7.12/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.12/configure 2016-01-01 15:18:37.398344671 -0500
+@@ -3227,7 +3227,9 @@
ac_sys_release=
else
ac_sys_system=`uname -s`
Modified: openoffice/trunk/main/python/python-freebsd.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-freebsd.patch?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-freebsd.patch (original)
+++ openoffice/trunk/main/python/python-freebsd.patch Sat Sep 3 01:35:21 2016
@@ -1,6 +1,6 @@
-diff -ruN misc/Python-2.7.9/Lib/plat-freebsd9/IN.py
misc/build/Python-2.7.9/Lib/plat-freebsd9/IN.py
---- misc/Python-2.7.9/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000
-0500
-+++ misc/build/Python-2.7.9/Lib/plat-freebsd9/IN.py 2016-01-01
17:38:35.922764464 -0500
+diff -ruN misc/Python-2.7.12/Lib/plat-freebsd9/IN.py
misc/build/Python-2.7.12/Lib/plat-freebsd9/IN.py
+--- misc/Python-2.7.12/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000
-0500
++++ misc/build/Python-2.7.12/Lib/plat-freebsd9/IN.py 2016-01-01
17:38:35.922764464 -0500
@@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h
+
@@ -614,16 +614,16 @@ diff -ruN misc/Python-2.7.9/Lib/plat-fre
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
-diff -ruN misc/Python-2.7.9/Lib/plat-freebsd9/regen
misc/build/Python-2.7.9/Lib/plat-freebsd9/regen
---- misc/Python-2.7.9/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000
-0500
-+++ misc/build/Python-2.7.9/Lib/plat-freebsd9/regen 2016-01-01
17:38:35.922764464 -0500
+diff -ruN misc/Python-2.7.12/Lib/plat-freebsd9/regen
misc/build/Python-2.7.12/Lib/plat-freebsd9/regen
+--- misc/Python-2.7.12/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000
-0500
++++ misc/build/Python-2.7.12/Lib/plat-freebsd9/regen 2016-01-01
17:38:35.922764464 -0500
@@ -0,0 +1,3 @@
+#! /bin/sh
+set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-diff -ruN misc/Python-2.7.9/Lib/test/test_threading.py
misc/build/Python-2.7.9/Lib/test/test_threading.py
---- misc/Python-2.7.9/Lib/test/test_threading.py 2014-06-29
21:05:37.000000000 -0500
-+++ misc/build/Python-2.7.9/Lib/test/test_threading.py 2016-01-01
17:38:35.923764731 -0500
+diff -ruN misc/Python-2.7.12/Lib/test/test_threading.py
misc/build/Python-2.7.12/Lib/test/test_threading.py
+--- misc/Python-2.7.12/Lib/test/test_threading.py 2014-06-29
21:05:37.000000000 -0500
++++ misc/build/Python-2.7.12/Lib/test/test_threading.py 2016-01-01
17:38:35.923764731 -0500
@@ -486,7 +486,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic
tests
@@ -633,9 +633,9 @@ diff -ruN misc/Python-2.7.9/Lib/test/tes
'os2emx')
def _run_and_join(self, script):
-diff -ruN misc/Python-2.7.9/Modules/fcntlmodule.c
misc/build/Python-2.7.9/Modules/fcntlmodule.c
---- misc/Python-2.7.9/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/fcntlmodule.c 2016-01-01
17:42:35.865747022 -0500
+diff -ruN misc/Python-2.7.12/Modules/fcntlmodule.c
misc/build/Python-2.7.12/Modules/fcntlmodule.c
+--- misc/Python-2.7.12/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/fcntlmodule.c 2016-01-01
17:42:35.865747022 -0500
@@ -98,20 +98,15 @@
{
#define IOCTL_BUFSZ 1024
@@ -687,9 +687,9 @@ diff -ruN misc/Python-2.7.9/Modules/fcnt
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
-diff -ruN misc/Python-2.7.9/Python/thread_pthread.h
misc/build/Python-2.7.9/Python/thread_pthread.h
---- misc/Python-2.7.9/Python/thread_pthread.h 2014-06-29 21:05:47.000000000
-0500
-+++ misc/build/Python-2.7.9/Python/thread_pthread.h 2016-01-01
17:38:35.933764047 -0500
+diff -ruN misc/Python-2.7.12/Python/thread_pthread.h
misc/build/Python-2.7.12/Python/thread_pthread.h
+--- misc/Python-2.7.12/Python/thread_pthread.h 2014-06-29 21:05:47.000000000
-0500
++++ misc/build/Python-2.7.12/Python/thread_pthread.h 2016-01-01
17:38:35.933764047 -0500
@@ -38,13 +38,18 @@
#endif
#endif
@@ -743,10 +743,10 @@ diff -ruN misc/Python-2.7.9/Python/threa
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure
---- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/configure 2016-01-01 17:41:32.541753889 -0500
-@@ -5355,7 +5355,7 @@
+diff -ruN misc/Python-2.7.12/configure misc/build/Python-2.7.12/configure
+--- misc/Python-2.7.12/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.12/configure 2016-01-01 17:41:32.541753889 -0500
+@@ -5409,7 +5409,7 @@
;;
SunOS*)
LDLIBRARY='libpython$(VERSION).so'
@@ -755,7 +755,7 @@ diff -ruN misc/Python-2.7.9/configure mi
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
-@@ -5363,11 +5363,6 @@
+@@ -5417,11 +5417,6 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -767,10 +767,10 @@ diff -ruN misc/Python-2.7.9/configure mi
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ruN misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py
---- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/setup.py 2016-01-01 17:38:35.945765223 -0500
-@@ -1553,7 +1553,7 @@
+diff -ruN misc/Python-2.7.12/setup.py misc/build/Python-2.7.12/setup.py
+--- misc/Python-2.7.12/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.12/setup.py 2016-01-01 17:38:35.945765223 -0500
+@@ -1573,7 +1573,7 @@
macros = dict()
libraries = []
@@ -779,7 +779,7 @@ diff -ruN misc/Python-2.7.9/setup.py mis
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
macros = dict()
-@@ -1605,7 +1605,7 @@
+@@ -1625,7 +1625,7 @@
missing.append('linuxaudiodev')
if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
Modified: openoffice/trunk/main/python/python-md5.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-md5.patch?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-md5.patch (original)
+++ openoffice/trunk/main/python/python-md5.patch Sat Sep 3 01:35:21 2016
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.9/Modules/Setup.dist
misc/build/Python-2.7.9/Modules/Setup.dist
---- misc/Python-2.7.9/Modules/Setup.dist 2012-04-09 18:07:33.000000000
-0500
-+++ misc/build/Python-2.7.9/Modules/Setup.dist 2012-07-24 17:08:56.000000000
-0500
+diff -ru misc/Python-2.7.12/Modules/Setup.dist
misc/build/Python-2.7.12/Modules/Setup.dist
+--- misc/Python-2.7.12/Modules/Setup.dist 2012-04-09 18:07:33.000000000
-0500
++++ misc/build/Python-2.7.12/Modules/Setup.dist 2012-07-24
17:08:56.000000000 -0500
@@ -252,14 +252,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
Modified: openoffice/trunk/main/python/python-solaris.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solaris.patch?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solaris.patch (original)
+++ openoffice/trunk/main/python/python-solaris.patch Sat Sep 3 01:35:21 2016
@@ -1,5 +1,5 @@
---- misc/Python-2.7.9/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.9/Include/pyport.h 2012-07-24 18:19:52.000000000
-0500
+--- misc/Python-2.7.12/Include/pyport.h 2012-04-09 18:07:29.000000000
-0500
++++ misc/build/Python-2.7.12/Include/pyport.h 2012-07-24 18:19:52.000000000
-0500
@@ -640,11 +640,6 @@
in platform-specific #ifdefs.
**************************************************************************/
Modified: openoffice/trunk/main/python/python-solver-before-std.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solver-before-std.patch?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solver-before-std.patch (original)
+++ openoffice/trunk/main/python/python-solver-before-std.patch Sat Sep 3
01:35:21 2016
@@ -1,12 +1,13 @@
---- misc/Python-2.7.9/setup.py 2013-07-01 17:51:46.237674580 +0200
-+++ misc/build/Python-2.7.9/setup.py 2013-07-01 17:51:24.230453108 +0200
-@@ -80,61 +80,62 @@
+diff -ur misc/Python-2.7.12/setup.py misc/build/Python-2.7.12/setup.py
+--- misc/Python-2.7.12/setup.py 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.12/setup.py 2016-09-02 17:09:20.687419000 -0500
+@@ -80,39 +80,41 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
- # Check the standard locations
- for dir in std_dirs:
-+ # Check the additional directories
++ # Check the standard directories
+ for dir in paths:
f = os.path.join(dir, filename)
@@ -15,7 +16,7 @@
- if os.path.exists(f): return []
+ if os.path.exists(f):
-+ return [dir]
++ return [dir]
- # Check the additional directories
- for dir in paths:
@@ -51,14 +52,16 @@
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)
- if host_platform == 'darwin' and is_macosx_sdk_path(p):
+@@ -134,23 +136,22 @@
+ # vs
+ # /usr/lib/libedit.dylib
if os.path.join(sysroot, p[1:]) == dirname:
- return [ ]
+ return [ p ]
if p == dirname:
- return [ ]
-+ return [p]
++ return [ p ]
- # Otherwise, it must have been in one of the additional directories,
- # so we have to figure out which one.
@@ -79,7 +82,7 @@
else:
assert False, "Internal error: Path not found in std_dirs or paths"
-@@ -810,6 +811,7 @@
+@@ -830,6 +831,7 @@
exts.append( Extension('_ssl', ['_ssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
@@ -87,7 +90,7 @@
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
-@@ -849,6 +851,7 @@
+@@ -869,6 +871,7 @@
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
Modified: openoffice/trunk/main/python/python-ssl.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-ssl.patch?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-ssl.patch (original)
+++ openoffice/trunk/main/python/python-ssl.patch Sat Sep 3 01:35:21 2016
@@ -1,16 +1,16 @@
-diff -ruN misc/Python-2.7.9/PCbuild/build_ssl.py
misc/build/Python-2.7.9/PCbuild/build_ssl.py
---- misc/Python-2.7.9/PCbuild/build_ssl.py 2014-06-29 21:05:46.000000000
-0500
-+++ misc/build/Python-2.7.9/PCbuild/build_ssl.py 2016-01-01
15:15:32.256357072 -0500
-@@ -240,4 +240,4 @@
+diff -ruN misc/Python-2.7.12/PC/VS9.0/build_ssl.py
misc/build/Python-2.7.12/PC/VS9.0/build_ssl.py
+--- misc/Python-2.7.12/PC/VS9.0/build_ssl.py 2014-06-29 21:05:46.000000000
-0500
++++ misc/build/Python-2.7.12/PC/VS9.0/build_ssl.py 2016-01-01
15:15:32.256357072 -0500
+@@ -242,4 +242,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
-diff -ruN misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py
---- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.9/setup.py 2016-01-01 15:15:32.258356209 -0500
-@@ -788,7 +788,15 @@
+diff -ruN misc/Python-2.7.12/setup.py misc/build/Python-2.7.12/setup.py
+--- misc/Python-2.7.12/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.12/setup.py 2016-01-01 15:15:32.258356209 -0500
+@@ -808,7 +808,15 @@
depends=['socketmodule.h'],
libraries=math_libs) )
# Detect SSL support for the socket module (via _ssl)
@@ -26,7 +26,7 @@ diff -ruN misc/Python-2.7.9/setup.py mis
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
-@@ -800,8 +808,15 @@
+@@ -820,8 +828,15 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
Modified: openoffice/trunk/main/python/pyversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/pyversion.mk?rev=1759046&r1=1759045&r2=1759046&view=diff
==============================================================================
--- openoffice/trunk/main/python/pyversion.mk (original)
+++ openoffice/trunk/main/python/pyversion.mk Sat Sep 3 01:35:21 2016
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=9
+PYMICRO=12
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
