[libreoffice] 01/01: debian/patches/icu-no-icu-config.diff: don't use icu-config for determining the ICU version

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit d19f5c12f1b25e2b0eff9fd6c55eb5d1bb163be8
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Sep 17 13:00:54 2017 +0200

    debian/patches/icu-no-icu-config.diff: don't use icu-config for determining the ICU version
---
 changelog                      |  2 ++
 patches/icu-no-icu-config.diff | 24 ++++++++++++++++++++++++
 patches/series                 |  1 +
 3 files changed, 27 insertions(+)

diff --git a/changelog b/changelog
index e2c8e2b..04b7e3f 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:5.4.1-2) unstable; urgency=medium
 
   * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
     says, from libreoffice-5-4 branch (closes: #874196)
+  * debian/patches/icu-no-icu-config.diff: don't use icu-config for
+    determining the ICU version; doesn't exist in (Debians) ICU 59.1 anymore
 
   * debian/rules:
     - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
diff --git a/patches/icu-no-icu-config.diff b/patches/icu-no-icu-config.diff
new file mode 100644
index 0000000..1ea6e03
--- /dev/null
+++ b/patches/icu-no-icu-config.diff
@@ -0,0 +1,24 @@
+--- a/configure.ac	2017-09-17 11:56:12.000000000 +0200
++++ b/configure.ac	2017-09-17 12:53:33.173176247 +0200
+@@ -9004,7 +9035,7 @@
+         AC_PATH_PROG(ICUCONFIG,icu-config)
+ 
+         AC_MSG_CHECKING([ICU version])
+-        ICU_VERSION=`$ICUCONFIG --noverify --version 2>/dev/null || $ICUCONFIG --version`
++        ICU_VERSION=`$PKG_CONFIG --modversion icu-i18n 2>/dev/null`
+         ICU_MAJOR=`echo $ICU_VERSION | cut -d"." -f1`
+         ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2`
+ 
+@@ -9016,8 +9047,7 @@
+     fi
+ 
+     if test "$cross_compiling" = "yes" -a \( "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" \); then
+-        AC_PATH_PROG([ICUCONFIG_FOR_BUILD], [icu-config], [], [$PATH:/usr/sbin:/sbin])
+-        ICU_VERSION_FOR_BUILD=`$ICUCONFIG_FOR_BUILD --noverify --version 2>/dev/null || $ICUCONFIG_FOR_BUILD --version`
++        ICU_VERSION_FOR_BUILD=`$PKG_CONFIG --modversion icu-i18n 2>/dev/null`
+         ICU_MAJOR_FOR_BUILD=`echo $ICU_VERSION_FOR_BUILD | cut -d"." -f1`
+         ICU_MINOR_FOR_BUILD=`echo $ICU_VERSION_FOR_BUILD | cut -d"." -f2`
+         AC_MSG_CHECKING([if MinGW and system versions of ICU are compatible])
+ fi
+ 
+ dnl ===================================================================
diff --git a/patches/series b/patches/series
index 8ad0e5b..0b66a1e 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ gb_SUPPRESS_TESTS.diff
 stop-shipping-mimelnk-desktop-files.diff
 java9.diff
 make-helpimg-not-selectable-as-iconset.diff
+icu-no-icu-config.diff

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