[Libreoffice-commits] core.git: 2 commits - external/jpeg-turbo Makefile.in

[Caolán McNamara]

 Makefile.in                                       |    2 +-
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |    1 +
 external/jpeg-turbo/jpeg-turbo.arm_build.patch.1  |   18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 2f5682dbc26067f3fe050889e96ebc70716abd90
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 14:34:12 2017 +0000

    include stdint.h earlier to ensure SIZE_MAX
    
    Change-Id: I592600e4600bfb360a154a450fcc6135f4fc3008

diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
index 7f97422..5fdc5e4 100644
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0))
 $(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
 	external/jpeg-turbo/jpeg-turbo.build.patch.1 \
 	$(if $(filter WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \
+	external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 \
 	external/jpeg-turbo/ubsan.patch \
 ))
 
diff --git a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
new file mode 100644
index 0000000..66acb52
--- /dev/null
+++ b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
@@ -0,0 +1,18 @@
+diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
+--- jpeg.org/jmemmgr.c      2017-03-15 14:29:29.286587049 +0000
++++ jpeg/jmemmgr.c	2017-03-15 14:31:21.096378506 +0000
+@@ -27,12 +27,13 @@
+  * memory then you shouldn't care about a little bit of unused code...)
+  */
+ 
++#include <stdint.h>
++
+ #define JPEG_INTERNALS
+ #define AM_MEMORY_MANAGER       /* we define jvirt_Xarray_control structs */
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "jmemsys.h"            /* import the system-dependent declarations */
+-#include <stdint.h>
+ 
+ #ifndef NO_GETENV
+ #ifndef HAVE_STDLIB_H           /* <stdlib.h> should declare getenv() */
commit 78dbfa9fff9c408108112302640e0cfb8aa53a11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 15 13:52:28 2017 +0000

    ppt fuzzer still needs more work to finish its run
    
    Change-Id: I11e9c23ab8b61b86bd7abb59b853cd7432a3d11f

diff --git a/Makefile.in b/Makefile.in
index 87b4e97..bc5285b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ $(foreach ide,\
     eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide))))
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer
  Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd
 
 endif # MAKE_RESTARTS