[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[texlive-bin] 01/03: add patches to fix ICU dropping icu-config



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

preining pushed a commit to branch master
in repository texlive-bin.

commit f8bbba482578b8bcd4aac1093da8508cf63f1cf3
Author: Norbert Preining <preining@debian.org>
Date:   Thu Dec 7 23:53:31 2017 +0900

    add patches to fix ICU dropping icu-config
---
 debian/patches/icu-pkg-config | 23 +++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/icu-pkg-config b/debian/patches/icu-pkg-config
new file mode 100644
index 0000000..a56d208
--- /dev/null
+++ b/debian/patches/icu-pkg-config
@@ -0,0 +1,23 @@
+---
+ m4/kpse-icu-flags.m4 |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- texlive-bin.orig/m4/kpse-icu-flags.m4
++++ texlive-bin/m4/kpse-icu-flags.m4
+@@ -49,11 +49,15 @@
+ AC_DEFUN([KPSE_ICU_SYSTEM_FLAGS], [dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+ AC_CHECK_TOOL([ICU_CONFIG], [icu-config], [false])[]dnl
++AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
+ if $ICU_CONFIG --version >/dev/null 2>&1; then
+   ICU_INCLUDES=`$ICU_CONFIG --cppflags`
+   ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath m4_ifset([kpse_icu_config_args],
+                                                       [kpse_icu_config_args ])--ldflags-libsonly --ldflags-system`
++elif $PKG_CONFIG --libs icu-uc icu-io >/dev/null 2>&1; then
++  ICU_INCLUDES=`$PKG_CONFIG --cflags icu-uc icu-io`
++  ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io`
+ elif test "x$need_icu:$with_system_icu" = xyes:yes; then
+-  AC_MSG_ERROR([did not find icu-config required for system icu libraries])
++  AC_MSG_ERROR([did not find icu-config or pkg-config required for system icu libraries])
+ fi
+ ]) # KPSE_ICU_SYSTEM_FLAGS
diff --git a/debian/patches/series b/debian/patches/series
index 74145d7..51d381f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ upstream-reproducible-pdf-ids
 #poppler-0.59-api-change
 # this patch is from HT and arch linux and tested in Debian
 poppler-0.59.patch
+icu-pkg-config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git


Reply to: