From patchwork Mon Mar 6 05:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 47729 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C155116D7C; Mon, 6 Mar 2023 05:58:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA0E716D66 for ; Mon, 6 Mar 2023 05:58:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ3rL-0008RS-MQ; Mon, 06 Mar 2023 00:58:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZ3rH-0008O2-Cj for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ3rG-0008GU-DQ for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZ3rG-0008DA-9E for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61994] [PATCH 1/2] gnu: m17n-db: fix cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 05:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61994@debbugs.gnu.org Received: via spool by 61994-submit@debbugs.gnu.org id=B61994.167808227131515 (code B ref 61994); Mon, 06 Mar 2023 05:58:02 +0000 Received: (at 61994) by debbugs.gnu.org; 6 Mar 2023 05:57:51 +0000 Received: from localhost ([127.0.0.1]:41136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZ3r5-0008CA-47 for submit@debbugs.gnu.org; Mon, 06 Mar 2023 00:57:51 -0500 Received: from out203-205-221-202.mail.qq.com ([203.205.221.202]:42944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pZ3r0-0008BE-3Y for 61994@debbugs.gnu.org; Mon, 06 Mar 2023 00:57:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1678082257; bh=17mCU6mVCjEa1ic67FyHg+4EIFh4gDBn1lQd0zfy/5g=; h=From:To:Subject:Date:In-Reply-To:References; b=d8bC7jAj1S1va1l33dpJADZPsA8NQgZSkmMhP1u0PCnIHDY+ECxiJpUsM7enyNKgW 3HdHZ8ImVUg0Ie/XMnJSM2eRnQXE1MqtFvkXha3hZWiirno0amr7G7XU0u41A+SmWS 8ScuoQKjlQgvA5vD2izBlAfX7m5UJO1+6fGXC+Hc= Received: from localhost.localdomain ([111.0.51.52]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id E642FCEE; Mon, 06 Mar 2023 13:57:36 +0800 X-QQ-mid: xmsmtpt1678082256tp96z7i45 Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTP6orm1oCdo/et4OhCnJvy9YvZBaiZX4dSJNwjIWmKGF5HFmYYP 0HsmHH1+PT2ZBY9UlakBOwZqyxVoaWFFLwqnm3yYRfvVu5b93/ivdO02RwxutxRbu/cUEUykCbMh 9DD03wrH9LeBKyoZ0DH9qS9fDlvzukuQk70TcC+QWdnd5Vfyb0Wg56xkVCgNjF0is6vPcQEKK6Xj xIhYug2NzYPt5zOE5UusGUTqogb9DOMlNhEfkMgovWtnaYOMGSQSlDwLXQQFG24U60mxq2h9Kgyg smhJeBZO5eS4zo4K1/XwUL5BKbEHt08t2izQ/KgBgzPV5eJVNpibxTJtqEWnE3titcshFAemhVXq 41JmBj9x0Vz3JU1cqL8EKMG9pEq1hdN1iipOsNRUeAqRyfoujoSRaTFHlR5TErKJCVWjrSRd1rjJ 9MmuSatzfoZxGjV12ipqZj5s+uBzbd+GCMFe42IRLgJRxhG657KOsSgV8M6DZ0EG93dNIIYyyzk3 VV/5bf8AqSdYPd04/XqDgIaAeJg0JGbNdmSxda43lhaacIvkTUL3SIYYCNRt6acdZz9sIZm/HIEE 9A8wkQvfW6CEqsTvWEnEHWWvmX2GYNZ8Ey/KZRhi0d3qofPk/StipyvCT0TOt4n897r3wc1FLsvb fD66n6CWZmoQLBVEQiyUXYkGdf39oB9VUM9BiYGTa9CW1DXU4McgcRa/7ClHwxBE1oZAHJMAuZAB WjVMD0hpZPN6DMsGV9ww0v2zNUEV6WIru35HmbCt+niRwDmcumuuY3mDYmLI8hQLYhnTzhFfM/Jh X2q3hvy0XW/du5k2d3yMbHFN2af2U8QVcRMRKpOwP/anY04DEVC3HwYUTFMHYN7isy9iDX4XlauV L9lFBRxoMkPZ70wnyJcIrSKpXIo37zfe54zoHCiaHPq4Zs2QHByia/OlzmYU0lvg== Date: Mon, 6 Mar 2023 13:57:34 +0800 X-OQ-MSGID: <1e49fa575f3825e8a6acf829e723aa1d0d54e114.1678080942.git.873216071@qq.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm(m17n-db): fix cross-compile. [inputs]: move gettext-minimal to ... [native-inputs]: ... here --- gnu/packages/emacs.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 953aad961c..3754b79ef0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Declan Tsien +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -587,7 +588,7 @@ (define-public m17n-db (base32 "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5")))) (build-system gnu-build-system) - (inputs + (native-inputs `(("gettext" ,gettext-minimal))) (arguments `(#:configure-flags From patchwork Mon Mar 6 05:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 47730 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6BDC616D6E; Mon, 6 Mar 2023 05:58:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAABB16D66 for ; Mon, 6 Mar 2023 05:58:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZ3rK-0008P0-GU; Mon, 06 Mar 2023 00:58:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZ3rH-0008O1-CI for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZ3rG-0008GR-3n for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZ3rF-0008D3-Tl for guix-patches@gnu.org; Mon, 06 Mar 2023 00:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61994] [PATCH 2/2] gnu: m17n-lib: fix cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 05:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61994@debbugs.gnu.org Received: via spool by 61994-submit@debbugs.gnu.org id=B61994.167808227131509 (code B ref 61994); Mon, 06 Mar 2023 05:58:01 +0000 Received: (at 61994) by debbugs.gnu.org; 6 Mar 2023 05:57:51 +0000 Received: from localhost ([127.0.0.1]:41134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZ3r4-0008C5-8b for submit@debbugs.gnu.org; Mon, 06 Mar 2023 00:57:51 -0500 Received: from out203-205-221-239.mail.qq.com ([203.205.221.239]:39255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pZ3r1-0008BF-7B for 61994@debbugs.gnu.org; Mon, 06 Mar 2023 00:57:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1678082258; bh=2jVEp6rWAzp/QIRzy7ZWJ4kyPRt0DgeaSbPn4oIJhk4=; h=From:To:Subject:Date:In-Reply-To:References; b=sypXNHiqmuwSkATufSQX+N2O8L0V2IilklcqFRdKfEV2LblreGUFK+WV8fmjZZGmW tANo3T4yh9suX2zWUapqcyyrwqCgwhi4xdBMrTnJTkQHQJCLcSh1fBSjkfw2wP2u6X kUnOZnoD8LFwfdtTl/YUzRZyAaBR8rcJ/2oeLm7w= Received: from localhost.localdomain ([111.0.51.52]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id E642FCEE; Mon, 06 Mar 2023 13:57:36 +0800 X-QQ-mid: xmsmtpt1678082257t39vd20x2 Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeieBLm0N9sA9Py416Pll6ZuKKY59wN8ZEwPNRXFwftkmWFqlBnYPo BbZShTNJJwoK4RQD4zDawGNc9g7ocA7Do2U809yL6HU6hJxxHHpsoliiGvxojxiu90N/4+aqCq4w HGPFxv3I0XTsiFCGyysJZqx/EGpXx/t6SPrFLrFoVAvEi2xOcVhi3UDE/FIiaUA0nB582DKB2i+q TDmQgH8DAZyXUCK2N0tE0K264sBpT10eSUcW2+ANep+B9mrlKAsNn0VkkxCxL6drgwPFRMhLjP3y O1lefG7uiTrMFKDgaRuSFkBEFgfVroa1AXUDgT23WmG3bTLOAtaXluhdWDXFP+m3MpKhM4gzDcJD 2x2kz2iqM1wqS3cyZZzdNouSCm3AsdupntNCaka57S5CYlLFke/sKBIWHDqCNmaUK/IZt1krGFCK CTUTGm68B80aNE5ub9Im1DbNdAaZkDXuSJ49HW57S7EmT/YZyzUv1Ut1YhAI3aRgwDv1oH2IxK4k IsMj3oc+ELhxTrZ+UFEO0W2mKEpUhIUblBFljgQ1RF5QJJSSGxDIYx+yoqsf2+Xefb3fGvUL6uNA bKHMn+2GQKGOj+dXVbC9fqqxtUhdsvkD7J2Eurpn/Vk0Bhd4tC5WE5K6jRV53zto3CadTnd+5bZu a0WRBb2s3wspQ+BY4qX6ZLGhtmFVRj5Ge8ypuhwAweuMzU0zCRDoa7U06EaxuNyNTvd8oDgf6g/M chk7o8YrZWCK8sYTQbm+sszAoo3dWie9skwi71/sx4PnoCIhc9SuPTI5ECMzfuoM8NnQ15QljHHp ZJninu4kNbYhxvlM700/ziGNAyaj428QFA8DPR4ELPfDv1TrI6ZFLZZQwFHRjZmt9pQDz2pe0h2P N8XjzJQ0yVKAzrRsxOQ0QYTFEm6Ywn6aYhbnFeruCXkXbWAYi+TmNBtYx7Y/DhClIdg8hTc0s23L YpkBocw2c= Date: Mon, 6 Mar 2023 13:57:35 +0800 X-OQ-MSGID: <808db977a122b49cddf56a06d980d168b99d017e.1678080942.git.873216071@qq.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/local.mk: add m17n-lib-1.8.0-use-pkg-config-for-freetype.patch. * gnu/packages/emacs.scm(m17n-lib): [source]: add m17n-lib-1.8.0-use-pkg-config-for-freetype.patch. [native-inputs]: when cross-compile add pkg-config, libtool, gettext-minimal, autoconf, automake. [arguments]: when cross-compile, add phase to fix rpl_malloc undefined references. * gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch: new file. --- gnu/local.mk | 2 + gnu/packages/emacs.scm | 25 +++- ...ib-1.8.0-use-pkg-config-for-freetype.patch | 125 ++++++++++++++++++ 3 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07a7a0f527..1e98792f54 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -56,6 +56,7 @@ # Copyright © 2022 Alex Griffin # Copyright © 2022 ( # Copyright © 2022 jgart +# Copyright © 2023 Zheng Junjie <873216071@qq.com> # # This file is part of GNU Guix. # @@ -1560,6 +1561,7 @@ dist_patch_DATA = \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ + %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \ %D%/packages/patches/nautilus-extension-search-path.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncftp-reproducible.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3754b79ef0..194c77fea4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -621,8 +621,16 @@ (define-public m17n-lib version ".tar.gz")) (sha256 (base32 - "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")))) + "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")) + (patches (search-patches "m17n-lib-1.8.0-use-pkg-config-for-freetype.patch")))) (build-system gnu-build-system) + (native-inputs + (if (%current-target-system) + (list pkg-config + libtool + gettext-minimal + autoconf automake) + '())) (inputs (list fribidi gd @@ -631,7 +639,20 @@ (define-public m17n-lib libxml2 m17n-db)) (arguments - `(#:parallel-build? #f)) + `(#:parallel-build? #f + ,@(if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + ;; AC_FUNC_MALLOC and AC_FUNC_REALLOC usually unneeded + ;; see https://lists.gnu.org/archive/html/autoconf/2003-02/msg00017.html + (add-after 'unpack 'fix-rpl_malloc + (lambda _ + (substitute* "configure.ac" + (("AC_FUNC_MALLOC") "") + (("AC_FUNC_REALLOC") "")) + ;; let bootstrap phase run. + (delete-file "./configure"))))) + '()))) ;; With `guix lint' the home-page URI returns a small page saying ;; that your browser does not handle frames. This triggers the "URI ;; returns suspiciously small file" warning. diff --git a/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch b/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch new file mode 100644 index 0000000000..38c311bee5 --- /dev/null +++ b/gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch @@ -0,0 +1,125 @@ +backport from upstream. + +From b468fc95150b7ca0e766e7c385a60879e65322d4 Mon Sep 17 00:00:00 2001 +From: "K. Handa" +Date: Tue, 23 Oct 2018 00:05:46 +0900 +Subject: Use pkg-config for freetype, use %p to print a pointer + +--- + ChangeLog | 5 +++++ + configure.ac | 48 +++++++++++++++++++----------------------------- + src/ChangeLog | 5 +++++ + src/chartab.c | 4 ++-- + 4 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index b069d89..9dfc0b0 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2018-10-22 K. Handa ++ ++ * configure.ac: Do not use the program freetype-config, use ++ PKG_CHECK_MODULES for checking freetype2. ++ + 2018-02-08 K. Handa + + Version 1.8.0 released. +diff --git a/configure.ac b/configure.ac +index 7f8b08e..3516bad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,36 +204,26 @@ fi + AC_SUBST(OTF_LD_FLAGS) + + dnl Check for Freetype2 usability. +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` +- save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" +- AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, +- HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") +- if test "x$HAVE_FREETYPE" = "xyes" ; then +- save_LIBS="$LIBS" +- LIBS="$LIBS `freetype-config --libs`" +- AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, +- HAVE_FREETYPE=no) +- LIBS="$save_LIBS" +- if test "x$HAVE_FREETYPE" = "xyes"; then +- FREETYPE_LD_FLAGS=`freetype-config --libs` +- AC_DEFINE(HAVE_FREETYPE, 1, +- [Define to 1 if you have FreeType library and header file.]) +- M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" +- AC_CHECK_HEADER(freetype/ftbdf.h, HAVE_FTBDF_H=yes, HAVE_FTBDF_H=no, +- [#include ++PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes], ++ [HAVE_FREETYPE=no]) ++AS_IF([test "x$HAVE_FREETYPE" = "xyes"], ++ [CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"; ++ FREETYPE_LD_FLAGS=FREETYPE_LIBS; ++ AC_DEFINE([HAVE_FREETYPE], [1], ++ [Define to 1 if you have FreeType library and header file.]) ++ M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"; ++ AC_CHECK_HEADER([freetype/ftbdf.h], [HAVE_FTBDF_H=yes], [HAVE_FTBDF_H=no], ++ [#include + #include FT_FREETYPE_H]) +- if test "x$HAVE_FTBDF_H" = "xyes"; then +- AC_DEFINE(HAVE_FTBDF_H, 1, +- [Define to 1 if you have freetype/ftbdf.h.]) +- fi +- CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE" +- fi +- fi +-fi +-AC_SUBST(FREETYPE_LD_FLAGS) ++ AS_IF([test "x$HAVE_FTBDF_H" = "xyes"], ++ [AC_DEFINE([HAVE_FTBDF_H], [1], ++ [Define to 1 if you have freetype/ftbdf.h.])], ++ []) ++ CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_FREETYPE" ++ ], ++ [] ++ ) ++AC_SUBST([FREETYPE_LD_FLAGS]) + + dnl Check for Xft2 usability. + save_CPPFLAGS="$CPPFLAGS" +diff --git a/src/ChangeLog b/src/ChangeLog +index ee28ea6..8cb91c1 100644 +--- a/src/ChangeLog ++++ b/src/ChangeLog +@@ -1,3 +1,8 @@ ++2018-10-22 K. Handa ++ ++ * chartab.c (dump_sub_chartab): Use %p directive to print a ++ pointer value. ++ + 2018-02-08 K. Handa + + Version 1.8.0 released. +diff --git a/src/chartab.c b/src/chartab.c +index d58aa65..8aeb6d7 100644 +--- a/src/chartab.c ++++ b/src/chartab.c +@@ -558,7 +558,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value, + fprintf (mdebug__output, "(default nil)"); + } + else +- fprintf (mdebug__output, "(default #x%X)", (unsigned) table->default_value); ++ fprintf (mdebug__output, "(default #x%p)", table->default_value); + + default_value = table->default_value; + if (table->contents.tables) +@@ -589,7 +589,7 @@ dump_sub_chartab (MSubCharTable *table, void *default_value, + fprintf (mdebug__output, "nil)"); + } + else +- fprintf (mdebug__output, " #xx%X)", (unsigned) default_value); ++ fprintf (mdebug__output, " #x%p)", default_value); + } + } + fprintf (mdebug__output, ")"); +-- +cgit v1.1 +