[Libreoffice-commits] core.git: bin/lo-all-static-libs download.lst external/libwebp RepositoryExternal.mk

2022-12-31 Thread Caolán McNamara (via logerrit) 
 RepositoryExternal.mk  |1 +
 bin/lo-all-static-libs |1 +
 download.lst   |4 ++--
 external/libwebp/Makefile.vc.patch |   28 ++--
 4 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit eefa5cb64f97845e80ab23984bb7b516174fa817
Author: Caolán McNamara 
AuthorDate: Thu Dec 29 20:36:07 2022 +
Commit: Caolán McNamara 
CommitDate: Sat Dec 31 11:12:23 2022 +

Related: ofz Use-of-uninitialized-value

Change-Id: I2f6e726f713836295603bf7112371aa4aff2c7c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144868
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ad8f0204cd4e..92ea4ba17670 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2693,6 +2693,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs -lwebp \
+   -L$(call gb_UnpackedTarball_get_dir,libwebp)/sharpyuv/.libs -lsharpyuv \
 )
 endif
 $(call gb_LinkTarget_use_external_project,$(1),libwebp)
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index af4ff25f348b..3db8d803d07a 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -125,6 +125,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libtiff/libtiff/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwebp/src/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libwebp/sharpyuv/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
diff --git a/download.lst b/download.lst
index de7a832422a0..5eed30c442ec 100644
--- a/download.lst
+++ b/download.lst
@@ -330,8 +330,8 @@ LIBTOMMATH_TARBALL := ltm-1.0.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
-LIBWEBP_TARBALL := libwebp-1.2.4.tar.gz
+LIBWEBP_SHA256SUM := 
17fd427d210702a595f08ec619afa2cd3bd323f838ad109666482eac8fff65f0
+LIBWEBP_TARBALL := libwebp-1.3.0-rc1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libwebp/Makefile.vc.patch 
b/external/libwebp/Makefile.vc.patch
index f13c12410e46..41c899921a1c 100644
--- a/external/libwebp/Makefile.vc.patch
+++ b/external/libwebp/Makefile.vc.patch
@@ -1,7 +1,7 @@
 --- Makefile.vc.sav2021-07-30 00:55:37.0 +0200
 +++ Makefile.vc2022-01-25 17:35:30.206117700 +0100
-@@ -7,11 +7,11 @@
- LIBWEBPDEMUX_BASENAME = libwebpdemux
+@@ -8,11 +8,11 @@
+ LIBSHARPYUV_BASENAME = libsharpyuv
  
  !IFNDEF ARCH
 -!IF ! [ cl 2>&1 | find "x86" > NUL ]
@@ -15,7 +15,7 @@
  ARCH = ARM
  !ELSE
  !ERROR Unable to auto-detect toolchain architecture! \
-@@ -27,8 +27,8 @@
+@@ -28,8 +28,8 @@
  ## Nothing more to do below this line!
  
  NOLOGO = /nologo
@@ -35,7 +35,7 @@
  DIROBJ = $(DIRBASE)\obj
  DIRLIB = $(DIRBASE)\lib
  DIRINC = $(DIRBASE)\include
-@@ -86,10 +86,10 @@
+@@ -87,10 +87,10 @@
  
  # Target configuration
  !IF "$(CFG)" == "release-static"
@@ -48,9 +48,9 @@
  RTLIB  = $(RTLIBD)
  STATICLIBBUILD = TRUE
  LIBWEBPDECODER_BASENAME = $(LIBWEBPDECODER_BASENAME)_debug
-@@ -97,11 +97,11 @@
- LIBWEBPMUX_BASENAME = $(LIBWEBPMUX_BASENAME)_debug
+@@ -99,11 +99,11 @@
  LIBWEBPDEMUX_BASENAME = $(LIBWEBPDEMUX_BASENAME)_debug
+ LIBSHARPYUV_BASENAME = $(LIBSHARPYUV_BASENAME)_debug
  !ELSE IF "$(CFG)" == "release-dynamic"
 -CC= $(CCNODBG)
 +CC_= $(CCNODBG)
@@ -62,7 +62,7 @@
  RC= $(RCDEBUG)
  RTLIB = $(RTLIBD)
  DLLBUILD  = TRUE
-@@ -112,7 +112,7 @@
+@@ -115,7 +115,7 @@
  !ENDIF
  
  !IF "$(STATICLIBBUILD)" == "TRUE"
@@ -71,25 +71,25 @@
  CFGSET = TRUE
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME).lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME).lib
-@@ -120,7 +120,7 @@
+@@ -123,7 +123,7 @@
  LIBWEBPDEMUX = $(DIRLIB)\$(LIBWEBPDEMUX_BASENAME).lib
+ LIBSHARPYUV = $(DIRLIB)\$(LIBSHARPYUV_BASENAME).lib
  !ELSE IF "$(DLLBUILD)" == "TRUE"
- DLLINC = webp_dll.h
--CC = $(CC) /I$(DIROBJ) /FI$(DLLINC) $(RTLIB) /DWEBP_DLL
-+CC_ = $(CC_) /I$(DIROBJ) /FI$(DLLINC) $(RTLIB) /DWEBP_DLL
+-CC = $(CC) /I$(DIROBJ) $(RTLIB) /DWEBP_DLL
++CC_ = $(CC_) /I$(DIROBJ) $(RTLIB) /DWEBP_DLL
  LIBWEBPDECODER = $(DIRLIB)\$(LIBWEBPDECODER_BASENAME)_dll.lib
  LIBWEBP = $(DIRLIB)\$(LIBWEBP_BASENAME)_dll.lib
  LIBWEBPMUX = $(DIRLIB)\$(LIBWEBPMUX_BASENAME)_dll.lib
-@@ -421,7 +421,7 @@
- $(DIROBJ)\$(DLLINC)
+@@ -434,7 +434,7 @@
  
+ !IF "$(DLLBUILD)" == "TRUE"
  {$(DIROBJ)}.c{$(DIROBJ)}.obj:
 -  $(CC) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$@  $<
 +  $(CC_) $(CFLAGS) /Fd$(LIBWEBP_PDBNAME) /Fo$@  $<
  
  {src}.rc{$(DIROBJ)}.res:
$(RC) /fo$@ $<
-@@ -469,41 +469,41 @@
+@@ -467,41

[Libreoffice-commits] core.git: bin/lo-all-static-libs config_host.mk.in configure.ac download.lst external/libtiff external/Module_external.mk Makefile.fetch RepositoryExternal.mk vcl/Library_vcl.mk

2022-05-20 Thread Julien Nabet (via logerrit) 
 Makefile.fetch  |1 
 RepositoryExternal.mk   |   49 
 bin/lo-all-static-libs  |1 
 config_host.mk.in   |3 +
 configure.ac|6 +++
 download.lst|2 +
 external/Module_external.mk |1 
 external/libtiff/ExternalProject_libtiff.mk |   44 +
 external/libtiff/Makefile   |7 
 external/libtiff/Module_libtiff.mk  |   17 +
 external/libtiff/UnpackedTarball_libtiff.mk |   16 +
 vcl/Library_vcl.mk  |1 
 12 files changed, 148 insertions(+)

New commits:
commit a2ffd71f20e14f797f30223fe29b3ac1e92eafdf
Author: Julien Nabet 
AuthorDate: Thu May 19 20:09:51 2022 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 20 22:29:00 2022 +0200

build libtiff

Change-Id: Id9b6e1355147c3f68b9922db14f1b4904a05c686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/Makefile.fetch b/Makefile.fetch
index 10641958a9a1..ccb3860735cb 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -159,6 +159,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
$(call fetch_Optional,LIBNUMBERTEXT,LIBNUMBERTEXT_TARBALL) \
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
+   $(call fetch_Optional,LIBTIFF,LIBTIFF_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBWEBP,LIBWEBP_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 590a6093aea1..fa97dc350597 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2607,6 +2607,55 @@ endef
 
 endif # !SYSTEM_LIBPNG
 
+ifneq ($(SYSTEM_LIBTIFF),)
+
+define gb_LinkTarget__use_libtiff
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(LIBTIFF_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(LIBTIFF_LIBS) \
+)
+
+endef
+
+gb_ExternalProject__use_libtiff :=
+
+else # !SYSTEM_LIBTIFF
+
+define gb_LinkTarget__use_libtiff
+$(call gb_LinkTarget_set_include,$(1),\
+   $(LIBTIFF_CFLAGS) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,libtiff)/src \
+   $$(INCLUDE) \
+)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT)
 \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs -ltiff \
+)
+endif
+$(call gb_LinkTarget_use_external_project,$(1),libtiff)
+
+endef
+
+define gb_ExternalProject__use_libtiff
+$(call gb_ExternalProject_use_external_project,$(1),\
+   libtiff \
+)
+
+endef
+
+endif # !SYSTEM_LIBTIFF
 
 ifneq ($(SYSTEM_LIBWEBP),)
 
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index fbe6d7010624..af4ff25f348b 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -123,6 +123,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \
  $WORKDIR/UnpackedTarball/librevenge/src/*/.libs/*.a \
  $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libtiff/libtiff/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwebp/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
diff --git a/config_host.mk.in b/config_host.mk.in
index df8205e8ad1d..4d45a94e5a2c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -417,6 +417,8 @@ export LIBPNG_CFLAGS=$(gb_SPACE)@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=$(gb_SPACE)@LIBPNG_LIBS@
 export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
 export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
+export LIBTIFF_CFLAGS=$(gb_SPACE)@LIBTIFF_CFLAGS@
+export LIBTIFF_LIBS=$(gb_SPACE)@LIBTIFF_LIBS@
 export LIBTOMMATH_CFLAGS=@LIBTOMMATH_CFLAGS@
 export LIBTOMMATH_LIBS=@LIBTOMMATH_LIBS@
 export LIBTOOL=@LIBTOOL@
@@ -644,6 +646,7 @@ export SYSTEM_LIBNUMBERTEXT=@SYSTEM_LIBNUMBERTEXT@
 export SYSTEM_LIBNUMBERTEXT_DATA=@SYSTEM_LIBNUMBERTEXT_DATA@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
+export SYSTEM_LIBTIFF=@SYSTEM_LIBTIFF@
 export SYSTEM_LIBTOMMATH=@SYSTEM_LIBTOMMATH@
 export SYSTEM_LIBWEBP=@SYSTEM_LIBWEBP@
 export SYSTEM_LIBXML=@SYSTEM_LIBXML@
diff --git a/configure.ac b/configure.ac
index 34ba3f7844e0..186c472b7d45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13555,6 +13555,12 @@ 
LIBPNG_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/libpng"

[Libreoffice-commits] core.git: bin/lo-all-static-libs config_host.mk.in configure.ac download.lst external/libwebp external/Module_external.mk filter/Configuration_filter.mk filter/qa filter/source i

2022-01-31 Thread Luboš Luňák (via logerrit) 
 Makefile.fetch|1 
 RepositoryExternal.mk |   51 +
 bin/lo-all-static-libs|1 
 config_host.mk.in |3 
 configure.ac  |6 
 download.lst  |2 
 external/Module_external.mk   |1 
 external/libwebp/ExternalProject_libwebp.mk   |   52 +
 external/libwebp/Makefile |7 
 external/libwebp/Makefile.vc.patch|  145 

 external/libwebp/Module_libwebp.mk|   17 
 external/libwebp/README   |1 
 external/libwebp/UnpackedTarball_libwebp.mk   |   20 
 filter/Configuration_filter.mk|   13 
 filter/qa/complex/filter/detection/typeDetection/files.csv|1 
 filter/source/config/cache/typedetection.cxx  |1 
 filter/source/config/fragments/filters/WEBP___WebP.xcu|   30 
 filter/source/config/fragments/filters/calc_webp_Export.xcu   |   20 
 filter/source/config/fragments/filters/draw_webp_Export.xcu   |   30 
 filter/source/config/fragments/filters/impress_webp_Export.xcu|   30 
 filter/source/config/fragments/filters/writer_web_webp_Export.xcu |   21 
 filter/source/config/fragments/filters/writer_webp_Export.xcu |   30 
 filter/source/config/fragments/internalgraphicfilters/webp_Export.xcu |   27 
 filter/source/config/fragments/internalgraphicfilters/webp_Import.xcu |   27 
 filter/source/config/fragments/types/webp_WebP.xcu|   29 
 icon-themes/breeze/res/sx03223.png|binary
 icon-themes/breeze_dark/res/sx03223.png   |binary
 icon-themes/breeze_dark_svg/res/sx03223.svg   |1 
 icon-themes/breeze_svg/res/sx03223.svg|1 
 include/sal/log-areas.dox |1 
 include/svl/inettype.hxx  |2 
 include/svtools/imagemgr.hxx  |1 
 include/svx/strings.hrc   |1 
 include/vcl/gfxlink.hxx   |5 
 include/vcl/graphicfilter.hxx |6 
 include/vcl/salctype.hxx  |3 
 readlicense_oo/license/license.xml|   31 
 scp2/source/draw/registryitem_draw.scp|1 
 solenv/sanitizers/ui/svt.suppr|2 
 svtools/inc/bitmaps.hlst  |2 
 svtools/source/filter/exportdialog.cxx|   53 +
 svtools/source/filter/exportdialog.hxx|9 
 svtools/source/misc/imagemgr.cxx  |5 
 svtools/uiconfig/ui/graphicexport.ui  |   36 -
 svx/source/core/graphichelper.cxx |6 
 svx/source/gallery2/galtheme.cxx  |1 
 svx/source/xml/xmlgrhlp.cxx   |1 
 svx/source/xoutdev/_xoutbmp.cxx   |2 
 vcl/CppunitTest_vcl_filters_test.mk   |1 
 vcl/Executable_webpfuzzer.mk  |   45 +
 vcl/Library_vcl.mk|3 
 vcl/Module_vcl.mk |1 
 vcl/inc/filter/WebpReader.hxx |   28 
 vcl/inc/filter/WebpWriter.hxx |   29 
 vcl/inc/graphic/GraphicFormatDetector.hxx |1 
 vcl/inc/graphic/UnoGraphicDescriptor.hxx  |1 
 vcl/qa/cppunit/GraphicDescriptorTest.cxx  |   16 
 vcl/qa/cppunit/GraphicFormatDetectorTest.cxx  |   17 
 vcl/qa/cppunit/GraphicTest.cxx|   12 
 vcl/qa/cppunit/data/TypeDetectionExample.webp |binary
 vcl/qa/cppunit/graphicfilter/data/webp/alpha_lossless.webp|binary
 vcl/qa/cppunit/graphicfilter/data/webp/alpha_lossy.webp   |binary
 vcl/qa/cppunit/graphicfilter/data/webp/noalpha_lossless.webp  |binary

[Libreoffice-commits] core.git: bin/lo-all-static-libs bin/oss-fuzz-setup.sh config_host.mk.in configure.ac download.lst external/libjpeg-turbo RepositoryExternal.mk solenv/bin solenv/gbuild

2021-10-30 Thread Caolán McNamara (via logerrit) 
 RepositoryExternal.mk   |   10 
 bin/lo-all-static-libs  |1 
 bin/oss-fuzz-setup.sh   |2 
 config_host.mk.in   |2 
 configure.ac|   34 +-
 download.lst|4 
 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk |   43 ---
 external/libjpeg-turbo/Module_libjpeg-turbo.mk  |2 
 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk   |  214 
 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk |   13 
 external/libjpeg-turbo/jconfig.h|   86 ++
 external/libjpeg-turbo/jconfigint.h |   51 +++
 external/libjpeg-turbo/jpeg-turbo.build.patch.1 |   58 
 external/libjpeg-turbo/jpeg-turbo.win_build.patch.1 |   54 
 external/libjpeg-turbo/ubsan.patch  |   39 --
 solenv/bin/concat-deps.c|5 
 solenv/gbuild/LinkTarget.mk |   77 +
 solenv/gbuild/StaticLibrary.mk  |2 
 solenv/gbuild/TargetLocations.mk|3 
 solenv/gbuild/platform/android.mk   |1 
 solenv/gbuild/platform/com_MSC_class.mk |1 
 solenv/gbuild/platform/iOS.mk   |2 
 solenv/gbuild/platform/macosx.mk|2 
 solenv/gbuild/platform/solaris.mk   |2 
 solenv/gbuild/platform/unxgcc.mk|2 
 25 files changed, 482 insertions(+), 228 deletions(-)

New commits:
commit 1295f497e0cc7fc7cfcb66182496a4d29aa701b3
Author: Caolán McNamara 
AuthorDate: Wed Oct 20 16:07:29 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 30 11:06:48 2021 +0200

upgrade libjpeg-turbo to 2.1.1

simd enabled for x86_64 and x86, arm/aarch64 might be worth exploring
too

Change-Id: Ic2726ee8c6b6e59ca983b977ee2731f5b78b97d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123898
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 951267d0e624..23d4b2e63637 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -402,6 +402,10 @@ endif # SYSTEM_ZLIB
 ifneq ($(SYSTEM_LIBJPEG),)
 
 define gb_LinkTarget__use_libjpeg
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(LIBJPEG_CFLAGS) \
+)
 $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
 $(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
@@ -414,12 +418,12 @@ gb_ExternalProject__use_libjpeg :=
 else
 
 define gb_LinkTarget__use_libjpeg
+$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
 $(call gb_LinkTarget_set_include,$(1),\
-   $(LIBJPEG_CFLAGS) \
+   -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
-$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
+$(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo)
 
 endef
 
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index d89dd8eca296..11230c695248 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -111,7 +111,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
  $oslibs \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
- $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
  $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index 39ff8a8d8d5b..22c9ef2b7e49 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -21,7 +21,7 @@ curl --no-progress-meter -S \
 -C - -O https://dev-www.libreoffice.org/src/dtoa-20180411.tgz \
 -C - -O https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2 \
 -C - -O 
https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
 \
--C - -O https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz \
+-C - -O https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz \
 -C - -O https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz \
 -C - -O https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz \
 -C - -O https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz \
diff --git a/config_host.mk.in b/config_host.mk.in
index 3970cb6a61c9..4b4f58f80fc2 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -452,6 +452,7 @@ export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
 export NASM=@NASM@
+export NAFLAGS=@NAFLAGS@

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac external/curl external/Module_external.mk external/nss svl/Library_svl.mk xmlsecurity/source

2020-09-22 Thread Tor Lillqvist (via logerrit) 
 bin/lo-all-static-libs   |   41 
 configure.ac |6 
 external/Module_external.mk  |2 
 external/curl/UnpackedTarball_curl.mk|1 
 external/curl/curl-ios.patch.1   |   17 +
 external/nss/ExternalProject_nss.mk  |8 
 external/nss/nss-ios.patch   |  212 +--
 svl/Library_svl.mk   |4 
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |8 
 9 files changed, 275 insertions(+), 24 deletions(-)

New commits:
commit 808e8a8e9e96b6c3fac3ddf291e3900a40846409
Author: Tor Lillqvist 
AuthorDate: Fri Sep 18 12:23:44 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 23 07:47:55 2020 +0200

tdf#128136: Build curl, nss, and xmlsec for iOS, too

We must link nss statically, including the three dylibs that normally
are loaded at run-time, because including bare dylibs in an iOS appp
on the App Store is not OK. See
https://developer.apple.com/forums/thread/125796 .

For linking the softokn3 library statically, NSS already had code,
behind NSS_STATIC_SOFTOKEN ifdefs. Introduce two more macros:
NSS_STATIC_FREEBL for the freebl library and NSS_STATIC_PKCS11 for the
nssckbi library.

Turn off parallelism for the sub-make building nss. There seems to be
race conditions or something when running simultaneous instances of
the nsinstall.py script or the nsinstall program in nss (used when
building nss for the build platform).

When cross-compiling from macOS, use python3 to run the nsinstall.py
script, as it is Python 3.

Change-Id: Idd427b5ebf21f802b3feb0d5a3d259317ba8fc67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103106
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103218
Tested-by: Jenkins

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 0fcea02eb53e..d89dd8eca296 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -59,6 +59,47 @@ ANDROID)
 iOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/cppunit/src/cppunit/.libs/*.a"
+
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/lib/ds/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/lib/libc/src/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nspr/out/pr/src/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/base/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/certdb/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/certhigh/out/*.a"
+
+   # Yes, individual object files here, these are not in any .a
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/builtins/out/*.o"
+
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/ckfw/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/cryptohi/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/dev/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/*.o"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/freebl/out/Darwin_SINGLE_SHLIB/deprecated/*.o"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/certsel/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/checker/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/crlsel/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/params/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/results/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/store/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/top/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix/util/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/module/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/pki/out/*.a"
+   oslibs="$oslibs 
$WORKDIR/UnpackedTarball/nss/nss/lib/libpkix/pkix_pl_nss/system/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/nss/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pk11wrap/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pkcs12/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pkcs7/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/pki/out/*.a"
+   oslibs="$oslibs $WORKDIR/UnpackedTarball/nss/nss/lib/smime/out/*.a"
+   oslibs="$oslibs

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2020-04-14 Thread Tor Lillqvist (via logerrit) 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f0734854fe9e25c90bcaf924fb53bd950ed4f2c8
Author: Tor Lillqvist 
AuthorDate: Mon Apr 13 19:13:22 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Apr 14 08:14:52 2020 +0200

Add libepubgen

Change-Id: I2c3d19dff2da99b030f6a7e1a8b62be509e073da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92118
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92132
Tested-by: Jenkins

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 04d76cbe9a96..0fcea02eb53e 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -75,6 +75,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libepubgen/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libexttextcat/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2019-10-07 Thread Tor Lillqvist (via logerrit) 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cce10f9a7d2b32d40bdee58220d10edab07de416
Author: Tor Lillqvist 
AuthorDate: Tue Aug 13 12:21:17 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 7 14:47:14 2019 +0300

Add libexttextcat, needed by the guesslang component

Change-Id: Id13ddee66a70d8cd293940f7eea8597257d169c5
Reviewed-on: https://gerrit.libreoffice.org/77398
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit aa0b785946ba39bbce419a6b356a7ce07349501c)

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index e9b83bcd71a4..04d76cbe9a96 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -75,6 +75,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libexttextcat/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libodfgen/src/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs bin/update_pch bridges/Library_cpp_uno.mk chart2/Module_chart2.mk configure.ac connectivity/Module_connectivity.mk dbaccess/Module_dbaccess.mk de

2018-11-01 Thread Libreoffice Gerrit user 
 Makefile.in |8 
 Repository.mk   |6 +++---
 bin/lo-all-static-libs  |4 ++--
 bin/update_pch  |6 +++---
 bridges/Library_cpp_uno.mk  |4 ++--
 chart2/Module_chart2.mk |2 +-
 configure.ac|4 ++--
 connectivity/Module_connectivity.mk |2 +-
 dbaccess/Module_dbaccess.mk |2 +-
 desktop/Library_sofficeapp.mk   |6 +++---
 desktop/Module_desktop.mk   |2 +-
 extensions/Module_extensions.mk |2 +-
 external/Module_external.mk |2 +-
 external/cairo/ExternalProject_cairo.mk |   12 ++--
 external/cairo/UnpackedTarball_cairo.mk |4 ++--
 external/cppunit/ExternalProject_cppunit.mk |2 +-
 external/curl/ExternalProject_curl.mk   |2 +-
 external/epoxy/Library_epoxy.mk |2 +-
 external/harfbuzz/ExternalProject_harfbuzz.mk   |2 +-
 external/hunspell/ExternalProject_hunspell.mk   |4 ++--
 external/hyphen/ExternalProject_hyphen.mk   |2 +-
 external/icu/ExternalProject_icu.mk |6 +++---
 external/libnumbertext/ExternalProject_libnumbertext.mk |4 ++--
 external/liborcus/ExternalProject_liborcus.mk   |2 +-
 external/libwps/ExternalProject_libwps.mk   |2 +-
 external/libxslt/ExternalProject_libxslt.mk |2 +-
 external/nss/ExternalPackage_nss.mk |2 +-
 external/nss/ExternalProject_nss.mk |4 ++--
 external/nss/UnpackedTarball_nss.mk |2 +-
 external/openssl/ExternalProject_openssl.mk |6 +++---
 external/redland/ExternalProject_raptor.mk  |2 +-
 external/xmlsec/ExternalProject_xmlsec.mk   |2 +-
 i18npool/CustomTarget_breakiterator.mk  |2 +-
 i18npool/Executable_gendict.mk  |2 +-
 i18npool/Module_i18npool.mk |2 +-
 ios/Module_ios.mk   |2 +-
 oox/Library_oox.mk  |2 +-
 postprocess/Rdb_services.mk |2 +-
 registry/Module_registry.mk |4 ++--
 sal/Library_sal.mk  |8 
 salhelper/Module_salhelper.mk   |2 +-
 sc/Module_sc.mk |4 ++--
 solenv/gbuild/LinkTarget.mk |2 +-
 solenv/gbuild/gbuild.mk |   13 +
 solenv/gbuild/platform/iOS.mk   |2 +-
 sw/Module_sw.mk |2 +-
 toolkit/Library_tk.mk   |2 +-
 vcl/Library_vcl.mk  |6 +++---
 vcl/Module_vcl.mk   |2 +-
 vcl/StaticLibrary_vclmain.mk|2 +-
 50 files changed, 82 insertions(+), 93 deletions(-)

New commits:
commit a626bdd56d7116efa57e65403ad51b56657148c3
Author: Michael Stahl 
AuthorDate: Wed Oct 31 19:06:30 2018 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 16:39:54 2018 +0100

gbuild: rename value OS=IOS to OS=iOS

This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.

Keep the macro defined to IOS though.

Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index a18121d200ca..393e94fda331 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,7 +178,7 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
-ifeq ($(OS),IOS)
+ifeq ($(OS),iOS)
rm -fr $(SRCDIR)/ios/generated
 endif
 
@@ -284,7 +284,7 @@ build: bootstrap fetch $(if 
$(CROSS_COMPILING),cross-toolset) \
 $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if 
$(LODE_HOME),clang-format-check))) \
 install-gdb-printers
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(build_goal)
-ifeq ($(OS),IOS)
+ifeq ($(OS),iOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
 endif

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac external/cppunit vcl/source

2018-09-27 Thread Libreoffice Gerrit user 
 bin/lo-all-static-libs  |1 
 configure.ac|2 
 external/cppunit/UnpackedTarball_cppunit.mk |2 
 vcl/source/app/svmain.cxx   |   83 
 4 files changed, 4 insertions(+), 84 deletions(-)

New commits:
commit 999a9c183c395a36fbaf35468ace11a625a581f7
Author: Tor Lillqvist 
AuthorDate: Thu Sep 27 17:53:04 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Sep 27 21:05:27 2018 +0200

Do build cppunit for iOS, too

I am writing a separate unit test app that will include selected
existing unit tests that make sense and are important to run on iOS.

Change-Id: I4722f1ed872ba21e181eeba5ed3b58e82d8fed72
Reviewed-on: https://gerrit.libreoffice.org/61049
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 2e620ff2a494..738bc58d81fe 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -58,6 +58,7 @@ ANDROID)
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/cppunit/src/cppunit/.libs/*.a"
 ;;
 *)
 oslibs=
diff --git a/configure.ac b/configure.ac
index ec9d8b34d416..86eef4c0c32a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8028,7 +8028,7 @@ fi
 dnl ===
 dnl Check for system cppunit
 dnl ===
-if test "$cross_compiling" != "yes"; then
+if test "$_os" != "Android" ; then
 libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.14.0])
 fi
 
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index dc0adf73bd07..053a6020cd4f 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,cppunit))
+
 # gcc9.patch.0 addressed upstream with  
"Avoid GCC 9
 #  -Wdeprecated-copy":
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index c9f3f056f7e9..0b49311a2051 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -181,85 +181,6 @@ static oslSignalAction VCLExceptionSignal_impl( void* 
/*pData*/, oslSignalInfo*
 
 }
 
-#ifdef IOS
-
-#include 
-#include 
-
-// Swiped from cppuhelper/qa/misc/test_misc.cxx. Ideally we should
-// have a unit test app for iOS that would somehow include relevant
-// unit tests from source files all over the place.
-
-static void testExceptions()
-{
-css::uno::Any aSavedExceptionAny;
-std::exception_ptr
-aSavedException; /// exception caught during unzipping is saved to be 
thrown during reading
-try
-{
-throw css::uno::RuntimeException("RuntimeException");
-}
-catch (...)
-{
-aSavedException = std::current_exception();
-}
-assert(bool(aSavedException));
-try
-{
-std::rethrow_exception(aSavedException);
-}
-catch (const css::uno::RuntimeException&)
-{
-// the expected case
-aSavedExceptionAny = cppu::getCaughtException();
-}
-catch (...)
-{
-assert(false);
-}
-assert(aSavedExceptionAny.hasValue());
-
-try
-{
-throw css::ucb::InteractiveAugmentedIOException();
-}
-catch (const css::ucb::InteractiveAugmentedIOException&)
-{
-aSavedExceptionAny = cppu::getCaughtException();
-}
-catch (const css::uno::Exception&)
-{
-assert(false);
-}
-catch (...)
-{
-assert(false);
-}
-assert(aSavedExceptionAny.hasValue());
-
-try
-{
-css::ucb::InteractiveAugmentedIOException iaie;
-css::uno::Any aEx = css::uno::makeAny(iaie);
-// css::uno::Exception e;
-// css::uno::Any aEx = css::uno::makeAny(e);
-cppu::throwException(aEx);
-}
-catch (const css::ucb::InteractiveAugmentedIOException&)
-{
-}
-catch (const css::uno::Exception& e)
-{
-assert(false);
-}
-catch (...)
-{
-assert(false);
-}
-}
-
-#endif
-
 int ImplSVMain()
 {
 // The 'real' SVMain()
@@ -271,10 +192,6 @@ int ImplSVMain()
 
 bool bInit = isInitVCL() || InitVCL();
 
-#ifdef IOS
-testExceptions();
-#endif
-
 if( bInit )
 {
 // call application main
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2017-10-13 Thread Christian Lohmaier 
 bin/lo-all-static-libs |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit dbc03a7ea22f0540e04facd7b764251954000847
Author: Christian Lohmaier 
Date:   Thu Oct 12 15:48:25 2017 +0200

fix oslibs syntax (have the shell treat it as variable, not command)

Change-Id: I75a4e1b2a9956d32e2ae4412d9f808a3b39ec855

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 97c5508c741d..2e620ff2a494 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -48,13 +48,13 @@ ANDROID)
 oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a"
 
 # coinmp not used for iOS
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a"
-oslibs = "$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a"
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs external/libxslt RepositoryExternal.mk

2017-09-15 Thread Michael Stahl 
 RepositoryExternal.mk   |   22 +--
 bin/lo-all-static-libs  |2 -
 external/libxslt/ExternalPackage_libxslt.mk |   32 
 external/libxslt/ExternalPackage_xslt.mk|   32 
 external/libxslt/ExternalProject_libxslt.mk |   12 +-
 external/libxslt/Module_libxslt.mk  |6 ++---
 external/libxslt/UnpackedTarball_libxslt.mk |6 ++---
 external/libxslt/libxslt-config.patch.1 |8 +++
 8 files changed, 60 insertions(+), 60 deletions(-)

New commits:
commit 15b973ed64cb0c655b387c5022fc2ff0894520dd
Author: Michael Stahl 
Date:   Thu Sep 14 15:26:10 2017 +0200

consistent naming of externals: xslt -> libxslt

Change-Id: Ie66848187cef395d8b0af4727a4d9c0919e3c9dc
Reviewed-on: https://gerrit.libreoffice.org/42299
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4b90a1e2d979..55508304f8d1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -877,42 +877,42 @@ endef
 else # !SYSTEM_LIBXSLT
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   xslt \
+   libxslt \
 ))
 
 define gb_LinkTarget__use_libxslt
-$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_use_package,$(1),libxslt)
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-   -I$(call gb_UnpackedTarball_get_dir,xslt) \
+   -I$(call gb_UnpackedTarball_get_dir,libxslt) \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libxslt.lib \
+   $(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libxslt.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,xslt)/libxslt/.libs -lxslt \
+   -L$(call gb_UnpackedTarball_get_dir,libxslt)/libxslt/.libs -lxslt \
 )
 endif
 
 endef
 
 define gb_LinkTarget__use_libexslt
-$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_use_package,$(1),libxslt)
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-   -I$(call gb_UnpackedTarball_get_dir,xslt) \
+   -I$(call gb_UnpackedTarball_get_dir,libxslt) \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libexslt.lib \
+   $(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libexslt.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,xslt)/libexslt/.libs -lexslt \
+   -L$(call gb_UnpackedTarball_get_dir,libxslt)/libexslt/.libs -lexslt \
 )
 endif
 
@@ -3925,11 +3925,11 @@ gb_ExternalExecutable__register_xsltproc :=
 else # ! SYSTEM_LIBXSLT_FOR_BUILD
 
 define gb_ExternalExecutable__register_xsltproc
-$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
+$(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),libxslt)
 $(call gb_ExternalExecutable_add_dependencies,xsltproc,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
$(call gb_Package_get_target,libxml2) \
-   $(call gb_Package_get_target,xslt) \
+   $(call gb_Package_get_target,libxslt) \
 )
 
 endef
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 1a2f94214c48..310c432fc0a6 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -82,4 +82,4 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libxml2/.libs/*.a \
- $WORKDIR/UnpackedTarball/xslt/libxslt/.libs/*.a
+ $WORKDIR/UnpackedTarball/libxslt/libxslt/.libs/*.a
diff --git a/external/libxslt/ExternalPackage_libxslt.mk 
b/external/libxslt/ExternalPackage_libxslt.mk
new file mode 100644
index ..01c88e6f562f
--- /dev/null
+++ b/external/libxslt/ExternalPackage_libxslt.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libxslt,libxslt))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libxslt,libxslt))
+
+ifneq ($(DISABLE_DYNLOADING),TRUE)
+ifeq ($(OS),MACOSX)
+$(eval $(call 
gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
+$(eval $(call

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac external/liblangtag external/libxml2 external/libxmlsec external/libxslt external/redland RepositoryExternal.mk

2017-09-15 Thread Michael Stahl 
 RepositoryExternal.mk |   12 -
 bin/lo-all-static-libs|2 -
 configure.ac  |6 ++--
 external/liblangtag/ExternalProject_liblangtag.mk |2 -
 external/libxml2/ExternalPackage_libxml2.mk   |   28 ++
 external/libxml2/ExternalPackage_xml2.mk  |   28 --
 external/libxml2/ExternalProject_libxml2.mk   |   10 +++
 external/libxml2/Module_libxml2.mk|6 ++--
 external/libxml2/UnpackedTarball_libxml2.mk   |6 ++--
 external/libxml2/libxml2-config.patch.1   |8 +++---
 external/libxmlsec/ExternalProject_xmlsec.mk  |2 -
 external/libxmlsec/xmlsec1-vc.patch.1 |2 -
 external/libxslt/ExternalProject_xslt.mk  |4 +--
 external/libxslt/libxslt-msvc.patch.2 |2 -
 external/redland/ExternalProject_raptor.mk|2 -
 external/redland/ExternalProject_rasqal.mk|2 -
 16 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit 84b0f0631574832c5939cc63456fd1322e67339f
Author: Michael Stahl 
Date:   Thu Sep 14 14:54:07 2017 +0200

consistent naming of externals: xml2 -> libxml2

Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d
Reviewed-on: https://gerrit.libreoffice.org/42297
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 22dcc802aeaa..4b90a1e2d979 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -822,11 +822,11 @@ gb_ExternalProject__use_libxml2:=
 else # !SYSTEM_LIBXML
 
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
-   xml2 \
+   libxml2 \
 ))
 
 define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_use_package,$(1),xml2)
+$(call gb_LinkTarget_use_package,$(1),libxml2)
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBXML_CFLAGS) \
@@ -842,7 +842,7 @@ endif
 
 endef
 define gb_ExternalProject__use_libxml2
-$(call gb_ExternalProject_use_package,$(1),xml2)
+$(call gb_ExternalProject_use_package,$(1),libxml2)
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_use_external_project,$(1),icu)
@@ -3908,10 +3908,10 @@ gb_ExternalExecutable__register_xmllint :=
 else # ! SYSTEM_LIBXML_FOR_BUILD
 
 define gb_ExternalExecutable__register_xmllint
-$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2)
+$(call 
gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxml2/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),libxml2)
 $(call gb_ExternalExecutable_add_dependencies,xmllint,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
-   $(call gb_Package_get_target,xml2) \
+   $(call gb_Package_get_target,libxml2) \
 )
 
 endef
@@ -3928,7 +3928,7 @@ define gb_ExternalExecutable__register_xsltproc
 $(call 
gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if
 $(filter 
MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
 $(call gb_ExternalExecutable_add_dependencies,xsltproc,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
-   $(call gb_Package_get_target,xml2) \
+   $(call gb_Package_get_target,libxml2) \
$(call gb_Package_get_target,xslt) \
 )
 
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 4efe49e5e4a3..1a2f94214c48 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -81,5 +81,5 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
- $WORKDIR/UnpackedTarball/xml2/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libxml2/.libs/*.a \
  $WORKDIR/UnpackedTarball/xslt/libxslt/.libs/*.a
diff --git a/configure.ac b/configure.ac
index e5132ec4c034..4c84aa0a008e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7907,14 +7907,14 @@ if test "$with_system_libxml" = "yes"; then
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXML=
-LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/xml2/include"
+LIBXML_CFLAGS="-I${WORKDIR}/UnpackedTarball/libxml2/include"
 if test "$COM" = "MSC"; then
 LIBXML_CFLAGS="${LIBXML_CFLAGS} 
-I${WORKDIR}/UnpackedTarball/icu/source/i18n 
-I${WORKDIR}/UnpackedTarball/icu/source/common"
 fi
 if test "$COM" = "MSC"; then
-
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/xml2/win32/bin.msvc/libxml2.lib"
+
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
 else
-LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/xml2/.libs -lxml2"
+

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac external/liblangtag RepositoryExternal.mk

2017-09-15 Thread Michael Stahl 
 RepositoryExternal.mk  |4 ++--
 bin/lo-all-static-libs |2 +-
 configure.ac   |6 +++---
 external/liblangtag/ExternalPackage_liblangtag.mk  |4 ++--
 external/liblangtag/ExternalPackage_liblangtag_data.mk |4 ++--
 external/liblangtag/ExternalProject_liblangtag.mk  |   12 ++--
 external/liblangtag/Module_liblangtag.mk   |4 ++--
 external/liblangtag/UnpackedTarball_liblangtag.mk  |   10 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 0bb764854361249c60ea31c5366a91dcd938c747
Author: Michael Stahl 
Date:   Thu Sep 14 12:20:31 2017 +0200

consistent naming of externals: langtag -> liblangtag

Change-Id: Iba391f4f0e3c496442b8acaff443319fcb8fb3d7
Reviewed-on: https://gerrit.libreoffice.org/42294
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7505c709c51b..fa8e6845e1ef 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -977,7 +977,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
-$(call gb_LinkTarget_use_external_project,$(1),langtag)
+$(call gb_LinkTarget_use_external_project,$(1),liblangtag)
 
 endef
 
@@ -1000,7 +1000,7 @@ endef
 endif # MSC
 
 define gb_ExternalProject__use_liblangtag
-$(call gb_ExternalProject_use_external_project,$(1),langtag)
+$(call gb_ExternalProject_use_external_project,$(1),liblangtag)
 
 endef
 
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index f2bf5f647eb3..4efe49e5e4a3 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -68,7 +68,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
  $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
- $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
+ $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
diff --git a/configure.ac b/configure.ac
index 614896089908..56985d8083ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11251,11 +11251,11 @@ else
 SYSTEM_LIBLANGTAG=
 AC_MSG_RESULT([no])
 BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
-LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag"
+LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/liblangtag"
 if test "$COM" = "MSC"; then
-
LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
+
LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/liblangtag/liblangtag/.libs/liblangtag.lib"
 else
-LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs 
-llangtag"
+
LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/liblangtag/liblangtag/.libs 
-llangtag"
 fi
 fi
 AC_SUBST(SYSTEM_LIBLANGTAG)
diff --git a/external/liblangtag/ExternalPackage_liblangtag.mk 
b/external/liblangtag/ExternalPackage_liblangtag.mk
index 6b3eac1ad6fc..549f5eb36aed 100644
--- a/external/liblangtag/ExternalPackage_liblangtag.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag,langtag))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag,liblangtag))
 
-$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,langtag))
+$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,liblangtag))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))
diff --git a/external/liblangtag/ExternalPackage_liblangtag_data.mk 
b/external/liblangtag/ExternalPackage_liblangtag_data.mk
index c879bd2dd1d6..fee94a1b544e 100644
--- a/external/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,liblangtag))
 
-$(eval $(call gb_ExternalPackage_use_external_project,liblangtag_data,langtag))
+$(eval $(call 
gb_ExternalPackage_use_external_project,liblangtag_data,liblangtag))
 
 $(eval $(call 
gb_ExternalPackage_add_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
data/language-subtag-registry.xml \
diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_liblangtag.mk
similarity index 84%
rename from

[Libreoffice-commits] core.git: bin/lo-all-static-libs config_host.mk.in configure.ac download.lst emfio/CppunitTest_emfio_wmf_test.mk external/jpeg-turbo external/libjpeg-turbo external/Module_extern

2017-09-15 Thread Michael Stahl 
 Makefile.fetch  |2 -
 RepositoryExternal.mk   |   18 ++--
 bin/lo-all-static-libs  |2 -
 config_host.mk.in   |2 -
 configure.ac|   18 ++--
 download.lst|4 +-
 emfio/CppunitTest_emfio_wmf_test.mk |2 -
 external/Module_external.mk |2 -
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk   |   23 
 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk |   12 
 external/libjpeg-turbo/Module_libjpeg-turbo.mk  |8 ++---
 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk |   23 
 external/pdfium/Library_pdfium.mk   |2 -
 external/poppler/ExternalProject_poppler.mk |2 -
 solenv/gbuild/gbuild.mk |2 -
 vcl/Library_vcl.mk  |2 -
 vcl/commonfuzzer.mk |2 -
 17 files changed, 63 insertions(+), 63 deletions(-)

New commits:
commit 77d297f3e8ff4af58718d166dcbf23c39ce47ca3
Author: Michael Stahl 
Date:   Wed Sep 13 22:50:14 2017 +0200

consistent naming of externals: jpeg-turbo->libjpeg-turbo

Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257
Reviewed-on: https://gerrit.libreoffice.org/42291
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Makefile.fetch b/Makefile.fetch
index 9194164be33f..35946e0ffde8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -148,7 +148,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,JFREEREPORT,JFREEREPORT_LIBSERIALIZER_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
-   $(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
+   $(call fetch_Optional,LIBJPEG_TURBO,LIBJPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2db2ebfb3d81..2e5d5556b9e9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -376,9 +376,9 @@ endef
 endif # SYSTEM_ZLIB
 
 
-ifneq ($(SYSTEM_JPEG),)
+ifneq ($(SYSTEM_LIBJPEG),)
 
-define gb_LinkTarget__use_jpeg
+define gb_LinkTarget__use_libjpeg
 $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
 $(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
@@ -386,26 +386,26 @@ $(call gb_LinkTarget_set_ldflags,$(1),\
 
 endef
 
-gb_ExternalProject__use_jpeg :=
+gb_ExternalProject__use_libjpeg :=
 
 else
 
-define gb_LinkTarget__use_jpeg
+define gb_LinkTarget__use_libjpeg
 $(call gb_LinkTarget_set_include,$(1),\
$(LIBJPEG_CFLAGS) \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
-$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full)
+$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
 
 endef
 
-define gb_ExternalProject__use_jpeg
-$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo)
+define gb_ExternalProject__use_libjpeg
+$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo)
 
 endef
 
-endif # SYSTEM_JPEG
+endif # SYSTEM_LIBJPEG
 
 ifneq ($(SYSTEM_MYTHES),)
 
@@ -2777,7 +2777,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
-$(call gb_LinkTarget_use_external,$(1),jpeg)
+$(call gb_LinkTarget_use_external,$(1),libjpeg)
 
 ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 6c1908628183..f2bf5f647eb3 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -67,7 +67,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
- $WORKDIR/UnpackedTarball/jpeg-turbo/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
  $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
diff --git a/config_host.mk.in b/config_host.mk.in
index 08385695f0f9..187cdf45a861 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -518,7 +518,7 @@ export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
 export

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac

2017-06-11 Thread jan Iversen 
 bin/lo-all-static-libs |3 -
 configure.ac   |   81 -
 2 files changed, 41 insertions(+), 43 deletions(-)

New commits:
commit 089ff7a374df9870c506c36720a1b9cab3a252f6
Author: jan Iversen 
Date:   Mon Jun 12 07:47:25 2017 +0200

Android tinderbox build breaker

add openssl library back for Android static link

Change-Id: I7ac5c3f9c00060f926f03fb21d8fa5e87b928c71

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 381090a036ec..555ad67674a7 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -43,10 +43,10 @@ ANDROID)
 oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a"
 # Only liblo-bootstrap.a ends up here:
 oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a"
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
-osssl=""
 ;;
 *)
 oslibs=
@@ -76,7 +76,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \
  $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \
- $osssl \
  $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
diff --git a/configure.ac b/configure.ac
index 4a96e9370c7e..24df1493171d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,7 +719,7 @@ darwin*) # Mac OS X or iOS
 test_freetype=no
 test_fontconfig=no
 test_dbus=no
-if test "$host_cpu" = "armv7" -o "$host_cpu" = "arm64"; then
+if test "$host_cpu" = "arm"; then
 _os=iOS
 test_gtk=no
 test_cups=no
@@ -1373,7 +1373,7 @@ AC_ARG_ENABLE(ccache,
 AC_ARG_ENABLE(64-bit,
 AS_HELP_STRING([--enable-64-bit],
 [Build a 64-bit LibreOffice on platforms where the normal build is 
32-bit.
- At the moment meaningful only for Windows.]), ,)
+ At the moment meaningful only for iOS and Windows.]), ,)
 
 libo_FUZZ_ARG_ENABLE(online-update,
 AS_HELP_STRING([--enable-online-update],
@@ -1445,6 +1445,11 @@ AC_ARG_WITH(package-version,
 [Define the package version. Default is AC_PACKAGE_VERSION. Use only 
if you distribute an own build for macOS.]),
 ,)
 
+AC_ARG_ENABLE(ios-simulator,
+AS_HELP_STRING([--enable-ios-simulator],
+[Build for the iOS Simulator, not iOS device.]),
+,)
+
 libo_FUZZ_ARG_ENABLE(readonly-installset,
 AS_HELP_STRING([--enable-readonly-installset],
 [Prevents any attempts by LibreOffice to write into its installation. 
That means
@@ -1572,7 +1577,7 @@ AC_ARG_WITH(galleries,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme="theme1 theme2..."],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *breeze, *breeze_dark, crystal, *galaxy, 
*hicontrast, oxygen, *sifr, *sifr_dark, *tango, *tango_testing.]),
+ Possible choices: *breeze, *breeze_dark, crystal, *galaxy, 
*hicontrast, oxygen, *sifr, *tango, *tango_testing.]),
 ,)
 
 libo_FUZZ_ARG_WITH(helppack-integration,
@@ -2951,24 +2956,19 @@ dnl Check iOS SDK and compiler
 dnl ===
 
 if test $_os = iOS; then
-if test "$host_cpu" = "arm64"; then
+
+if test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then
+:
+else
 BITNESS_OVERRIDE=64
 fi
 
 AC_MSG_CHECKING([what iOS SDK to use])
 
-if test "$build_cpu" = "i386"; then
-platform=iPhoneSimulator
-XCODE_ARCHS=i386
-versionmin=-mios-simulator-version-min=9.3
-elif test "$build_cpu" = "x86_64"; then
+if test "$enable_ios_simulator" = yes; then
 platform=iPhoneSimulator
-XCODE_ARCHS=x86_64
-versionmin=-mios-simulator-version-min=9.3
 else
 platform=iPhoneOS
-XCODE_ARCHS=$host_cpu
-versionmin=-miphoneos-version-min=9.3
 fi
 
 xcode_developer=`xcode-select -print-path`
@@ -2991,6 +2991,24 @@ if test $_os = iOS; then
 
 XCODEBUILD_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
 
+if test "$enable_ios_simulator" = yes; then
+if test "$BITNESS_OVERRIDE" = 64; then
+XCODE_ARCHS=x86_64
+versionmin=-mios-simulator-version-min=9.3
+else
+XCODE_ARCHS=i386
+versionmin=-mios-simulator-version-min=9.3
+fi
+else
+platform=iPhoneOS
+if test "$BITNESS_OVERRIDE" = 64; then
+XCODE_ARCHS=arm64
+else
+XCODE_ARCHS=armv7
+fi
+versionmin=-miphoneos-version-min=9.3
+fi
+
 # LTO is not really recommended for iOS builds,
 # the link time will be astronomical
 if test "$ENABLE_LTO" = TRUE; then
@@ -4569,6 +4587,10 @@ dnl Check for syslog header
 dnl

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2017-06-11 Thread jan Iversen 
 bin/lo-all-static-libs |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 27a8afdf93a86ec18f794362ac8329d0b5eb8a1f
Author: jan Iversen 
Date:   Sun Jun 11 13:51:01 2017 +0200

undo touch of ANDROID build

tinderbox had a problem with android build due to test message
removed

Change-Id: I2ab101dd037257be16eb2771f65e78794bad4489

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index c45723f938cd..381090a036ec 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -43,7 +43,6 @@ ANDROID)
 oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a"
 # Only liblo-bootstrap.a ends up here:
 oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
-osssl="$WORKDIR/UnpackedTarball/HEJ($TLS)(${DISABLE-OPENSSL})openssl/*.a"
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs comphelper/source oox/source

2017-06-11 Thread jan Iversen 
 bin/lo-all-static-libs   |4 +++-
 comphelper/source/misc/hash.cxx  |5 +
 oox/source/crypto/CryptTools.cxx |   24 
 3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 2a48fd3fbb649218f66a58e70ad904411883c63d
Author: jan Iversen 
Date:   Fri Jun 9 12:59:19 2017 +0200

allow build without tls and ssl

support for using
--disable-openssl AND --without-tls

(needed if you want to avoid including crypto code).

Change-Id: I77650e9db679ddf1690560eda069d8645acacfc4
Reviewed-on: https://gerrit.libreoffice.org/38604
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 47640feaa392..c45723f938cd 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -43,9 +43,11 @@ ANDROID)
 oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a"
 # Only liblo-bootstrap.a ends up here:
 oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
+osssl="$WORKDIR/UnpackedTarball/HEJ($TLS)(${DISABLE-OPENSSL})openssl/*.a"
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
+osssl=""
 ;;
 *)
 oslibs=
@@ -75,7 +77,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \
  $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \
- $WORKDIR/UnpackedTarball/openssl/*.a \
+ $osssl \
  $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
diff --git a/comphelper/source/misc/hash.cxx b/comphelper/source/misc/hash.cxx
index 5e250f1ed0d3..8da77a792e6a 100644
--- a/comphelper/source/misc/hash.cxx
+++ b/comphelper/source/misc/hash.cxx
@@ -105,6 +105,9 @@ void Hash::update(const unsigned char* pInput, size_t 
length)
 HASH_Update(mpImpl->mpContext, pInput, length);
 #elif USE_TLS_OPENSSL
 EVP_DigestUpdate(mpImpl->mpContext, pInput, length);
+#else
+(void)pInput;
+(void)length;
 #endif
 }
 
@@ -116,6 +119,8 @@ std::vector Hash::finalize()
 HASH_End(mpImpl->mpContext, hash.data(), , 
getLength());
 #elif USE_TLS_OPENSSL
 EVP_DigestFinal_ex(mpImpl->mpContext, hash.data(), );
+#else
+(void)digestWrittenLength;
 #endif
 
 return hash;
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index b23d3ebbf57b..d40b2d57ea6a 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -111,6 +111,12 @@ void Crypto::setupContext(std::vector& key, 
std::vector& i
 Decrypt::Decrypt(std::vector& key, std::vector& iv, 
CryptoType type)
 : Crypto()
 {
+#if USE_TLS_OPENSSL + USE_TLS_NSS == 0
+(void)key;
+(void)iv;
+(void)type;
+#endif
+
 #if USE_TLS_OPENSSL
 EVP_CIPHER_CTX_init();
 
@@ -132,7 +138,13 @@ sal_uInt32 Decrypt::update(std::vector& output, 
std::vector 0
 sal_uInt32 actualInputLength = inputLength == 0 || inputLength > 
input.size() ? input.size() : inputLength;
+#else
+(void)output;
+(void)input;
+(void)inputLength;
+#endif
 
 #if USE_TLS_OPENSSL
 (void)EVP_DecryptUpdate(, output.data(), , 
input.data(), actualInputLength);
@@ -159,6 +171,12 @@ sal_uInt32 Decrypt::aes128ecb(std::vector& 
output, std::vector& key, std::vector& iv, 
CryptoType type)
 : Crypto()
 {
+#if USE_TLS_OPENSSL + USE_TLS_NSS == 0
+(void)key;
+(void)iv;
+(void)type;
+#endif
+
 #if USE_TLS_OPENSSL
 EVP_CIPHER_CTX_init();
 
@@ -180,7 +198,13 @@ sal_uInt32 Encrypt::update(std::vector& output, 
std::vector 0
 sal_uInt32 actualInputLength = inputLength == 0 || inputLength > 
input.size() ? input.size() : inputLength;
+#else
+(void)output;
+(void)input;
+(void)inputLength;
+#endif
 
 #if USE_TLS_OPENSSL
 (void)EVP_EncryptUpdate(, output.data(), , 
input.data(), actualInputLength);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2017-03-16 Thread Caolán McNamara 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0e193a4ebf1972ff7fc9381d4a24075b887d2828
Author: Caolán McNamara 
Date:   Thu Mar 16 08:59:53 2017 +

presumbly we need this to fix the arm build

Change-Id: I99fc65c7f2e684027db5f9418b855903fbd7bd70

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 8baa08e..47640fe 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -64,6 +64,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
+ $WORKDIR/UnpackedTarball/jpeg-turbo/.libs/*.a \
  $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2016-12-14 Thread Miklos Vajna 
 bin/lo-all-static-libs |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9c66ac2869617a02f5c3dca35357092e2302b7e0
Author: Miklos Vajna 
Date:   Wed Dec 14 10:55:11 2016 +0100

epoxy: fix Android build

Assuming this line has been replaced by external/epoxy/Library_epoxy.mk.

Change-Id: I0aaa86f6d001a266d7975a357e820c05045af338

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 9faa042..8baa08e 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -63,7 +63,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
- $WORKDIR/UnpackedTarball/epoxy/lib/*.a \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
  $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2016-01-15 Thread Christian Lohmaier 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a7f3a0ee29eb5800c7162aa27e1d6aad26cf4730
Author: Christian Lohmaier 
Date:   Fri Jan 15 18:51:40 2016 +0100

also link liblangtag to the liblo-native bundle (fix Android build)

Change-Id: I9f8e647068b3f0403858e5ef52f65e5e6a16e165

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index a5d26c5..813241e 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -65,6 +65,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
  $WORKDIR/UnpackedTarball/glew/lib/*.a \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
+ $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
  $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs configure.ac external/cairo RepositoryExternal.mk vcl/headless vcl/inc vcl/Library_vcl.mk vcl/unx

2015-11-16 Thread Caolán McNamara 
 RepositoryExternal.mk |   18 ++
 bin/lo-all-static-libs|2 ++
 configure.ac  |2 +-
 external/cairo/ExternalPackage_cairo.mk   |4 
 external/cairo/ExternalPackage_pixman.mk  |5 +
 external/cairo/ExternalProject_cairo.mk   |5 -
 external/cairo/ExternalProject_pixman.mk  |2 +-
 vcl/Library_vcl.mk|2 ++
 vcl/headless/svpgdi.cxx   |   23 +++
 vcl/inc/headless/svpgdi.hxx   |5 ++---
 vcl/inc/unx/gtk/gtkgdi.hxx|2 --
 vcl/unx/gtk3/gdi/gtk3cairotextrender.cxx  |   13 +++--
 vcl/unx/gtk3/gdi/gtk3cairotextrender.hxx  |9 +
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |7 +--
 14 files changed, 59 insertions(+), 40 deletions(-)

New commits:
commit fb7d4ba1cbe24b74dfab0f54eeffe898a0291ce3
Author: Caolán McNamara 
Date:   Mon Nov 16 13:40:22 2015 +

build cairo on android

Change-Id: Ie2f7662a4cc3955963517f265894b8f6a495ece8
Reviewed-on: https://gerrit.libreoffice.org/19991
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 31beeb9..42f53db 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1272,6 +1272,24 @@ endef
 
 endif # SYSTEM_CAIRO
 
+else ifeq ($(OS),ANDROID)
+
+define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_use_package,$(1),cairo)
+$(call gb_LinkTarget_use_package,$(1),pixman)
+$(call gb_LinkTarget_use_external,$(1),freetype_headers)
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,cairo) \
+   -I$(call gb_UnpackedTarball_get_dir,cairo)/src \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \
+   -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \
+)
+
+endef
+
 endif # CAIRO
 
 ifneq ($(SYSTEM_FREETYPE),)
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index e6052c3..a5d26c5 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -39,6 +39,8 @@ ANDROID)
 oslibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a"
 oslibs="$oslibs 
$WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a"
 oslibs="$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/pixman/pixman/.libs/libpixman-1.a"
+oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a"
 # Only liblo-bootstrap.a ends up here:
 oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a"
 ;;
diff --git a/configure.ac b/configure.ac
index 58a6ad7..b87fe11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -828,7 +828,7 @@ linux-android*)
 fi
 
 AC_DEFINE(HAVE_FT_FACE_GETCHARVARIANTINDEX)
-BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+BUILD_TYPE="$BUILD_TYPE CAIRO FONTCONFIG FREETYPE"
 ;;
 
 emscripten*)
diff --git a/external/cairo/ExternalPackage_cairo.mk 
b/external/cairo/ExternalPackage_cairo.mk
index e40fc54..7209276 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -11,6 +11,10 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,cairo,cairo))
 
 $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 
+ifneq ($(OS),ANDROID)
+
 $(eval $(call 
gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalPackage_pixman.mk 
b/external/cairo/ExternalPackage_pixman.mk
index ead0289..c08a775 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -11,6 +11,11 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,pixman,pixman))
 
 $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
+ifneq ($(OS),ANDROID)
+
 $(eval $(call 
gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
 
+endif
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalProject_cairo.mk 
b/external/cairo/ExternalProject_cairo.mk
index cc26096..d204514 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(call gb_ExternalProject_run,build,\
./configure \
$(if $(debug),STRIP=" ") \
-   CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \
+   CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) 
$(gb_VISIBILITY_FLAGS)" \
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) 
\

[Libreoffice-commits] core.git: bin/lo-all-static-libs external/Module_external.mk

2015-09-19 Thread Tor Lillqvist 
 bin/lo-all-static-libs  |2 --
 external/Module_external.mk |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a7b9d29dd6b166c134666f8a235afbc1f2bd0288
Author: Tor Lillqvist 
Date:   Sat Sep 19 21:06:14 2015 +0300

We don't want libxmlsec on iOS, I think

It would require NSS which I just decided to skip. If/when we patch it
to support native iOS (and OS X?) crypto APIs, re-consider. Or
something.

Now the TiledLibreOffice iOS demo app builds again.

Change-Id: I2816a49bbdbde5a8f9d3b9fcdfff420bdca05ff8

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index effa190..e6052c3 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -44,8 +44,6 @@ ANDROID)
 ;;
 IOS)
 oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
-oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a"
-oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a"
 ;;
 *)
 oslibs=
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 51900d5..a5dcade 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,7 +19,7 @@ endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
accessories \
-   libxmlsec \
+   $(if $(filter-out IOS,$(OS)),libxmlsec) \
$(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2014-12-19 Thread Tor Lillqvist 
 bin/lo-all-static-libs |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 45e8d96df39f45a7fe7b56f8d0f8fc181b0f1e46
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 19 10:42:35 2014 +0200

Fix fallout from a2e4be6ded508030a6c2a33919cbe8cb504382e0

Should fix build for iOS. There is no liblibotouch.a any more, and the only
library in $WORKDIR/LinkTarget/Library turns out to be the Android-only
liblo-bootstrap.a now.

Change-Id: Ia7b2f43db06536c05caee8d99130f44d5288705e

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index bbe950c..8cef486 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -39,6 +39,8 @@ ANDROID)
 oslibs=$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a
 oslibs=$oslibs 
$WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a
 oslibs=$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a
+# Only liblo-bootstrap.a ends up here:
+oslibs=$oslibs $WORKDIR/LinkTarget/Library/lib*.a
 ;;
 IOS)
 oslibs=$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a
@@ -64,7 +66,6 @@ esac
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $foolibs \
  $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
- $WORKDIR/LinkTarget/Library/lib*.a \
  $oslibs \
  $nsslibs \
  $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2014-11-04 Thread Tor Lillqvist 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Nov 5 01:20:38 2014 +0200

liblibotouch.a and liblo-bootstrap.a now end up in 
workdir/LinkTarget/Library

Not sure exactly why, but anyway, look for *.a there, too, then.

Change-Id: Id85f4f7d5ffe47c636ac860131a2dfb10cdfdff8

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 11c66d4..bbe950c 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -64,6 +64,7 @@ esac
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $foolibs \
  $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
+ $WORKDIR/LinkTarget/Library/lib*.a \
  $oslibs \
  $nsslibs \
  $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2014-01-14 Thread Tor Lillqvist 
 bin/lo-all-static-libs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ffcbe1a609489a4e2350f3796af259ade3467a73
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jan 14 10:35:19 2014 +0200

Add libabw

Change-Id: Ib9fc6eb5523fbaed2c13ed213f0fadb28b1e9715

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 417edd9..1c9af5a 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -47,6 +47,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
  $androidlibs \
  $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
  $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \
  $WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

2013-12-05 Thread Tor Lillqvist 
 bin/lo-all-static-libs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f6a44a216ae79bc418946c50862346652b20c0b
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 17:44:25 2013 +0200

Fix path to libfreetype.a

Change-Id: I19061350996dbfc214e7bfe16be957c852187b0e

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index f6b726b..417edd9 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -38,7 +38,7 @@ androidlibs=
 if test $OS = ANDROID; then
 androidlibs=$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a
 androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a
-androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/freetype/src/.libs/libfreetype.a
+androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a
 fi
 
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits