[Libreoffice-commits] core.git: external/python3

Michael Stahl mstahl at redhat.com
Mon Feb 22 17:26:31 UTC 2016


 external/python3/UnpackedTarball_python3.mk  |    1 -
 external/python3/python-3.3.5-vs2013.patch.1 |   14 --------------
 2 files changed, 15 deletions(-)

New commits:
commit eea5cb158e907fa1318f0689025bafce3caf8ae1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 22 18:22:13 2016 +0100

    python3: drop obsolete patch, cannot build 3.5 with MSVC 2013
    
    Change-Id: I1a6b41bb95bf4edb8e81f2db54624a0892c79bc5

diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index c3a4ef6..0e706d7 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	external/python3/python-3.3.0-pythreadstate.patch.1 \
 	external/python3/python-3.3.0-clang.patch.1 \
 	external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
-	$(if $(filter 120,$(VCVER)), external/python3/python-3.3.5-vs2013.patch.1) \
 	external/python3/python-lsan.patch.0 \
 	external/python3/ubsan.patch.0 \
 	external/python3/python-3.5.tweak.strip.soabi.patch \
diff --git a/external/python3/python-3.3.5-vs2013.patch.1 b/external/python3/python-3.3.5-vs2013.patch.1
deleted file mode 100644
index 5540ea1..0000000
--- a/external/python3/python-3.3.5-vs2013.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
--*- Mode:Diff -*-
---- python3/PC/pyconfig.h
-+++ python3/PC/pyconfig.h
-@@ -602,6 +602,10 @@
- /* Define if you have readlink.  */
- /* #undef HAVE_READLINK */
- 
-+#if defined(_MSC_VER) && _MSC_VER >= 1800
-+#define HAVE_ROUND
-+#endif
-+
- /* Define if you have select.  */
- /* #undef HAVE_SELECT */
- 


More information about the Libreoffice-commits mailing list