On Sat, 16 Nov 2024 15:23:12 -0500 Thomas Frohwein <tfrohw...@fastmail.com> wrote:
> On Wed, 13 Nov 2024 18:16:28 -0600 > izzy Meyer <izder...@disroot.org> wrote: > > > On Fri, 25 Oct 2024 12:22:18 -0500 > > izzy Meyer <izder...@disroot.org> wrote: > > > > > On Tue, 15 Oct 2024 16:28:16 -0500 > > > izzy Meyer <izder...@disroot.org> wrote: > > > > > > > Hello ports@! > > > > > > > > PING! > > > > > > > > Turns out OpenBSD uses backtrace from -lexecinfo and upstream > > > > introduced a bug before releasing 1.3.7 that unintentionally > > > > broke -lexecinfo linking on OpenBSD targets. > > > > > > > > After a little back-and-forth with the dev on discord as well as > > > > in a GitHub PR, we decided to merge a new patch that introduces > > > > a LINK variable in the Makefile to future proof other platforms > > > > who may not link to _Unwind correctly out of the gate to make > > > > porting in the future easier: > > > > > > > > https://github.com/ClassiCube/ClassiCube/pull/1281 > > > > > > > > This patch updates games/classicube to 1.3.7 and backports the > > > > patch fixing the -lexecinfo bug introduced by upstream. > > > > > > > > I'd say I'm satisfied enough to get this in our tree? Any > > > > committers want to merge if no objections? > > > > > > > > Diff is attached. > > > > > > > > Peace- > > > > > > > > > > Ping! > > > > Attached. > > > > You've attached a tarball, and the files in it seem to be identical to > what's currently already in the ports tree. Preferred format for port > updates is a diff. > Whoops, let me send you the right diff I was tired sending that last mail. Sorry -- iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org
diff --git Makefile Makefile
index ff38e16fe..3137a1d09 100644
--- Makefile
+++ Makefile
@@ -3,10 +3,10 @@ BROKEN-sparc64 = ...error "Unknown CPU architecture"
COMMENT = classic Minecraft client written in C
-V = 1.3.6
+V = 1.3.7
PKGNAME = classicube-${V}
-DIST_TUPLE += github ClassiCube ClassiCube 1.3.6 .
+DIST_TUPLE += github ClassiCube ClassiCube ${V} .
CATEGORIES = games
@@ -27,6 +27,9 @@ USE_GMAKE = Yes
ALL_TARGET = ClassiCube
+pre-configure:
+ @sed -i 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/classicube
${INSTALL_PROGRAM} ${WRKSRC}/ClassiCube ${PREFIX}/share/classicube/classicube_run
diff --git distinfo distinfo
index 4134473be..559ddbeb7 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ClassiCube-ClassiCube-1.3.6.tar.gz) = +reA9NzwZpoPlGg8m2WW9Ay4PglyejuRqq5ek0qXQLA=
-SIZE (ClassiCube-ClassiCube-1.3.6.tar.gz) = 2490780
+SHA256 (ClassiCube-ClassiCube-1.3.7.tar.gz) = BPlusswzi4GjaoQ7fR8j3lTvU5qA0reTu+9pqpBDWF8=
+SIZE (ClassiCube-ClassiCube-1.3.7.tar.gz) = 3717504
diff --git patches/patch-src_Logger_c patches/patch-src_Logger_c
new file mode 100644
index 000000000..ce23d4aa5
--- /dev/null
+++ patches/patch-src_Logger_c
@@ -0,0 +1,12 @@
+Index: src/Logger.c
+--- src/Logger.c.orig
++++ src/Logger.c
+@@ -403,7 +403,7 @@ void Logger_Backtrace(cc_string* trace, void* ctx) {
+ }
+ #elif defined CC_BACKTRACE_BUILTIN
+ /* Implemented later at end of the file */
+-#elif defined CC_BUILD_POSIX && defined _GLIBC_
++#elif defined CC_BUILD_POSIX && (defined _GLIBC_ || defined CC_BUILD_OPENBSD)
+ #include <execinfo.h>
+
+ void Logger_Backtrace(cc_string* trace, void* ctx) {
pgpc3DDcJD7Ux.pgp
Description: OpenPGP digital signature
