[gentoo-dev] [PATCH 1/3] xorg-3.eclass: pass --with-fontrootdir to configure

[gentoo-dev] [PATCH 1/3] xorg-3.eclass: pass --with-fontrootdir to configure

[Mike Gilbert]

The XORG_FONTROOTDIR autoconf macro calls pkg-config to obtain the
fontrootdir path defined in fontutil.pc.

pkgconf automatically prepends SYSROOT to variable values that start
with a "/". For installation paths, we don't want SYSROOT prepended.

Passing --with-fontrootdir bypasses the pkg-config call and avoids the
problem with SYSROOT.

Bug: https://bugs.gentoo.org/815520
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 eclass/xorg-3.eclass | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index cfa679b766c..41732e289b9 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -275,7 +275,7 @@ xorg-3_src_unpack() {
 		unpack ${A}
 	fi
 
-	[[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
+	[[ -n ${FONT} ]] && einfo "Detected font directory: ${FONT_DIR}"
 }
 
 # @FUNCTION: xorg-3_reconf_source
@@ -317,13 +317,17 @@ xorg-3_src_prepare() {
 xorg-3_font_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	# Pass --with-fontrootdir to override pkgconf SYSROOT behavior.
+	# https://bugs.gentoo.org/815520
+	if grep -q -s "with-fontrootdir" "${ECONF_SOURCE:-.}"/configure; then
+		FONT_OPTIONS+=( --with-fontrootdir="${EPREFIX}"/usr/share/fonts )
+	fi
+
 	if has nls ${IUSE//+} && ! use nls; then
 		if ! grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
 			die "--disable-all-encodings option not available in configure"
 		fi
-		FONT_OPTIONS+="
-			--disable-all-encodings
-			--enable-iso8859-1"
+		FONT_OPTIONS+=( --disable-all-encodings --enable-iso8859-1 )
 	fi
 }
 
@@ -365,6 +369,7 @@ xorg-3_src_configure() {
 	# @DEFAULT_UNSET
 	local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
 
+	local FONT_OPTIONS=()
 	[[ -n "${FONT}" ]] && xorg-3_font_configure
 
 	# Check if package supports disabling of dep tracking
@@ -388,7 +393,7 @@ xorg-3_src_configure() {
 		${dep_track}
 		${selective_werror}
 		${no_static}
-		${FONT_OPTIONS}
+		"${FONT_OPTIONS[@]}"
 		"${xorgconfadd[@]}"
 	)
 
-- 
2.33.0

[gentoo-dev] [PATCH 2/3] media-fonts/encodings: pass --with-fontrootdir to configure

[Mike Gilbert]

Bug: https://bugs.gentoo.org/815520
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 media-fonts/encodings/encodings-1.0.5-r1.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
index 3e7bceb439a..5c0f196cd64 100644
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
@@ -13,3 +13,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
+
+XORG_CONFIGURE_OPTIONS=(
+	# https://bugs.gentoo.org/815520
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+)
-- 
2.33.0

[gentoo-dev] [PATCH 3/3] media-fonts/font-alias: pass --with-fontrootdir to configure

[Mike Gilbert]

Bug: https://bugs.gentoo.org/815520
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 media-fonts/font-alias/font-alias-1.0.4.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index 39335266b55..32c3a1c9fe7 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -10,3 +10,8 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
+
+XORG_CONFIGURE_OPTIONS=(
+	# https://bugs.gentoo.org/815520
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+)
-- 
2.33.0