From c7ece07d2e1b478bf25a976618e9bc5e5bc1a144 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 29 May 2019 17:57:57 +0200
Subject: Pass --enable-debug into external/libcdr

(but which requires a little upstream master patch)

Change-Id: I4bea938c402b03d8b05b6e70694ecc0184544b81
Reviewed-on: https://gerrit.libreoffice.org/73179
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 external/libcdr/0001-Add-missing-include.patch.1 | 33 ++++++++++++++++++++++++
 external/libcdr/ExternalProject_libcdr.mk        |  2 +-
 external/libcdr/UnpackedTarball_libcdr.mk        |  3 +++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 external/libcdr/0001-Add-missing-include.patch.1

(limited to 'external')

diff --git a/external/libcdr/0001-Add-missing-include.patch.1 b/external/libcdr/0001-Add-missing-include.patch.1
new file mode 100644
index 000000000000..93f2b6ccc6fc
--- /dev/null
+++ b/external/libcdr/0001-Add-missing-include.patch.1
@@ -0,0 +1,33 @@
+From 00c4b331df8157dff7c251323d00ec2d63691dfb Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos@collabora.com>
+Date: Mon, 28 Jan 2019 09:04:56 +0100
+Subject: [PATCH] Add missing include
+
+CMXParser.cpp:42:43: error: expected ')'
+    CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
+                                          ^
+CMXParser.cpp:42:19: note: to match this '('
+    CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
+                  ^
+1 error generated.
+
+Change-Id: I9575a96327a62dc6c44950d35a8740242e1a4433
+---
+ src/lib/CMXParser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
+index 78cc417..02852c9 100644
+--- a/src/lib/CMXParser.cpp
++++ b/src/lib/CMXParser.cpp
+@@ -14,6 +14,7 @@
+ #include <math.h>
+ #include <stdlib.h>
+ #include <utility>
++#include <cinttypes>
+ 
+ #include "libcdr_utils.h"
+ #include "CDRPath.h"
+-- 
+2.21.0
+
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 5e895a5fc1e3..503307cf3488 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			--disable-shared \
 			--without-docs \
 			--disable-tools \
-			--disable-debug \
+			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			--disable-weffc \
 			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index 7433d2bb4e67..0c61c5962385 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -15,8 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
 
+# * external/libcdr/0001-Add-missing-include.patch.1 is from upstream master (see content for
+#   details):
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
     external/libcdr/libcdr-visibility-win.patch \
+    external/libcdr/0001-Add-missing-include.patch.1 \
 ))
 
 ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-- 
cgit