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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B1F415802E for ; Fri, 28 Jun 2024 12:29:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA2C8E2AA8; Fri, 28 Jun 2024 12:29:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC321E2AA8 for ; Fri, 28 Jun 2024 12:29:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF1A333BEED for ; Fri, 28 Jun 2024 12:29:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AE621D7E for ; Fri, 28 Jun 2024 12:29:45 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1719577738.a286836697fc5fcd3408434ea320b0e8559f0c89.hattya@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-configure.patch dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild X-VCS-Directories: dev-libs/m17n-lib/files/ dev-libs/m17n-lib/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: a286836697fc5fcd3408434ea320b0e8559f0c89 X-VCS-Branch: master Date: Fri, 28 Jun 2024 12:29:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8afc5ddf-971a-4098-9cb2-c42535b11448 X-Archives-Hash: 4ed37c86b5d7b9e500a224200cd8edf9 commit: a286836697fc5fcd3408434ea320b0e8559f0c89 Author: Akinori Hattori gentoo org> AuthorDate: Fri Jun 28 12:26:50 2024 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Fri Jun 28 12:28:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2868366 dev-libs/m17n-lib: fix build with USE=xft Closes: https://bugs.gentoo.org/935025 Signed-off-by: Akinori Hattori gentoo.org> dev-libs/m17n-lib/files/m17n-lib-configure.patch | 8 +++++++- .../m17n-lib/{m17n-lib-1.8.4.ebuild => m17n-lib-1.8.4-r1.ebuild} | 0 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch index 90cfc774b806..12e571bd086b 100644 --- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch +++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch @@ -56,7 +56,7 @@ AC_SUBST(FRIBIDI_LD_FLAGS) dnl Check for otflib usability. -@@ -201,6 +209,9 @@ +@@ -201,11 +209,14 @@ AC_SUBST(OTF_LD_FLAGS) dnl Check for Freetype2 usability. @@ -66,6 +66,12 @@ 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; ++ 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"; @@ -220,9 +231,13 @@ ], [] diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild similarity index 100% rename from dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild rename to dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild