From 60d09584901334c58635b1aee8b44728f03770dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 27 Nov 2015 00:39:01 +0100
Subject: [PATCH] libreoffice-native: output more debug information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...r-output-more-detailed-error-message.patch | 35 +++++++++++++++++++
 .../libreoffice/libreoffice-native.bb         | 10 +++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 recipes-libreoffice/libreoffice/files/0007-cppumaker-output-more-detailed-error-message.patch

diff --git a/recipes-libreoffice/libreoffice/files/0007-cppumaker-output-more-detailed-error-message.patch b/recipes-libreoffice/libreoffice/files/0007-cppumaker-output-more-detailed-error-message.patch
new file mode 100644
index 0000000..c06642b
--- /dev/null
+++ b/recipes-libreoffice/libreoffice/files/0007-cppumaker-output-more-detailed-error-message.patch
@@ -0,0 +1,35 @@
+From 98774bf61294703183118b7953f6a92cad6da068 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 26 Nov 2015 17:48:19 +0100
+Subject: [PATCH] cppumaker: output more detailed error message
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ codemaker/source/cppumaker/cpputype.cxx | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
+index 0b3e9fd..26a9a73 100644
+--- a/codemaker/source/cppumaker/cpputype.cxx
++++ b/codemaker/source/cppumaker/cpputype.cxx
+@@ -3385,11 +3385,7 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
+ {
+     return OUString(
+             "\n"
+-            "#if OSL_DEBUG_LEVEL > 0\n"
+-            "                ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
+-            "#else\n"
+-            "                ::rtl::OUString(\"service not supplied\")\n"
+-            "#endif\n");
++            "                ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n");
+ }
+ 
+ void ServiceType::dumpHxxFile(
+-- 
+2.1.0
+
diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb
index 526273a..53447eb 100644
--- a/recipes-libreoffice/libreoffice/libreoffice-native.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb
@@ -11,9 +11,13 @@ DEPENDS += " \
 
 SRC_URI += " \
     file://0006-saxparser-output-calling-parametrs-for-debug.patch \
+    file://0007-cppumaker-output-more-detailed-error-message.patch \
 "
 
 EXTRA_OECONF += " \
+    --enable-debug \
+    --enable-dbgutil \
+    \
     --enable-python=system \
     --without-x \
     --with-system-curl \
@@ -48,6 +52,9 @@ do_configure() {
     oe_runconf
 }
 
+CXXFLAGS += "-g -O0 -DSAL_LOG_INFO -DSAL_LOG_WARN"
+LDFLAGS += "-g"
+
 do_compile() {
     BUILDDIR=${B} oe_runmake -f ${S}/Makefile.gbuild build-tools
 }
@@ -64,8 +71,9 @@ do_install() {
     # install sdk binaries
     install ${B}/instdir/sdk/bin/* ${D}/${bindir}
 
+    # install libraries and defaults
     install -d ${D}/${libdir}
-    for name in `find ${B}/instdir/program -name *.so*` ; do
+    for name in `find ${B}/instdir/program -type f` ; do
         install "$name" ${D}/${libdir}
     done
 }