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

[David Tardon]

 external/libzmf/ExternalProject_libzmf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ddfe47f0184c32ca20861776d302f393da36d5b2
Author: David Tardon 
Date:   Sat Oct 28 16:29:24 2017 +0200

libzmf: pass optimization flags to configure

Change-Id: Iff6558155100817f045053a781d09eedcd6724a2
Reviewed-on: https://gerrit.libreoffice.org/44007
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/external/libzmf/ExternalProject_libzmf.mk 
b/external/libzmf/ExternalProject_libzmf.mk
index 298e9d17cd1b..bb7d151c091c 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -37,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libzmf,build) :
--disable-werror \
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
+   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[jan Iversen]

 external/libzmf/UnpackedTarball_libzmf.mk |1 +
 external/libzmf/iOS.patch |   20 
 2 files changed, 21 insertions(+)

New commits:
commit 5fdbcb2e082ad2bfd6f92064e8b3713504cc81c1
Author: jan Iversen 
Date:   Tue Sep 19 17:32:57 2017 +0200

iOS, libzmf patch for 64 bit.

add patch

Change-Id: Ieee366fc0bfd5837e5fd9c326e0a021bac7e3e84

diff --git a/external/libzmf/UnpackedTarball_libzmf.mk 
b/external/libzmf/UnpackedTarball_libzmf.mk
index 4055bde8c858..fb763c477816 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -22,6 +22,7 @@ endif
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
+external/libzmf/iOS.patch \
 external/libzmf/android-workaround.patch.1 \
 ))
 
diff --git a/external/libzmf/iOS.patch b/external/libzmf/iOS.patch
new file mode 100644
index ..972421214227
--- /dev/null
+++ b/external/libzmf/iOS.patch
@@ -0,0 +1,20 @@
+--- config.sub
 config.sub
+@@ -253,7 +253,7 @@
+   | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+-  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 \
++  | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 
| avr | avr32 \
+ | be32 | be64 \
+   | bfin \
+   | c4x | clipper \
+@@ -365,7 +365,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libzmf RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |9 +
 external/libzmf/ExternalProject_libzmf.mk |2 ++
 2 files changed, 11 insertions(+)

New commits:
commit 5955e7bf5e4c8dcc13a7eee383dbc4d6dfcdab0f
Author: David Tardon 
Date:   Thu Nov 3 13:58:29 2016 +0100

update deps for libzmf

Change-Id: I627b3037d7e2dcecfed496068abf697c3258480d

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f93c819..b3fbeba 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2665,6 +2665,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+gb_ExternalProject__use_png :=
+
 else # !SYSTEM_LIBPNG
 
 define gb_LinkTarget__use_png
@@ -2679,6 +2681,13 @@ $(call gb_LinkTarget__use_zlib,$(1))
 
 endef
 
+define gb_ExternalProject__use_png
+$(call gb_ExternalProject_use_static_libraries,$(1),\
+   png \
+)
+
+endef
+
 endif # !SYSTEM_LIBPNG
 
 
diff --git a/external/libzmf/ExternalProject_libzmf.mk 
b/external/libzmf/ExternalProject_libzmf.mk
index 87e6693..da720fb 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
 $(eval $(call gb_ExternalProject_use_externals,libzmf,\
boost_headers \
icu \
+   png \
revenge \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libzmf,build) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 external/libzmf/ExternalProject_libzmf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 092261ffd497f752c342f1fbdca6e7267e312a21
Author: Eike Rathke 
Date:   Wed Nov 2 20:33:45 2016 +0100

add missing gb_ExternalProject_use_externals, icu

Change-Id: Iaaa3363f315eb88f3be48e29bb82917695c3cfe0

diff --git a/external/libzmf/ExternalProject_libzmf.mk 
b/external/libzmf/ExternalProject_libzmf.mk
index 713d55d..87e6693 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
 
 $(eval $(call gb_ExternalProject_use_externals,libzmf,\
boost_headers \
+   icu \
revenge \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 external/libzmf/UnpackedTarball_libzmf.mk   |1 
 external/libzmf/libzmf-config-guess.patch.1 |  727 
 2 files changed, 728 insertions(+)

New commits:
commit 2e137e4696e8278c3d56ba8a49a8b255534bd048
Author: David Tardon 
Date:   Sun Oct 23 22:41:23 2016 +0200

allow to build bundled libzmf on aarch64

Change-Id: I76d695c922a072b0edd010f5583bafe0dfeb0dd8

diff --git a/external/libzmf/UnpackedTarball_libzmf.mk 
b/external/libzmf/UnpackedTarball_libzmf.mk
index 782aeb8..e9cf715 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
external/libzmf/0001-add-missing-include.patch.1 \
external/libzmf/0001-allow-build-with-boost-1.56.patch.1 \
external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1 \
+   external/libzmf/libzmf-config-guess.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libzmf/libzmf-config-guess.patch.1 
b/external/libzmf/libzmf-config-guess.patch.1
new file mode 100644
index 000..bf9fffb
--- /dev/null
+++ b/external/libzmf/libzmf-config-guess.patch.1
@@ -0,0 +1,727 @@
+diff -up ./config.guess.dt ./config.guess
+--- ./config.guess.dt  2016-10-23 22:39:12.641388777 +0200
 ./config.guess 2016-10-23 22:32:42.022632241 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2015 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2015-01-01'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -26,12 +24,12 @@ timestamp='2012-12-29'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner. 
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+ # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ #
+-# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
++# Please send patches to .
+ 
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+@@ -52,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2015 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++  # If the system lacks a compiler, then just pick glibc.
++  # We could probably try harder.
++  LIBC=gnu
++
++  eval $set_cc_for_build
++  cat <<-EOF > $dummy.c
++  #include 
++  #if defined(__UCLIBC__)
++  LIBC=uclibc
++  #elif defined(__dietlibc__)
++  LIBC=dietlibc
++  #else
++  LIBC=gnu
++  #endif
++  EOF
++  eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, 
,,g'`
++  ;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -562,8 +579,9 @@ EOF
+   else
+   IBM_ARCH=powerpc
+   fi
+-  if [ -x /usr/bin/oslevel ] ; then
+-  IBM_REV=`/usr/bin/oslevel`
++  if [ -x /usr/bin/lslpp ] ; then
++  IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+   else
+   IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+   fi
+@@ -809,7 +827,7 @@ EOF
+ *:MINGW*:*)
+   echo ${UNAME_MACHINE}-pc-mingw32
+   exit ;;
+-i*:MSYS*:*)
++*:MSYS*:*)
+   echo ${UNAME_MACHINE}-pc-msys
+   exit ;;
+ i*:windows32*:*)
+@@ -857,21 +875,21 @@ EOF
+   exit ;;
+ *:GNU:*:*)
+   # the GNU system
+-  echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo 
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++  echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo 
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+   exit ;;
+ *:GNU/*:*:*)
+   # other systems with GNU libc and userland
+-  echo ${UNAME_MACHINE}-unknown-`echo 

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

[Michael Stahl]

 external/libzmf/0001-add-missing-include.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c931f3a5184928bc333796362a5616a93c6ed6d7
Author: Michael Stahl 
Date:   Fri Jun 24 22:33:28 2016 +0200

libzmf: __ANDROID__, not ANDROID

The former is defined by GCC, the latter by gbuild -D$(OS)

Change-Id: I5960f8f74defcab964729c4deca5b1a988125d24

diff --git a/external/libzmf/0001-add-missing-include.patch.1 
b/external/libzmf/0001-add-missing-include.patch.1
index c5ddfe9..ff1dc2a 100644
--- a/external/libzmf/0001-add-missing-include.patch.1
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -18,7 +18,7 @@ index ded93c7..7e024b3 100644
  
 +#include 
 +
-+#if defined(ANDROID)
++#if defined(__ANDROID__)
 +namespace std
 +{
 +template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/libzmf/0001-add-missing-include.patch.1 |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit b72c14f68b317b27be12a2432cdeae351537d57a
Author: Michael Stahl 
Date:   Fri Jun 24 21:07:33 2016 +0200

libzmf: blind fix hack attempt to work around buggy android headers

Change-Id: Ie7b265e909389ae80d8ced3d803d7e355cda2211

diff --git a/external/libzmf/0001-add-missing-include.patch.1 
b/external/libzmf/0001-add-missing-include.patch.1
index db2a5c3..c5ddfe9 100644
--- a/external/libzmf/0001-add-missing-include.patch.1
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -12,12 +12,23 @@ diff --git a/src/lib/ZMFCollector.cpp 
b/src/lib/ZMFCollector.cpp
 index ded93c7..7e024b3 100644
 --- a/src/lib/ZMFCollector.cpp
 +++ b/src/lib/ZMFCollector.cpp
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,19 @@
  
  #include "ZMFCollector.h"
  
 +#include 
 +
++#if defined(ANDROID)
++namespace std
++{
++template
++T hypot(T x, T y)
++{
++return ::hypot(x, y);
++}
++}
++#endif
++
  #include 
  #include 
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 external/libzmf/0001-add-missing-include.patch.1 |   26 +++
 external/libzmf/UnpackedTarball_libzmf.mk|4 +++
 2 files changed, 30 insertions(+)

New commits:
commit f31de94b2dfbbb74a5f9767aef66b21aa56af2cf
Author: David Tardon 
Date:   Fri Jun 24 09:28:12 2016 +0200

fix android build

Change-Id: Iecc55d0e1efd74b9895aa8f71934efa887bb6984

diff --git a/external/libzmf/0001-add-missing-include.patch.1 
b/external/libzmf/0001-add-missing-include.patch.1
new file mode 100644
index 000..db2a5c3
--- /dev/null
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -0,0 +1,26 @@
+From cec69125160906f147398c347860fee0e6aab8bf Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Fri, 24 Jun 2016 09:26:21 +0200
+Subject: [PATCH] add missing include
+
+Change-Id: Ia21873123179902b2c3cad95b39db7d15c5b388a
+---
+ src/lib/ZMFCollector.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/lib/ZMFCollector.cpp b/src/lib/ZMFCollector.cpp
+index ded93c7..7e024b3 100644
+--- a/src/lib/ZMFCollector.cpp
 b/src/lib/ZMFCollector.cpp
+@@ -9,6 +9,8 @@
+ 
+ #include "ZMFCollector.h"
+ 
++#include 
++
+ #include 
+ #include 
+ 
+-- 
+2.7.4
+
diff --git a/external/libzmf/UnpackedTarball_libzmf.mk 
b/external/libzmf/UnpackedTarball_libzmf.mk
index 3246384..c917633 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
 endif
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
+   external/libzmf/0001-add-missing-include.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits