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

2021-08-02 Thread Stephan Bergmann (via logerrit) 
 external/libodfgen/UnpackedTarball_libodfgen.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d2aeb7b8f52ffb2c6699099880250960cc2a800c
Author: Stephan Bergmann 
AuthorDate: Mon Aug 2 14:30:00 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 2 16:10:22 2021 +0200

Mark external/libodfgen/ellipticalarc.patch as reported upstream

Change-Id: I76f8cab70d4c1a5b98bb5ba1608676d34570694b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119879
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 89ff9eba353f..c9790e1033de 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -15,6 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen))
 
+# * external/libodfgen/ellipticalarc.patch reported upstream as
+#    
"[Libwpd-devel] [PATCH] Avoid
+#   division by zero for empty elliptical arc":
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 external/libodfgen/ellipticalarc.patch \
 ))

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

2021-08-01 Thread Stephan Bergmann (via logerrit) 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 
 external/libodfgen/ellipticalarc.patch  |   13 +
 2 files changed, 17 insertions(+)

New commits:
commit fa759359587808f5e74217e558ee3dd9143710f7
Author: Stephan Bergmann 
AuthorDate: Thu Jul 29 16:45:50 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Sun Aug 1 17:20:17 2021 +0200

external/libodfgen: Avoid division by zero for empty elliptical arc

...as seen when running under UBSan `instdir/program/soffice --headless
--convert-to epub` of caolan/libmspub_icu_global_buffer_overflow.sample 
from the
crash-testing corpus.

 
specifies:
"If the endpoints (x1, y1) and (x2, y2) are identical, then this is 
equivalent
to omitting the elliptical arc segment entirely."  (And 
getEllipticalArgBox's
xmin, ymin, xmax, and ymax out parameters are pre-filled with suitable 
values at
the call site in getPathBBox, so that we can return here without setting 
those
out parameters.)

Change-Id: I6b0b693354648f4015cec2395737fb9abe5ae956
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119680
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index d6c84e517970..89ff9eba353f 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+external/libodfgen/ellipticalarc.patch \
+))
+
 ifeq ($(SYSTEM_REVENGE),)
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 external/libodfgen/rpath.patch \
diff --git a/external/libodfgen/ellipticalarc.patch 
b/external/libodfgen/ellipticalarc.patch
new file mode 100644
index ..27aaee77cb8a
--- /dev/null
+++ b/external/libodfgen/ellipticalarc.patch
@@ -0,0 +1,13 @@
+--- src/GraphicFunctions.cxx
 src/GraphicFunctions.cxx
+@@ -59,6 +59,10 @@
+   double rx, double ry, double phi, bool largeArc, 
bool sweep, double x, double y,
+   double , double , double , double 
)
+ {
++  if (x0 == x && y0 == y) {
++  return;
++  }
++
+   phi *= M_PI/180;
+   if (rx < 0.0)
+   rx *= -1.0;

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

2021-01-26 Thread Tor Lillqvist (via logerrit) 
 external/libodfgen/libodfgen-bundled-soname.patch.0 |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7e0e90ab2826e4147a74b6c9fe854464362dc9fb
Author: Tor Lillqvist 
AuthorDate: Tue Jan 26 23:21:42 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 27 00:08:24 2021 +0100

A patch chunk should have an equal number of context lines before and after

Some versions of the patch program are picky about that.

Change-Id: I0006ecefcf4afe10971c5f3571c3d32d97598696
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109998
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 
b/external/libodfgen/libodfgen-bundled-soname.patch.0
index f5c0caf8d6d1..d012fe3a8f65 100644
--- a/external/libodfgen/libodfgen-bundled-soname.patch.0
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -1,7 +1,9 @@
+-*- Mode: Diff -*-
 diff -urN src/Makefile.in.orig src/Makefile.in
 --- src/Makefile.in.orig   2016-03-02 17:17:02.812606210 +0100
 +++ src/Makefile.in2016-03-02 17:17:25.176670151 +0100
-@@ -355,6 +355,6 @@
+@@ -355,7 +355,7 @@
+   $(XML_CFLAGS) -DLIBODFGEN_BUILD $(am__append_1)
  libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = 
@LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS) $(XML_LIBS)
  libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES 
= @LIBODFGEN_WIN32_RESOURCE@
 -libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-16 Thread Stephan Bergmann (via logerrit) 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 ++
 external/libodfgen/c++11.patch  |   44 
 2 files changed, 48 insertions(+)

New commits:
commit daacd89b7513e533e1890526eabdf10c01576596
Author: Stephan Bergmann 
AuthorDate: Thu May 16 13:55:02 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Thu May 16 16:04:17 2019 +0200

external/libodfgen: Honor -std=... passed in via CXXFLAGS

...which fixes an issue encountered when compiling with Clang against trunk
libstdc++ (which contains pre-C++17-only code that triggers
 "Bogus 'error: no return 
statement
in constexpr function' when void return type is 'templated'")

Change-Id: I33368996c8ac8cf32893ba1b631ace2a606dafb1
Reviewed-on: https://gerrit.libreoffice.org/72409
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 80ccbf73bfd5..ee4ed647cb9a 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -35,8 +35,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 endif
 endif
 
+# * external/libodfgen/c++11.patch: obsoleted upstream by
+#   

+#   "boost::shared_ptr -> std::shared_ptr"
 $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \

external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
 \
+   external/libodfgen/c++11.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/c++11.patch b/external/libodfgen/c++11.patch
new file mode 100644
index ..f41d1a166964
--- /dev/null
+++ b/external/libodfgen/c++11.patch
@@ -0,0 +1,44 @@
+# Add -std=c++11 before existing CXXFLAGS, in case those already contain some 
-std= (which will thus
+# override the preceding -std=c++11, which is likely what the caller passing 
in those CXXFLAGS
+# intends):
+#
+#--- configure.ac
+#+++ configure.ac
+#@@ -217,7 +217,7 @@
+# AS_IF([test "x$with_sharedptr" = "xc++11"], [
+# AC_MSG_CHECKING([for c++11 shared ptr])
+# save_CXXFLAGS="$CXXFLAGS"
+#-CXXFLAGS="$CXXFLAGS -std=c++11"
+#+CXXFLAGS="-std=c++11 $CXXFLAGS"
+# AC_COMPILE_IFELSE([
+# AC_LANG_PROGRAM(
+# [[#include ]],
+#@@ -241,7 +241,7 @@
+# AC_MSG_RESULT([no])
+# ], [
+# AC_MSG_RESULT([yes])
+#-CXXFLAGS="$CXXFLAGS -std=c++11"
+#+CXXFLAGS="-std=c++11 $CXXFLAGS"
+# ])
+# ])
+# AS_IF([test "x$with_sharedptr" = "xtr1"], [
+--- configure
 configure
+@@ -16723,7 +16723,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" 
>&5
+ $as_echo_n "checking for c++11 shared ptr... " >&6; }
+ save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -std=c++11"
++CXXFLAGS="-std=c++11 $CXXFLAGS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16780,7 +16780,7 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-CXXFLAGS="$CXXFLAGS -std=c++11"
++CXXFLAGS="-std=c++11 $CXXFLAGS"
+ 
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-16 Thread David Tardon (via logerrit) 
 external/libodfgen/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e71900531f39cb604e0658316c32e6b75c9dd14
Author: David Tardon 
AuthorDate: Thu May 16 14:16:10 2019 +0200
Commit: David Tardon 
CommitDate: Thu May 16 14:19:29 2019 +0200

update libodfgen README a bit

Change-Id: I9d0a7e782b1bd5955cb524153b8a7bdea9e174e7

diff --git a/external/libodfgen/README b/external/libodfgen/README
index efeffac5dc21..01454e0d93ab 100644
--- a/external/libodfgen/README
+++ b/external/libodfgen/README
@@ -1 +1 @@
-From [http://libwpg.sourceforge.net/]. Library to generate ODT and ODG 
documents from libwpd and libwpg API calls.
+From [https://sourceforge.net/p/libwpd/wiki/libodfgen/]. Library to generate 
ODT and ODG documents from librevenge API calls.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-29 Thread David Tardon 
 external/libodfgen/ExternalProject_libodfgen.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d1950eb944325806af75ede5c0542ac68787
Author: David Tardon 
Date:   Sat Oct 28 15:50:23 2017 +0200

libodfgen: pass optimization flags to configure

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

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index ae6ab610f119..c02b4f532d65 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--without-docs \
--with-sharedptr=c++11 \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if 
$(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
+   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+   CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_REVENGE),,$(if 
$(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \
$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN')) 
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-12 Thread David Tardon 
 
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
 |   58 ++
 external/libodfgen/UnpackedTarball_libodfgen.mk
  |3 
 2 files changed, 61 insertions(+)

New commits:
commit 8d26a169794083f047a57e5c8d3f5da0aaab2583
Author: David Tardon 
Date:   Fri Aug 12 13:11:38 2016 +0200

tdf#101077 make double->str conv. locale-agnostic

Change-Id: Ibb87f4a14fda6957149ca52083387760ff6e60a3

diff --git 
a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
 
b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
new file mode 100644
index 000..1fc4e6b
--- /dev/null
+++ 
b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
@@ -0,0 +1,58 @@
+From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Fri, 12 Aug 2016 12:50:39 +0200
+Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic
+
+---
+ src/OdsGenerator.cxx | 19 +--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx
+index 52e135e..8cb7203 100644
+--- a/src/OdsGenerator.cxx
 b/src/OdsGenerator.cxx
+@@ -26,6 +26,8 @@
+ 
+ #include 
+ 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -46,6 +48,19 @@
+ #include "OdcGenerator.hxx"
+ #include "OdfGenerator.hxx"
+ 
++namespace
++{
++
++librevenge::RVNGString makePreciseStr(const double value)
++{
++  std::ostringstream os;
++  os.imbue(std::locale::classic());
++  os << std::fixed << std::setprecision(8) << value;
++  return os.str().c_str();
++}
++
++}
++
+ class OdsGeneratorPrivate : public OdfGenerator
+ {
+ public:
+@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const 
librevenge::RVNGPropertyList )
+   // we need the maximum precision here, 
so we must avoid getStr() when possible
+   librevenge::RVNGString value;
+   if 
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC)
+-  value.sprintf("%.8f", 
propList["librevenge:value"]->getDouble());
++  value = 
makePreciseStr(propList["librevenge:value"]->getDouble());
+   else if 
(propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT)
+   {
+-  value.sprintf("%.8f", 
propList["librevenge:value"]->getDouble()*100.);
++  value = 
makePreciseStr(propList["librevenge:value"]->getDouble()*100.);
+   value.append('%');
+   }
+   else
+-- 
+2.7.4
+
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 3cbeb55..f6695d9 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -35,5 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 endif
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+   
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.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

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

2016-03-02 Thread Tomáš Chvátal 
 external/libodfgen/libodfgen-bundled-soname.patch.0 |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6d7aeebcce020125caf660636e7dc7a5f160858e
Author: Tomáš Chvátal 
Date:   Wed Mar 2 17:20:23 2016 +0100

Fix patch to apply on SLE11, just some unknown patch binary hickup

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

diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 
b/external/libodfgen/libodfgen-bundled-soname.patch.0
index 297cd303..052ba79 100644
--- a/external/libodfgen/libodfgen-bundled-soname.patch.0
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -1,6 +1,7 @@
 src/Makefile.in.orig   2015-08-07 11:26:16.388774624 +0200
-+++ src/Makefile.in2015-08-07 11:27:01.428773852 +0200
-@@ -372,7 +372,7 @@
+diff -urN src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig   2016-03-02 17:17:02.812606210 +0100
 src/Makefile.in2016-03-02 17:17:25.176670151 +0100
+@@ -355,7 +355,7 @@
  AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) 
-DLIBODFGEN_BUILD
  libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = 
@LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
  libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES 
= @LIBODFGEN_WIN32_RESOURCE@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-02 Thread Miklos Vajna 
 external/libodfgen/Library_odfgen.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4c2340c4e0c048af4c77d17380cccf7f2985b5d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Jan 2 13:09:51 2015 +0100

Library_odfgen: missing quotes

Change-Id: I1df6ad9a53001348f269d4156dd09c4d2c361c26

diff --git a/external/libodfgen/Library_odfgen.mk 
b/external/libodfgen/Library_odfgen.mk
index 161415c..4cae5b0 100644
--- a/external/libodfgen/Library_odfgen.mk
+++ b/external/libodfgen/Library_odfgen.mk
@@ -28,8 +28,8 @@ $(eval $(call gb_Library_add_defs,odfgen,\
-DDLL_EXPORT \
-DLIBODFGEN_BUILD \
-DNDEBUG \
-   -DPACKAGE=libodfgen \
-   -DVERSION=0.1.$(ODFGEN_VERSION_MICRO) \
+   -DPACKAGE=\libodfgen\ \
+   -DVERSION=\0.1.$(ODFGEN_VERSION_MICRO)\ \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,odfgen,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-01 Thread Miklos Vajna 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 ++
 external/libodfgen/missing-ifdef.patch  |   43 
 2 files changed, 47 insertions(+)

New commits:
commit fcf152ea70164f303861c7edcd83ab0766ad600a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Jan 1 22:10:58 2015 +0100

error C1083: Cannot open include file: 'config.h': No such file or directory

Change-Id: I8499c79358c598f71585234d7007e981ff4d88e1

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index bb2153f..04f5149 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,4 +13,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+   external/libodfgen/missing-ifdef.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/missing-ifdef.patch 
b/external/libodfgen/missing-ifdef.patch
new file mode 100644
index 000..4a53ccf
--- /dev/null
+++ b/external/libodfgen/missing-ifdef.patch
@@ -0,0 +1,43 @@
+From b74fc4236cbc58719cc5f6c7fbb3a2213fefa41a Mon Sep 17 00:00:00 2001
+From: Miklos Vajna vmik...@collabora.co.uk
+Date: Thu, 1 Jan 2015 20:29:36 +0100
+Subject: [PATCH] error C1083: Cannot open include file: 'config.h': No such
+ file or directory
+
+---
+ src/OdfGenerator.cxx | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/OdfGenerator.cxx b/src/OdfGenerator.cxx
+index 0534528..c9ace1d 100644
+--- src/OdfGenerator.cxx
 src/OdfGenerator.cxx
+@@ -24,7 +24,9 @@
+  * Corel Corporation or Corel Corporation Limited.
+  */
+ 
++#ifdef HAVE_CONFIG_H
+ #include config.h
++#endif
+ 
+ #include math.h
+ 
+@@ -123,6 +125,7 @@ void OdfGenerator::setDocumentMetaData(const 
librevenge::RVNGPropertyList propL
+   }
+   }
+ 
++#if HAVE_CONFIG_H
+   if (generator.empty())
+   {
+   generator = PACKAGE / VERSION;
+@@ -133,6 +136,7 @@ void OdfGenerator::setDocumentMetaData(const 
librevenge::RVNGPropertyList propL
+   generator += PACKAGE / VERSION;
+   generator += );
+   }
++#endif
+ 
+   mMetaDataStorage.push_back(new TagOpenElement(meta:generator));
+   mMetaDataStorage.push_back(new CharDataElement(generator.c_str()));
+-- 
+2.1.2
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libodfgen external/libvisio

2014-11-25 Thread Miklos Vajna 
 external/libodfgen/UnpackedTarball_libodfgen.mk |4 
 external/libodfgen/metadata.patch   |   33 +
 external/libvisio/UnpackedTarball_libvisio.mk   |1 
 external/libvisio/vsdx-metadata.patch.1 |  462 
 4 files changed, 500 insertions(+)

New commits:
commit 411bd6e440266a0db95907ad73a3a5be92bd1827
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Nov 25 12:27:25 2014 +0100

fdo#86664 VSDX import: handle metadata

Change-Id: I04a446e6b8a8352be9f091980bca31842bb7e643

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index bb2153f..edf41b6 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,4 +13,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+external/libodfgen/metadata.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/metadata.patch 
b/external/libodfgen/metadata.patch
new file mode 100644
index 000..1b904ed
--- /dev/null
+++ b/external/libodfgen/metadata.patch
@@ -0,0 +1,33 @@
+commit fb43d79e12ce132fc127cc0481ff5a6bdbcd1afe
+Author: Miklos Vajna vmik...@collabora.co.uk
+Date:   Tue Nov 25 11:26:34 2014 +0100
+
+Od[gp]Generator: declare meta namespace
+
+Other generators had it already, and without this, it's not possible to
+declare creation date.
+
+diff --git src/OdgGenerator.cxx src/OdgGenerator.cxx
+index 6a2b1a4..ca4d4f0 100644
+--- src/OdgGenerator.cxx
 src/OdgGenerator.cxx
+@@ -283,6 +283,7 @@ bool 
OdgGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS
+   docContentPropList.addAttribute(xmlns:draw, 
urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
+   docContentPropList.addAttribute(xmlns:table, 
urn:oasis:names:tc:opendocument:xmlns:table:1.0);
+   docContentPropList.addAttribute(xmlns:xlink, 
http://www.w3.org/1999/xlink;);
++  docContentPropList.addAttribute(xmlns:meta, 
urn:oasis:names:tc:opendocument:xmlns:meta:1.0);
+   docContentPropList.addAttribute(xmlns:dc, 
http://purl.org/dc/elements/1.1/;);
+   docContentPropList.addAttribute(xmlns:svg, 
urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
+   docContentPropList.addAttribute(xmlns:fo, 
urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
+diff --git a/src/OdpGenerator.cxx b/src/OdpGenerator.cxx
+index 4345c40..8ba4dc0 100644
+--- src/OdpGenerator.cxx
 src/OdpGenerator.cxx
+@@ -444,6 +444,7 @@ bool 
OdpGeneratorPrivate::writeTargetDocument(OdfDocumentHandler *pHandler, OdfS
+   docContentPropList.addAttribute(xmlns:fo, 
urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
+   docContentPropList.addAttribute(xmlns:config, 
urn:oasis:names:tc:opendocument:xmlns:config:1.0);
+   docContentPropList.addAttribute(xmlns:xlink, 
http://www.w3.org/1999/xlink;);
++  docContentPropList.addAttribute(xmlns:meta, 
urn:oasis:names:tc:opendocument:xmlns:meta:1.0);
+   // WARNING: this is not ODF!
+   docContentPropList.addAttribute(xmlns:ooo, 
http://openoffice.org/2004/office;);
+   docContentPropList.addAttribute(xmlns:officeooo, 
http://openoffice.org/2009/office;);
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index 1626dbb..4451eb5 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
external/libvisio/libvisio_quote.patch.1 \
+   external/libvisio/vsdx-metadata.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/vsdx-metadata.patch.1 
b/external/libvisio/vsdx-metadata.patch.1
new file mode 100644
index 000..58a0a7d
--- /dev/null
+++ b/external/libvisio/vsdx-metadata.patch.1
@@ -0,0 +1,462 @@
+commit 1b1fd1b07728590c94694b4e8b1b00058ca02d52
+Author: Miklos Vajna vmik...@collabora.co.uk
+Date:   Tue Nov 25 09:49:05 2014 +0100
+
+fdo#86664 VSDX: import metadata
+
+Only title as a start.
+
+Change-Id: Id1b92992c75058f99b9c0c72d53c254110917ed7
+Reviewed-on: https://gerrit.libreoffice.org/13108
+Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
+Tested-by: Fridrich Strba fridr...@documentfoundation.org
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 6080d31..955aac4 100644
+--- a/src/lib/Makefile.am
 b/src/lib/Makefile.am
+@@ -75,6 +75,8 @@ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_SOURCES 
= \
+   VSDXParser.h \
+   VSDXTheme.cpp \
+   VSDXTheme.h \
++  VSDXMetaData.cpp \
++  VSDXMetaData.h \
+   $(generated_files)
+   
+ 
+@@ -83,6

[Libreoffice-commits] core.git: external/libodfgen external/librevenge

2014-08-29 Thread Stephan Bergmann 
 external/libodfgen/ExternalProject_libodfgen.mk   |2 +-
 external/librevenge/ExternalProject_librevenge.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 691450b8d4f9de48fca32b621348ef2a306b0349
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 14:06:04 2014 +0200

Pass --enable-debug down to some externals

Change-Id: I3bb3c90142cbbd32877ba5e3d9070bc52ee76df9

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index 6e1c7ff..c86fdc3 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
, \
--enable-shared --disable-static \
) \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--without-docs \
diff --git a/external/librevenge/ExternalProject_librevenge.mk 
b/external/librevenge/ExternalProject_librevenge.mk
index 707b16e..7fcdc3e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--with-pic \
--enable-shared \
--disable-static \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--disable-streams \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-29 Thread Stephan Bergmann 
 external/libodfgen/UnpackedTarball_libodfgen.mk |6 ++
 external/libodfgen/ubsan.patch  |   60 
 2 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 66e3194e6a5cca0400fa9628446246b2668ef2b5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 14:33:05 2014 +0200

external/libodfgen: Avoid undefined-behavior casts...

...from (potentially negative) double to unsigned

Change-Id: I2f922beec7201a8d769133e879208d2e951e6429

diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 60258a3..66707dd 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+external/libodfgen/ubsan.patch \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ubsan.patch b/external/libodfgen/ubsan.patch
new file mode 100644
index 000..0b807dd
--- /dev/null
+++ b/external/libodfgen/ubsan.patch
@@ -0,0 +1,60 @@
+See 
https://sourceforge.net/p/libwpd/tickets/2/attachment/0001-Avoid-undefined-behavior-casts-from-potentially-nega.patch:
+--- src/GraphicFunctions.cxx
 src/GraphicFunctions.cxx
+@@ -448,42 +448,42 @@
+   // 2540 is 2.54*1000, 2.54 in = 1 inch
+   if (path[i][svg:x]  action[0] == 'H')
+   {
+-  sElement.sprintf(H%i, 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540));
++  sElement.sprintf(H%i, 
(int)((getInchValue(path[i][svg:x])-px)*2540));
+   sValue.append(sElement);
+   }
+   else if (path[i][svg:y]  action[0] == 'V')
+   {
+-  sElement.sprintf(V%i, 
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(V%i, 
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coordOk  (action[0] == 'M' || action[0] == 'L' || 
action[0] == 'T'))
+   {
+-  sElement.sprintf(%c%i %i, action[0], 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(%c%i %i, action[0], 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coord1Ok  (action[0] == 'Q' || action[0] == 'S'))
+   {
+-  sElement.sprintf(%c%i %i %i %i, action[0], 
(unsigned)((getInchValue(path[i][svg:x1])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y1])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(%c%i %i %i %i, action[0], 
(int)((getInchValue(path[i][svg:x1])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y1])-py)*2540), 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coord2Ok  action[0] == 'C')
+   {
+-  sElement.sprintf(C%i %i %i %i %i %i, 
(unsigned)((getInchValue(path[i][svg:x1])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y1])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x2])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y2])-py)*2540), 
(unsigned)((getInchValue(path[i][svg:x])-px)*2540),
+-   
(unsigned)((getInchValue(path[i][svg:y])-py)*2540));
++  sElement.sprintf(C%i %i %i %i %i %i, 
(int)((getInchValue(path[i][svg:x1])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y1])-py)*2540), 
(int)((getInchValue(path[i][svg:x2])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y2])-py)*2540), 
(int)((getInchValue(path[i][svg:x])-px)*2540),
++   
(int)((getInchValue(path[i][svg:y])-py)*2540));
+   sValue.append(sElement);
+   }
+   else if (coordOk  path[i][svg:rx]  path[i][svg:ry]  
action[0] == 'A')
+   {
+-

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

2014-05-25 Thread Tor Lillqvist 
 external/libodfgen/ExternalProject_libodfgen.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef11f552a67abbeaa48fa7dfc676a8a7b6834387
Author: Tor Lillqvist t...@collabora.com
Date:   Mon May 26 08:11:38 2014 +0300

Don't build as shared library when DISABLE_DYNLOADING

Change-Id: Ib3339689d41f02b258f6c398887faae28e602a5c

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index ab430df..c84eb75 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
export PKG_CONFIG= \
 ./configure \
--with-pic \
-   --enable-shared \
+   $(if $(DISABLE_DYNLOADING),,--enable-shared) \
--disable-static \
--disable-debug \
--disable-werror \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-25 Thread Tor Lillqvist 
 external/libodfgen/ExternalProject_libodfgen.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9444a1ffccadcc41d5e3f7519d870392dcbaf19d
Author: Tor Lillqvist t...@collabora.com
Date:   Mon May 26 08:23:17 2014 +0300

Let's make it fully clear what we want

Change-Id: Idfd73565c29c4ebcf561955fa965a81888a59315

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index c84eb75..263e60d 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -27,8 +27,11 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
export PKG_CONFIG= \
 ./configure \
--with-pic \
-   $(if $(DISABLE_DYNLOADING),,--enable-shared) \
-   --disable-static \
+   $(if $(DISABLE_DYNLOADING), \
+   --enable-static --disable-shared \
+   , \
+   --enable-shared --disable-static \
+   ) \
--disable-debug \
--disable-werror \
--disable-weffc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libodfgen external/Module_external.mk libodfgen/ExternalProject_libodfgen.mk libodfgen/Makefile libodfgen/Module_libodfgen.mk libodfgen/README libodfgen/Unpack

2013-10-19 Thread Khaled Hosny 
 RepositoryModule_host.mk|1 
 external/Module_external.mk |1 
 external/libodfgen/ExternalProject_libodfgen.mk |   41 
 external/libodfgen/Makefile |7 
 external/libodfgen/Module_libodfgen.mk  |   17 +
 external/libodfgen/README   |1 
 external/libodfgen/UnpackedTarball_libodfgen.mk |   14 
 libodfgen/ExternalProject_libodfgen.mk  |   41 
 libodfgen/Makefile  |7 
 libodfgen/Module_libodfgen.mk   |   21 
 libodfgen/README|1 
 libodfgen/UnpackedTarball_libodfgen.mk  |   14 
 12 files changed, 81 insertions(+), 85 deletions(-)

New commits:
commit 9b4b718b5b049aff0077202c26d057b14bc29511
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 22:12:43 2013 +0200

fdo#70393: move libodfgen to a subdir of external

Change-Id: If43571222806df4c3d25ab88eab3b1755f583d5a
Reviewed-on: https://gerrit.libreoffice.org/6333
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e058f04..30e4e25 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmaccess \
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-   $(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index e3bcd47..5e60a64 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBPNG,libpng) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
+   $(call gb_Helper_optional,ODFGEN,libodfgen) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
similarity index 100%
rename from libodfgen/ExternalProject_libodfgen.mk
rename to external/libodfgen/ExternalProject_libodfgen.mk
diff --git a/libodfgen/Makefile b/external/libodfgen/Makefile
similarity index 71%
rename from libodfgen/Makefile
rename to external/libodfgen/Makefile
index ccb1c85..e4968cf 100644
--- a/libodfgen/Makefile
+++ b/external/libodfgen/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/libodfgen/Module_libodfgen.mk 
b/external/libodfgen/Module_libodfgen.mk
similarity index 93%
rename from libodfgen/Module_libodfgen.mk
rename to external/libodfgen/Module_libodfgen.mk
index ca58a27..d94d34f 100644
--- a/libodfgen/Module_libodfgen.mk
+++ b/external/libodfgen/Module_libodfgen.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libodfgen))
 
-ifeq ($(SYSTEM_ODFGEN),NO)
-
 $(eval $(call gb_Module_add_targets,libodfgen,\
ExternalProject_libodfgen \
UnpackedTarball_libodfgen \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libodfgen/README b/external/libodfgen/README
similarity index 100%
rename from libodfgen/README
rename to external/libodfgen/README
diff --git a/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
similarity index 100%
rename from libodfgen/UnpackedTarball_libodfgen.mk
rename to external/libodfgen/UnpackedTarball_libodfgen.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits