* [PR PATCH] lifelines: fix build on musl
@ 2023-07-02 9:40 hazen2215
2023-07-02 10:01 ` [PR PATCH] [Updated] " hazen2215
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: hazen2215 @ 2023-07-02 9:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There is a new 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: 1481 bytes --]
From 2eac4120cad0d71d5ce652d64eb41e91d03e9355 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..16f4a595388e
--- /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 __GLIBC__
+ #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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] lifelines: fix build on musl
2023-07-02 9:40 [PR PATCH] lifelines: fix build on musl hazen2215
@ 2023-07-02 10:01 ` hazen2215
2023-07-02 10:40 ` hazen2215
2023-07-02 17:30 ` [PR PATCH] [Merged]: " Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: hazen2215 @ 2023-07-02 10:01 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] lifelines: fix build on musl
2023-07-02 9:40 [PR PATCH] lifelines: fix build on musl hazen2215
2023-07-02 10:01 ` [PR PATCH] [Updated] " hazen2215
@ 2023-07-02 10:40 ` hazen2215
2023-07-02 17:30 ` [PR PATCH] [Merged]: " Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: hazen2215 @ 2023-07-02 10:40 UTC (permalink / raw)
To: ml
[-- 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: 1775 bytes --]
From 4e3da2e18604de5feea6da219df8ba914646e675 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 | 2 +-
2 files changed, 16 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..1a2353a0f4d0 100644
--- a/srcpkgs/lifelines/template
+++ b/srcpkgs/lifelines/template
@@ -5,13 +5,13 @@ 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"
homepage="https://github.com/lifelines/lifelines"
distfiles="https://github.com/lifelines/lifelines/releases/download/${version}/lifelines-${version}.tar.gz"
checksum=083007f81e406fce15931e5a29a7ba0380ef0b3b9c61d5eb5228ad378c7f332d
+make_check=no # times out
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: lifelines: fix build on musl
2023-07-02 9:40 [PR PATCH] lifelines: fix build on musl hazen2215
2023-07-02 10:01 ` [PR PATCH] [Updated] " hazen2215
2023-07-02 10:40 ` hazen2215
@ 2023-07-02 17:30 ` Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: Duncaen @ 2023-07-02 17:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 931 bytes --]
There's a merged pull request on the void-packages repository
lifelines: fix build on musl
https://github.com/void-linux/void-packages/pull/44783
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-02 17:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-02 9:40 [PR PATCH] lifelines: fix build on musl hazen2215
2023-07-02 10:01 ` [PR PATCH] [Updated] " hazen2215
2023-07-02 10:40 ` hazen2215
2023-07-02 17:30 ` [PR PATCH] [Merged]: " Duncaen
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).