From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] enchant2: fix file conflict with enchant.
Date: Sun, 21 Feb 2021 22:47:59 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28962@inbox.vuxu.org> (raw)
[-- 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"
next reply other threads:[~2021-02-21 21:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-21 21:47 ericonr [this message]
2021-02-21 21:54 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28962@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).