From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BE4F1396D9 for ; Wed, 15 Nov 2017 19:26:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E598E0F4C; Wed, 15 Nov 2017 19:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D299E0F4B for ; Wed, 15 Nov 2017 19:26:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DAA534165D for ; Wed, 15 Nov 2017 19:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A68429BDD for ; Wed, 15 Nov 2017 19:26:29 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1510773974.ae78fd8d3ba93fff04dcd9c692f5f8c10d538003.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild X-VCS-Directories: dev-libs/m17n-lib/ dev-libs/m17n-lib/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ae78fd8d3ba93fff04dcd9c692f5f8c10d538003 X-VCS-Branch: master Date: Wed, 15 Nov 2017 19:26:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7446e9b8-6707-4abc-80f9-d99c1401bb3f X-Archives-Hash: 2da6782040f4b6962987f72f3e993787 commit: ae78fd8d3ba93fff04dcd9c692f5f8c10d538003 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Nov 15 18:17:46 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 15 19:26:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae78fd8d dev-libs/m17n-lib: Fix building with USE="X fontconfig -xft" (bug #636276). Bug: https://bugs.gentoo.org/636276 .../files/m17n-lib-1.7.0-no-freetype.patch | 46 ++++++++++++++++++++++ dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch new file mode 100644 index 00000000000..59b040c4335 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch @@ -0,0 +1,46 @@ +--- /src/font.c ++++ /src/font.c +@@ -1763,10 +1763,10 @@ + + if (format == Mx || format == Mnil) + result = xlfd_parse_name (name, font); +-#ifdef HAVE_FONTCONFIG ++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) + if (format == Mfontconfig || (result < 0 && format == Mnil)) + result = mfont__ft_parse_name (name, font); +-#endif /* HAVE_FONTCONFIG */ ++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ + return result; + } + +@@ -2352,11 +2352,11 @@ + + if (format == Mx) + name = xlfd_unparse_name (font, 1); +-#ifdef HAVE_FONTCONFIG ++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) + else if (format == Mfontconfig) + name = mfont__ft_unparse_name (font); + +-#endif /* HAVE_FONTCONFIG */ ++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ + else + MERROR (MERROR_FONT, NULL); + return name; +--- /src/font.h ++++ /src/font.h +@@ -307,10 +307,14 @@ + + extern void mfont__ft_fini (); + ++#ifdef HAVE_FONTCONFIG ++ + extern int mfont__ft_parse_name (const char *name, MFont *font); + + extern char *mfont__ft_unparse_name (MFont *font); + ++#endif /* HAVE_FONTCONFIG */ ++ + #ifdef HAVE_OTF + + extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to, diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild index 12c424df8a4..72dc298cdd0 100644 --- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild +++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}"/${PN}-gui.patch "${FILESDIR}"/${PN}-ispell.patch "${FILESDIR}"/${PN}-parallel-make.patch + "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch ) src_prepare() {