[libe-book] 01/01: build with -DUCHAR_TYPE=uint16_t with ICU 59

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libe-book.

commit f1a2db23cd442f8288d2542d476de5436a2c8686
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu May 25 22:09:29 2017 +0200

    build with -DUCHAR_TYPE=uint16_t with ICU 59
---
 debian/changelog | 6 ++++++
 debian/rules     | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 09eca21..3ab342b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcdr (0.1.2-5) UNRELEASED; urgency=medium
+
+  * build with -DUCHAR_TYPE=uint16_t with ICU 59
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 25 May 2017 21:56:01 +0200
+
 libe-book (0.1.2-4) unstable; urgency=medium
 
   * [a3462bc] move Maintainer: to Debian LibreOffice Maintainers
diff --git a/debian/rules b/debian/rules
index 7f3381e..b808247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,14 @@
 #                 for unit tests (btw, i think at least libetonyek has the same 
 #                 problem)
 #20:25 <@dtardon> _rene_, CPPFLAGS=-DBOOST_ERROR_CODE_HEADER_ONLY
-CPPFLAGS+=-DBOOST_ERROR_CODE_HEADER_ONLY
+export DEB_CPPFLAGS_MAINT_APPEND := -DBOOST_ERROR_CODE_HEADER_ONLY
+
+# see https://cgit.freedesktop.org/libreoffice/core/commit/?id=fabad007c60958f2ff87e8f636ff6a798ad1f963 
+ifeq "$(shell dpkg --compare-versions `icu-config --version` ge 57 && echo true)" "true"
+	export DEB_CXXFLAGS_MAINT_APPEND := -DUCHAR_TYPE=uint16_t
+endif
+export DPKG_EXPORT_BUILDFLAGS=y 
+include /usr/share/dpkg/buildflags.mk
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-werror

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libe-book.git