[arch-commits] Commit in tetrinet/trunk (PKGBUILD tetrinet-build.patch)

[Levente Polyak]

    Date: Saturday, August 29, 2015 @ 19:32:05
  Author: anthraxx
Revision: 138936

upgpkg: tetrinet 0.11-6

upgpkg: tetrinet 0.11-6

Added:
  tetrinet/trunk/tetrinet-build.patch
Modified:
  tetrinet/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 ++++---
 tetrinet-build.patch |   84 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-29 17:30:57 UTC (rev 138935)
+++ PKGBUILD	2015-08-29 17:32:05 UTC (rev 138936)
@@ -3,19 +3,21 @@
 
 pkgname=tetrinet
 pkgver=0.11
-pkgrel=5
+pkgrel=6
 pkgdesc="Multiplayer online Tetris game for up to six people"
 url="http://tetrinet.or.cz/"
 arch=('i686' 'x86_64')
 license=('Public domain')
 depends=('ncurses')
-source=(${pkgname}-${pkgver}.tar.bz2::http://tetrinet.or.cz/download/${pkgname}-${pkgver}.tar.bz2)
-sha512sums=('8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa')
+makedepends=('pkgconfig')
+source=(${pkgname}-${pkgver}.tar.bz2::http://tetrinet.or.cz/download/${pkgname}-${pkgver}.tar.bz2
+        tetrinet-build.patch)
+sha512sums=('8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa'
+            '617f41f7c64b718f036c17262faf43eb47395fcbf3163560105257257e6acc73c1306527a4293154ad520cb800da84f626f8156b3cb09381e362e566545366b0')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -r "s|(CFLAGS = .*)|\\1 ${CFLAGS}|" -i Makefile
-  sed -r "s|(\\\$@)|\\1 ${LDFLAGS} |" -i Makefile
+  patch -p1 < "${srcdir}/tetrinet-build.patch"
 }
 
 build() {

Added: tetrinet-build.patch
===================================================================
--- tetrinet-build.patch	                        (rev 0)
+++ tetrinet-build.patch	2015-08-29 17:32:05 UTC (rev 138936)
@@ -0,0 +1,84 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,4 @@
+-CC = cc
+-
+-CFLAGS = -O2 -I/usr/include/ncurses -DHAVE_IPV6 -g -Wall
++CFLAGS += -I/usr/include/ncurses -DHAVE_IPV6 -g -Wall
+ OBJS = sockets.o tetrinet.o tetris.o tty.o xwin.o
+ 
+ ### If you want to have -server tetrinet client option, comment the two lines
+@@ -24,10 +22,10 @@
+ ########
+ 
+ tetrinet: $(OBJS)
+-	$(CC) -o $@ $(OBJS) -lncurses
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(shell pkg-config --libs ncurses)
+ 
+ tetrinet-server: server.c sockets.c tetrinet.c tetris.c server.h sockets.h tetrinet.h tetris.h
+-	$(CC) $(CFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+--- a/sockets.c
++++ b/sockets.c
+@@ -66,7 +66,7 @@
+     if (c == 0xFF)
+ 	ptr--;
+     *ptr = 0;
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+@@ -89,7 +89,7 @@
+     unsigned char c = 0xFF;
+     int n = 0;
+ 
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+--- a/tetrinet.c
++++ b/tetrinet.c
+@@ -21,7 +21,7 @@
+ /*************************************************************************/
+ 
+ int fancy = 0;		/* Fancy TTY graphics? */
+-int log = 0;		/* Log network traffic to file? */
++int logging = 0;		/* Log network traffic to file? */
+ char *logname;		/* Log filename */
+ int windows_mode = 0;	/* Try to be just like the Windows version? */
+ int noslide = 0;	/* Disallow piece sliding? */
+@@ -82,8 +82,7 @@
+ 	    else
+ 		winlist[i].team = 0;
+ 	    s++;
+-	    strncpy(winlist[i].name, s, sizeof(winlist[i].name)-1);
+-	    winlist[i].name[sizeof(winlist[i].name)] = 0;
++	    snprintf(winlist[i].name, sizeof(winlist[i].name), "%s", s);
+ 	    winlist[i].points = atoi(t);
+ 	    if ((t = strchr(t, ';')) != NULL)
+ 		winlist[i].games = atoi(t+1);
+@@ -590,7 +589,7 @@
+ 	    if (strcmp(av[i], "-fancy") == 0) {
+ 		fancy = 1;
+ 	    } else if (strcmp(av[i], "-log") == 0) {
+-		log = 1;
++		logging = 1;
+ 		i++;
+ 		if (i >= ac) {
+ 		    fprintf(stderr, "Option -log requires an argument\n");
+--- a/tetrinet.h
++++ b/tetrinet.h
+@@ -74,7 +74,7 @@
+ /* Externs */
+ 
+ extern int fancy;
+-extern int log;
++extern int logging;
+ extern char *logname;
+ extern int windows_mode;
+ extern int noslide;