Thursday, June 06, 2019

[ports-gcc] Unbreak astro/celestia (was Re: powerpc bulk build report)

On Thu, 6 Jun 2019 09:27:07 -0600 (MDT)
landry@openbsd.org wrote:

> http://build-failures.rhaalovely.net//powerpc/2019-05-19/astro/celestia.log

This one is easy - it's a (static) bool method, and ports-gcc doesn't
want NULL as a return value. It's the only problem there was, it builds
without issues [0] on macppc and amd64.

While here i've moved HOMEPAGE to https.

The runtime is good as well - notably colors aren't off :)

Charlène


[0] http://0x0.st/zuNH.txt


Index: Makefile
===================================================================
RCS file: /cvs/ports/astro/celestia/Makefile,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 Makefile
--- Makefile 20 May 2019 22:15:00 -0000 1.47
+++ Makefile 6 Jun 2019 18:57:22 -0000
@@ -3,11 +3,11 @@
COMMENT= free space simulator and planetarium

DISTNAME= celestia-1.6.1
-REVISION= 17
+REVISION= 18

CATEGORIES= astro x11

-HOMEPAGE= http://www.shatters.net/celestia/
+HOMEPAGE= https://celestia.space/

MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>

Index: patches/patch-src_celengine_parseobject_cpp
===================================================================
RCS file: patches/patch-src_celengine_parseobject_cpp
diff -N patches/patch-src_celengine_parseobject_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_celengine_parseobject_cpp 6 Jun 2019 18:57:22 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+ports-gcc fix for:
+parseobject.cpp:280:10: error: converting to 'bool' from 'std::nullptr_t'
+requires direct-initialization
+
+Index: src/celengine/parseobject.cpp
+--- src/celengine/parseobject.cpp.orig
++++ src/celengine/parseobject.cpp
+@@ -277,7 +277,7 @@ ParseStringList(Hash* table,
+ {
+ Value* v = table->getValue(propertyName);
+ if (v == NULL)
+- return NULL;
++ return false;
+
+ // Check for a single string first.
+ if (v->getType() == Value::StringType)

No comments:

Post a Comment