[PR PATCH] xmoto: fix musl build

[PR PATCH] xmoto: fix musl build

[motorto]

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

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

https://github.com/motorto/void-packages xmoto
https://github.com/void-linux/void-packages/pull/39836

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

#### Testing the changes
- I tested the changes in this PR: **Yes** , opened the app on the glibc , didn't test on musl

<!--
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - armv6l * 


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

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

From f5e01e6cd9519fd637e19d4ab6e97f34c4b92591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 9 Oct 2022 14:29:04 +0100
Subject: [PATCH] xmoto: fix musl build

---
 .../patches/fix_gettext_GNU-isms_musl.patch   | 27 +++++++++++++++++++
 srcpkgs/xmoto/template                        |  4 +--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch

diff --git a/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch b/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch
new file mode 100644
index 000000000000..f714af9e6fd7
--- /dev/null
+++ b/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch
@@ -0,0 +1,27 @@
+From 7ce512bf0242182306ceb75d7dbe2370aab838f8 Mon Sep 17 00:00:00 2001
+From: _yui <imbatman0xff@gmail.com>
+Date: Sun, 9 Oct 2022 14:48:05 +0300
+Subject: [PATCH] i18n: Don't use gettext GNU-isms with musl
+
+---
+ src/common/Locales.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/Locales.cpp b/src/common/Locales.cpp
+index 5ee395bd..680da00c 100644
+--- a/src/common/Locales.cpp
++++ b/src/common/Locales.cpp
+@@ -66,11 +66,13 @@ std::pair<std::string, std::string> Locales::changeLocale(
+           setlocale(LC_MESSAGES, NULL));
+ #endif
+ 
++#ifdef __GLIBC__
+   /* Make change known.  */
+   {
+     extern int _nl_msg_cat_cntr;
+     ++_nl_msg_cat_cntr;
+   }
++#endif
+ 
+   std::pair<std::string, std::string> locale_str(
+     locale.first == NULL ? std::string("") : std::string(locale.first),
diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template
index f54fadf9b72c..876d8307c3e9 100644
--- a/srcpkgs/xmoto/template
+++ b/srcpkgs/xmoto/template
@@ -1,10 +1,10 @@
 # Template file for 'xmoto'
 pkgname=xmoto
 version=0.6.1
-revision=2
+revision=3
 build_style=cmake
 build_helper="qemu"
-configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual"
 hostmakedepends="automake libtool gettext-devel-tools intltool desktop-file-utils"
 makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel
  libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel

Re: [PR REVIEW] xmoto: fix musl build

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39836#discussion_r990797211

Comment:
Is there a reason for this?

Re: [PR REVIEW] xmoto: fix musl build

[motorto]

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

New review comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39836#discussion_r990802385

Comment:
It appears on the instructions to build (upstream) I am assuming it removes debugs.

Re: [PR REVIEW] xmoto: fix musl build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/39836#discussion_r990806711

Comment:
the build style sets CMAKE_BUILD_TYPE=None, which should be fine usually, unless they do some weird special handling

Re: [PR PATCH] [Updated] xmoto: fix musl build

[motorto]

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

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

https://github.com/motorto/void-packages xmoto
https://github.com/void-linux/void-packages/pull/39836

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

#### Testing the changes
- I tested the changes in this PR: **Yes** , opened the app on the glibc , didn't test on musl


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - armv6l * 


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

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

From 32b4f6f41f4c9e47f4a174bfd0bbfa01466a0a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 9 Oct 2022 14:29:04 +0100
Subject: [PATCH] xmoto: fix musl build

---
 .../patches/fix_gettext_GNU-isms_musl.patch   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch

diff --git a/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch b/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch
new file mode 100644
index 000000000000..f714af9e6fd7
--- /dev/null
+++ b/srcpkgs/xmoto/patches/fix_gettext_GNU-isms_musl.patch
@@ -0,0 +1,27 @@
+From 7ce512bf0242182306ceb75d7dbe2370aab838f8 Mon Sep 17 00:00:00 2001
+From: _yui <imbatman0xff@gmail.com>
+Date: Sun, 9 Oct 2022 14:48:05 +0300
+Subject: [PATCH] i18n: Don't use gettext GNU-isms with musl
+
+---
+ src/common/Locales.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/Locales.cpp b/src/common/Locales.cpp
+index 5ee395bd..680da00c 100644
+--- a/src/common/Locales.cpp
++++ b/src/common/Locales.cpp
+@@ -66,11 +66,13 @@ std::pair<std::string, std::string> Locales::changeLocale(
+           setlocale(LC_MESSAGES, NULL));
+ #endif
+ 
++#ifdef __GLIBC__
+   /* Make change known.  */
+   {
+     extern int _nl_msg_cat_cntr;
+     ++_nl_msg_cat_cntr;
+   }
++#endif
+ 
+   std::pair<std::string, std::string> locale_str(
+     locale.first == NULL ? std::string("") : std::string(locale.first),

Re: [PR REVIEW] xmoto: fix musl build

[motorto]

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

New review comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/39836#discussion_r990808797

Comment:
Reverted

Re: [PR PATCH] [Merged]: xmoto: fix musl build

[paper42]

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

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

xmoto: fix musl build
https://github.com/void-linux/void-packages/pull/39836

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **Yes** , opened the app on the glibc , didn't test on musl


#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-glibc
  - armv6l *