Github messages for voidlinux
 help / color / mirror / Atom feed
From: hazen2215 <hazen2215@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lifelines: fix build on musl
Date: Sun, 02 Jul 2023 12:01:08 +0200	[thread overview]
Message-ID: <20230702100108.9CBlxFmVxwrycqzE_phtBxqhtMyuX8GBSw-p67ouzYg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44783@inbox.vuxu.org>

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

There is an updated pull request by hazen2215 against master on the void-packages repository

https://github.com/hazen2215/void-packages lifelines
https://github.com/void-linux/void-packages/pull/44783

lifelines: fix build on musl
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)


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

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

From 22ee4266640f0899c86a1f38746efa0d857dc90f Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 2 Jul 2023 18:35:38 +0900
Subject: [PATCH] lifelines: fix build on musl

---
 srcpkgs/lifelines/patches/fix-musl.patch | 15 +++++++++++++++
 srcpkgs/lifelines/template               |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/lifelines/patches/fix-musl.patch

diff --git a/srcpkgs/lifelines/patches/fix-musl.patch b/srcpkgs/lifelines/patches/fix-musl.patch
new file mode 100644
index 000000000000..e17f69e2da0a
--- /dev/null
+++ b/srcpkgs/lifelines/patches/fix-musl.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gedlib/locales.c b/src/gedlib/locales.c
+index fb3badca27..c6a73b3fc7 100644
+--- a/src/gedlib/locales.c
++++ b/src/gedlib/locales.c
+@@ -414,8 +414,10 @@ notify_gettext_language_changed (void)
+ #if  WIN32_INTL_SHIM
+ 	gt_notify_language_change();
+ #else
++#ifdef __GLIBC__
+ 	extern int _nl_msg_cat_cntr;
+ 	++_nl_msg_cat_cntr;
++#endif
+ #endif
+ #endif
+ }
diff --git a/srcpkgs/lifelines/template b/srcpkgs/lifelines/template
index b8f42c2e3431..6100b593dccb 100644
--- a/srcpkgs/lifelines/template
+++ b/srcpkgs/lifelines/template
@@ -5,7 +5,6 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="bison"
 makedepends="ncurses-devel"
-archs="~*-musl" # For no reason except it keeps failing
 short_desc="Genealogy Software System"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

  reply	other threads:[~2023-07-02 10:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-02  9:40 [PR PATCH] " hazen2215
2023-07-02 10:01 ` hazen2215 [this message]
2023-07-02 10:40 ` [PR PATCH] [Updated] " hazen2215
2023-07-02 17:30 ` [PR PATCH] [Merged]: " Duncaen

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=20230702100108.9CBlxFmVxwrycqzE_phtBxqhtMyuX8GBSw-p67ouzYg@z \
    --to=hazen2215@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).