Update to spacezero-0.86.01.

This commit is contained in:
ajacoutot
2023-04-22 18:35:37 +00:00
parent 936d4cadf5
commit 66f8a4202d
5 changed files with 19 additions and 29 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
COMMENT = 2D RTS space combat game
DISTNAME = spacezero-0.86.00
DISTNAME = spacezero-0.86.01
CATEGORIES = games x11
REVISION = 2
HOMEPAGE = http://spacezero.sourceforge.net/
@@ -12,7 +12,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender alut atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 harfbuzz intl m openal pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pthread vorbisfile z
WANTLIB += pangoft2-1.0 pthread vorbisfile
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=spacezero/}
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (spacezero-0.86.00.tar.gz) = UZntCwCEMJL61ZSdJ/0M9hLtVJGOqDwhqDvMmhCmxmU=
SIZE (spacezero-0.86.00.tar.gz) = 2317283
SHA256 (spacezero-0.86.01.tar.gz) = hYinMFHjXjXm2RI7W+s581dGI8ZOjcTzO05PMAO3MpY=
SIZE (spacezero-0.86.01.tar.gz) = 2317419
+13 -9
View File
@@ -1,19 +1,23 @@
Sent upstream.
--- Makefile.orig Sat Dec 21 07:57:43 2013
+++ Makefile Sat Dec 21 19:39:28 2013
@@ -26,7 +26,7 @@ GTKLIBS=`pkg-config --libs gtk+-2.0`
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -31,7 +31,7 @@ GTKLIBS=`$(PKG_CONFIG) --libs gtk+-2.0`
GTKLIBS12=`gtk-config --cflags`
GTKFLAGS12=`gtk-config --libs`
-CFLAGS= -Wall -O3 --pedantic -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\"
+CFLAGS += -Wall --pedantic -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\"
LDFLAGS= -lm -lpthread $(SOUNDFLAGS) $(GTKLIBS)
-CFLAGS= -Wall --pedantic -fno-common -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\"
+CFLAGS += -Wall --pedantic -fno-common -I./include -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\"
LDFLAGS= $(SOUNDFLAGS) $(GTKLIBS) -lX11 -lm -lpthread
# DEB pkg
@@ -84,4 +84,4 @@ mrproper: clean
CFLAGS12= -Wall -I./include -DGTK12 -DDATADIR=\"$(DATADIR)\" -DINSTALL_DATA_DIR=\"$(INSTALL_DATA_DIR)\"
@@ -97,7 +97,7 @@ mrproper: clean
rm -f src/*~ include/*~
.c.o:
- $(CC) $(CFLAGS) $(LDFLAGS) $(GTKFLAGS) -c $< -o $@
-# $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
# add -pg for profile
# $(CC) -pg $(CFLAGS) $(GTKFLAGS) -c $< -o $@
# add -g for debug
+1 -1
View File
@@ -3,7 +3,7 @@ Fix for -fno-common
Index: include/snow.h
--- include/snow.h.orig
+++ include/snow.h
@@ -29,13 +29,6 @@
@@ -32,13 +32,6 @@
#include "objects.h"
@@ -1,14 +0,0 @@
Fix for -fno-common
Index: src/spacecomm.c
--- src/spacecomm.c.orig
+++ src/spacecomm.c
@@ -63,7 +63,7 @@ SENDOBJUNMOD0
#define SENDORDERS 1
extern struct HeadObjList listheadobjs;
-struct TextMessageList listheadtext;
+extern struct TextMessageList listheadtext;
extern struct CharListHead gameloglist; /* list of all game messages */
extern struct Window windowgamelog;
extern struct Habitat habitat;