[PR PATCH] rott: add execinfo for musl, remove patch.

[PR PATCH] rott: add execinfo for musl, remove patch.

[ericonr]

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

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

https://github.com/ericonr/void-packages rott
https://github.com/void-linux/void-packages/pull/24216

rott: add execinfo for musl, remove patch.


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

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

From 0eb391b6ac1b1937cef71f51db76db63325f637d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 10 Aug 2020 16:58:21 -0300
Subject: [PATCH] rott: add execinfo for musl, remove patch.

---
 srcpkgs/rott/patches/no_execinfo.patch | 11 -----------
 srcpkgs/rott/template                  | 18 +++++++-----------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/rott/patches/no_execinfo.patch

diff --git a/srcpkgs/rott/patches/no_execinfo.patch b/srcpkgs/rott/patches/no_execinfo.patch
deleted file mode 100644
index 3391de78ef1..00000000000
--- a/srcpkgs/rott/patches/no_execinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rott/dosutil.c.orig	2016-07-06 16:39:54.045772922 -0400
-+++ rott/dosutil.c	2016-07-06 16:40:27.862760218 -0400
-@@ -197,7 +197,7 @@
- 	printf ("\033[m");
- }
- 
--#if !defined(__CYGWIN__) && !defined(__MINGW32__)
-+#if defined(__GLIBC__)
- #include <execinfo.h>
- 
- void print_stack (int level)
diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 428807ab076..826baba4aca 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,10 +1,11 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-makefile
+make_use_env=yes
 build_wrksrc=rott
-makedepends="SDL_mixer-devel"
+makedepends="SDL_mixer-devel SDL-devel"
 short_desc="A port of Apogee's 3D action title Rise of the Triad"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2"
@@ -12,9 +13,10 @@ homepage="http://icculus.org/rott/"
 distfiles="${homepage}/releases/rott-${version}.tar.gz"
 checksum=102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff
 
-do_build() {
-	make
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	export LDLIBS="-lexecinfo"
+fi
 
 do_install() {
 	vbin "${FILESDIR}/rott"
@@ -23,9 +25,3 @@ do_install() {
 	vinstall ../misc/rott.desktop 644 usr/share/applications
 	vinstall ../misc/rott.xpm 644 usr/share/pixmaps/rott.xpm
 }
-
-# REMARKS:
-# There is a single patch in place because a feature is optionally disabled for
-# mingw but we need it disabled for musl, since it's not in muslc.
-# The makefile is currently very nice and uses our CFLAGS and LDFLAGS without
-# any patching.

Re: [PR PATCH] [Updated] rott: add execinfo for musl, remove patch.

[ericonr]

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

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

https://github.com/ericonr/void-packages rott
https://github.com/void-linux/void-packages/pull/24216

rott: add execinfo for musl, remove patch.


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

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

From 73392769a5744ab09b00f169d2f2005fdbcff686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 10 Aug 2020 16:58:21 -0300
Subject: [PATCH] rott: add execinfo for musl, remove patch.

---
 srcpkgs/rott/patches/no_execinfo.patch | 11 -----------
 srcpkgs/rott/template                  | 20 ++++++++------------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/rott/patches/no_execinfo.patch

diff --git a/srcpkgs/rott/patches/no_execinfo.patch b/srcpkgs/rott/patches/no_execinfo.patch
deleted file mode 100644
index 3391de78ef1..00000000000
--- a/srcpkgs/rott/patches/no_execinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rott/dosutil.c.orig	2016-07-06 16:39:54.045772922 -0400
-+++ rott/dosutil.c	2016-07-06 16:40:27.862760218 -0400
-@@ -197,7 +197,7 @@
- 	printf ("\033[m");
- }
- 
--#if !defined(__CYGWIN__) && !defined(__MINGW32__)
-+#if defined(__GLIBC__)
- #include <execinfo.h>
- 
- void print_stack (int level)
diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 428807ab076..e22905e190d 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,20 +1,22 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-makefile
+make_use_env=yes
 build_wrksrc=rott
-makedepends="SDL_mixer-devel"
+makedepends="SDL_mixer-devel SDL-devel"
 short_desc="A port of Apogee's 3D action title Rise of the Triad"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://icculus.org/rott/"
 distfiles="${homepage}/releases/rott-${version}.tar.gz"
 checksum=102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff
 
-do_build() {
-	make
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	export LDLIBS="-lexecinfo"
+fi
 
 do_install() {
 	vbin "${FILESDIR}/rott"
@@ -23,9 +25,3 @@ do_install() {
 	vinstall ../misc/rott.desktop 644 usr/share/applications
 	vinstall ../misc/rott.xpm 644 usr/share/pixmaps/rott.xpm
 }
-
-# REMARKS:
-# There is a single patch in place because a feature is optionally disabled for
-# mingw but we need it disabled for musl, since it's not in muslc.
-# The makefile is currently very nice and uses our CFLAGS and LDFLAGS without
-# any patching.

Re: [PR PATCH] [Updated] rott: add execinfo for musl, remove patch.

[ericonr]

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

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

https://github.com/ericonr/void-packages rott
https://github.com/void-linux/void-packages/pull/24216

rott: add execinfo for musl, remove patch.


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

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

From 243ba4dd9eef8fd25790d238c524f1a1b2f7449b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 10 Aug 2020 16:58:21 -0300
Subject: [PATCH] rott: add execinfo for musl, remove patch.

---
 srcpkgs/rott/patches/no_execinfo.patch | 11 -----------
 srcpkgs/rott/template                  | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/rott/patches/no_execinfo.patch

diff --git a/srcpkgs/rott/patches/no_execinfo.patch b/srcpkgs/rott/patches/no_execinfo.patch
deleted file mode 100644
index 3391de78ef1..00000000000
--- a/srcpkgs/rott/patches/no_execinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rott/dosutil.c.orig	2016-07-06 16:39:54.045772922 -0400
-+++ rott/dosutil.c	2016-07-06 16:40:27.862760218 -0400
-@@ -197,7 +197,7 @@
- 	printf ("\033[m");
- }
- 
--#if !defined(__CYGWIN__) && !defined(__MINGW32__)
-+#if defined(__GLIBC__)
- #include <execinfo.h>
- 
- void print_stack (int level)
diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 428807ab076..8ed9236e672 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,20 +1,22 @@
 # Template file for 'rott'
 pkgname=rott
 version=1.1.2
-revision=1
-build_style=gnu-makefile
+revision=2
 build_wrksrc=rott
-makedepends="SDL_mixer-devel"
-short_desc="A port of Apogee's 3D action title Rise of the Triad"
+build_style=gnu-makefile
+make_use_env=yes
+makedepends="SDL_mixer-devel SDL-devel"
+short_desc="Port of Apogee's 3D action title Rise of the Triad"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://icculus.org/rott/"
 distfiles="${homepage}/releases/rott-${version}.tar.gz"
 checksum=102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff
 
-do_build() {
-	make
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	export LDLIBS="-lexecinfo"
+fi
 
 do_install() {
 	vbin "${FILESDIR}/rott"
@@ -23,9 +25,3 @@ do_install() {
 	vinstall ../misc/rott.desktop 644 usr/share/applications
 	vinstall ../misc/rott.xpm 644 usr/share/pixmaps/rott.xpm
 }
-
-# REMARKS:
-# There is a single patch in place because a feature is optionally disabled for
-# mingw but we need it disabled for musl, since it's not in muslc.
-# The makefile is currently very nice and uses our CFLAGS and LDFLAGS without
-# any patching.

Re: rott: add execinfo for musl, remove patch.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24216#issuecomment-671911106

Comment:
How to play this game?
It says about some missing files.
Not everything works with libexecinfo on musl.
fcitx bited me a while back.

Re: rott: add execinfo for musl, remove patch.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24216#issuecomment-671933347

Comment:
[i3nz.zip](https://github.com/void-linux/void-packages/files/5057096/i3nz.zip)

Should be fine to share here, it's shareware. ahesford went to the trouble of installing via dosbox to get the correct layout.

Re: rott: add execinfo for musl, remove patch.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24216#issuecomment-671933347

Comment:
[i3nz.zip](https://github.com/void-linux/void-packages/files/5057096/i3nz.zip)

Should be fine to share here, it's shareware. ahesford went to the trouble of installing via dosbox to get the correct layout.Just unpack that into `~/.rott`

Re: rott: add execinfo for musl, remove patch.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/24216#issuecomment-671959181

Comment:
I can play it, I'll assume this is good :-p

Re: [PR PATCH] [Merged]: rott: add execinfo for musl, remove patch.

[sgn]

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

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

rott: add execinfo for musl, remove patch.
https://github.com/void-linux/void-packages/pull/24216

Description: