Attachment 156316 Details for Bug 199912 – Proposed patch (since 381324 revision)

[patch] Proposed patch (since 381324 revision)

assaultcube.diff (text/plain), 5.66 KB, created by lightside on 2015-05-04 05:01:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-05-04 05:01:21 UTC

Size: 5.66 KB

patch

obsolete

>diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
>--- assaultcube.orig/Makefile	2015-03-15 15:51:06.000000000 +0400
>+++ assaultcube/Makefile	2015-05-04 06:42:11.000000000 +0400
>@@ -64,6 +64,16 @@
> 	"Game;" false
> .endif
> 
>+post-patch: .SILENT
>+	${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \
>+		/^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \
>+		s|-I/usr/include || ; \
>+		s|sdl-config|$$(SDL_CONFIG)| ; \
>+		s|$$(USRLIB)|$$(LOCALBASE)/lib| ; \
>+		/^CLIENT_LIBS=/s|$$| -lintl| ; \
>+		/^SERVER_LIBS=/s|$$| -L$$(LOCALBASE)/lib|' \
>+		${BUILD_WRKSRC}/Makefile
>+
> do-install:
> .for f in ${PLIST_FILES:Mbin/*}
> 	${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f}
>diff -ruN assaultcube.orig/files/patch-source_enet_unix.c assaultcube/files/patch-source_enet_unix.c
>--- assaultcube.orig/files/patch-source_enet_unix.c	1970-01-01 03:00:00.000000000 +0300
>+++ assaultcube/files/patch-source_enet_unix.c	2015-02-15 10:59:36.000000000 +0400
>@@ -0,0 +1,20 @@
>+--- source/enet/unix.c.orig	2013-10-22 18:57:22 UTC
>++++ source/enet/unix.c
>+@@ -97,7 +97,7 @@ enet_address_set_host (ENetAddress * add
>+     char buffer [2048];
>+     int errnum;
>+ 
>+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
>++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
>+     gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
>+ #else
>+     hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
>+@@ -150,7 +150,7 @@ enet_address_get_host (const ENetAddress
>+ 
>+     in.s_addr = address -> host;
>+ 
>+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
>++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
>+     gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
>+ #else
>+     hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);
>diff -ruN assaultcube.orig/files/patch-source_src_Makefile assaultcube/files/patch-source_src_Makefile
>--- assaultcube.orig/files/patch-source_src_Makefile	2013-11-03 09:10:47.000000000 +0400
>+++ assaultcube/files/patch-source_src_Makefile	1970-01-01 03:00:00.000000000 +0300
>@@ -1,35 +0,0 @@
>---- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
>-+++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
>-@@ -1,9 +1,7 @@
>--CXXFLAGS= -O3 -fomit-frame-pointer
>--CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
>- override CXXFLAGS+= -Wall -fsigned-char
>- 
>- PLATFORM= $(shell uname -s)
>--PLATFORM_PREFIX=native
>-+PLATFORM_PREFIX=FreeBSD
>- 
>- INCLUDES= -I. -Ibot -I../enet/include
>- 
>-@@ -22,8 +20,8 @@
>- else
>- USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
>- # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
>--CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
>--CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
>-+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
>-+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
>- endif
>- 
>- CLIENT_OBJS= \
>-@@ -87,8 +85,8 @@
>- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
>- SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
>- else
>--SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
>--SERVER_LIBS= -L../enet/.libs -lenet -lz
>-+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
>-+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
>- endif
>- 
>- SERVER_OBJS= \
>diff -ruN assaultcube.orig/files/patch-source_src_bot_bot_waypoint.cpp assaultcube/files/patch-source_src_bot_bot_waypoint.cpp
>--- assaultcube.orig/files/patch-source_src_bot_bot_waypoint.cpp	2015-03-15 15:51:06.000000000 +0400
>+++ assaultcube/files/patch-source_src_bot_bot_waypoint.cpp	2015-05-04 06:45:57.000000000 +0400
>@@ -1,5 +1,5 @@
>---- source/src/bot/bot_waypoint.cpp.orig	2013-11-10 22:50:03.000000000 +0400
>-+++ source/src/bot/bot_waypoint.cpp	2015-02-13 07:33:14.000000000 +0400
>+--- source/src/bot/bot_waypoint.cpp.orig	2013-11-10 18:50:03 UTC
>++++ source/src/bot/bot_waypoint.cpp
> @@ -848,7 +848,7 @@
>  
>       if (!pWP)
>diff -ruN assaultcube.orig/files/patch-source_src_console.h assaultcube/files/patch-source_src_console.h
>--- assaultcube.orig/files/patch-source_src_console.h	2013-10-12 21:55:50.000000000 +0400
>+++ assaultcube/files/patch-source_src_console.h	2015-05-04 06:46:34.000000000 +0400
>@@ -1,5 +1,5 @@
>---- source/src/console.h.orig	2013-10-09 12:27:31.000000000 +0400
>-+++ source/src/console.h	2013-10-11 02:23:35.000000000 +0400
>+--- source/src/console.h.orig	2013-10-09 08:27:31 UTC
>++++ source/src/console.h
> @@ -127,7 +127,7 @@
>      }
>  };
>diff -ruN assaultcube.orig/files/patch-source_src_master.cpp assaultcube/files/patch-source_src_master.cpp
>--- assaultcube.orig/files/patch-source_src_master.cpp	2013-10-12 21:55:50.000000000 +0400
>+++ assaultcube/files/patch-source_src_master.cpp	2015-05-04 06:47:04.000000000 +0400
>@@ -1,5 +1,5 @@
>---- source/src/master.cpp.orig	2013-10-09 12:27:37.000000000 +0400
>-+++ source/src/master.cpp	2013-10-11 02:26:24.000000000 +0400
>+--- source/src/master.cpp.orig	2013-10-09 08:27:37 UTC
>++++ source/src/master.cpp
> @@ -510,7 +510,7 @@
>      authreq &a = c.authreqs.add();
>      a.reqtime = servtime;

Actions: View | Diff

Attachments on bug 199912: 156316 | 156317 | 156318 | 156319