[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - python3/python-3.3.7-c99.patch.1 python3/python-3.3.7-vcproj.patch.1 python3/UnpackedTarball_python3.mk

[Libreoffice Gerrit user]

 python3/UnpackedTarball_python3.mk  |    2 +
 python3/python-3.3.7-c99.patch.1    |   38 ++++++++++++++++++++++++++++++++++++
 python3/python-3.3.7-vcproj.patch.1 |   20 ++++++++++++++++++
 3 files changed, 60 insertions(+)

New commits:
commit d46694b4f7f745a5095b04137ee50b8aa03914b1
Author:     Thorsten Behrens <thorsten.behrens at cib.de>
AuthorDate: Thu Aug 16 17:17:41 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Aug 16 21:40:34 2018 +0200

    python3: fix msbuild files for vs2012
    
    Change-Id: I6cfbbcf9326ea86e1c4a91652e3b789c6c5db0fd

diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 24bfaa673b5f..901012640770 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	python3/python-msvc-disable-sse2.patch.1 \
 	python3/ubsan.patch.0 \
 	python3/python-3.3.7-py30657.patch.1 \
+	python3/python-3.3.7-c99.patch.1 \
+	python3/python-3.3.7-vcproj.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/python3/python-3.3.7-c99.patch.1 b/python3/python-3.3.7-c99.patch.1
new file mode 100644
index 000000000000..8cdf03458fc9
--- /dev/null
+++ b/python3/python-3.3.7-c99.patch.1
@@ -0,0 +1,38 @@
+--- python3/Modules/expat/xmltok.c~	2017-09-19 09:32:02.000000000 +0200
++++ python3/Modules/expat/xmltok.c	2018-08-16 14:09:32.350949800 +0200
+@@ -31,7 +31,12 @@
+ */
+ 
+ #include <stddef.h>
+-#include <stdbool.h>
++
++//#include <stdbool.h>
++typedef int bool;
++#define false 0
++#define true 1
++
+ #include <string.h>  // memcpy
+ 
+ #ifdef _WIN32
+@@ -404,6 +409,7 @@
+     output_exhausted = true;
+   }
+ 
++  {
+   /* Avoid copying partial characters (from incomplete input). */
+   const char * const fromLimBefore = fromLim;
+   align_limit_to_full_utf8_characters(*fromP, &fromLim);
+@@ -411,10 +417,13 @@
+     input_incomplete = true;
+   }
+ 
++  {
+   const ptrdiff_t bytesToCopy = fromLim - *fromP;
+   memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);
+   *fromP += bytesToCopy;
+   *toP += bytesToCopy;
++  }
++  }
+ 
+   if (output_exhausted)  // needs to go first
+     return XML_CONVERT_OUTPUT_EXHAUSTED;
diff --git a/python3/python-3.3.7-vcproj.patch.1 b/python3/python-3.3.7-vcproj.patch.1
new file mode 100644
index 000000000000..9a9bf06bd90a
--- /dev/null
+++ b/python3/python-3.3.7-vcproj.patch.1
@@ -0,0 +1,20 @@
+--- python3/PCbuild/pyexpat.vcxproj~	2017-09-19 09:32:02.000000000 +0200
++++ python3/PCbuild/pyexpat.vcxproj	2018-08-16 18:45:44.202252500 +0200
+@@ -222,6 +222,7 @@
+   <ItemGroup>
+     <ClCompile Include="..\Modules\pyexpat.c" />
+     <ClCompile Include="..\Modules\expat\xmlparse.c" />
++    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
+     <ClCompile Include="..\Modules\expat\xmlrole.c" />
+     <ClCompile Include="..\Modules\expat\xmltok.c" />
+   </ItemGroup>
+--- python3/PCbuild/_elementtree.vcxproj~	2017-09-19 09:32:02.000000000 +0200
++++ python3/PCbuild/_elementtree.vcxproj	2018-08-16 19:21:43.515980500 +0200
+@@ -254,6 +254,7 @@
+   </ItemGroup>
+   <ItemGroup>
+     <ClCompile Include="..\Modules\_elementtree.c" />
++    <ClCompile Include="..\Modules\expat\loadlibrary.c" />
+     <ClCompile Include="..\Modules\expat\xmlparse.c" />
+     <ClCompile Include="..\Modules\expat\xmlrole.c" />
+     <ClCompile Include="..\Modules\expat\xmltok.c" />