From 0f5986b6e5118257c313d7db809b577e6c54b32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 21 Feb 2021 18:46:02 -0300 Subject: [PATCH] enchant2: fix file conflict with enchant. Reverts a change made in 1d79784495195cff12559a53ff387f32e12a6dc8 that removed the make args. Also add explanation for why the make arguments are necessary. --- srcpkgs/enchant2/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template index d3f9c9d1ad8..5bb08e5c563 100644 --- a/srcpkgs/enchant2/template +++ b/srcpkgs/enchant2/template @@ -1,9 +1,16 @@ # Template file for 'enchant2' pkgname=enchant2 version=2.2.15 -revision=1 +revision=2 wrksrc="enchant-${version}" build_style=gnu-configure +# so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering; +# might be a bug in their build system that only this directory and/or file aren't +# suffixed appropriately. +# passing this in make is safe because this is the value used to define the macro +# that their code uses to find enchant.ordering +make_build_args="pkgdatadir=/usr/share/enchant-2" +make_install_args="$make_build_args" # tests need --enable-relocatable configure_args="--enable-relocatable" hostmakedepends="pkg-config"