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

Rene Engelhard rene at moszumanska.debian.org
Thu May 25 20:09:00 UTC 2017


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

rene pushed a commit to branch experimental
in repository libcdr.

commit 0e665cbfe3840de9aa1c380ab67d68cf94c824fd
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu May 25 22:06:33 2017 +0200

    build with -DUCHAR_TYPE=uint16_t with ICU 59
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b1359bb..ec69cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcdr (0.1.3-4) 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
+
 libcdr (0.1.3-3) unstable; urgency=medium
 
   * [2996e2e] add missing libicu-dev to libcdr-devs Depends:
diff --git a/debian/rules b/debian/rules
index 84de501..ed6de44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,13 @@ endif
 
 CONFIGURE_FLAGS += --disable-werror --docdir=/usr/share/doc/libcdr-doc --without-docs
 
+# see https://cgit.freedesktop.org/libreoffice/core/commit/?id=fabad007c60958f2ff87e8f636ff6a798ad1f963 
+ifeq "$(shell dpkg --compare-versions `icu-config --version` ge 59 && echo true)" "true"
+	export DEB_CXXFLAGS_MAINT_APPEND := -DUCHAR_TYPE=uint16_t
+endif
+export DPKG_EXPORT_BUILDFLAGS=y 
+include /usr/share/dpkg/buildflags.mk
+
 %:
 	dh $@ --with autoreconf
 

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



More information about the Pkg-openoffice-commits mailing list