[PR PATCH] enchant2: fix file conflict with enchant.

[PR PATCH] enchant2: fix file conflict with enchant.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages enchant
https://github.com/void-linux/void-packages/pull/28962

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.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28962.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-enchant-28962.patch --]
[-- Type: text/x-diff, Size: 1330 bytes --]

From 0f5986b6e5118257c313d7db809b577e6c54b32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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"

Re: [PR PATCH] [Merged]: enchant2: fix file conflict with enchant.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]

There's a merged pull request on the void-packages repository

enchant2: fix file conflict with enchant.
https://github.com/void-linux/void-packages/pull/28962

Description:
Reverts a change made in 1d79784495195cff12559a53ff387f32e12a6dc8 that
removed the make args. Also add explanation for why the make arguments
are necessary.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->