Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/dzip/files/
Date: Sat, 03 Dec 2016 11:38:20
Message-Id: 1480765071.c2a6a9b9ae8774c9cf057a6efceaf3ee81932a46.chewi@gentoo
1 commit: c2a6a9b9ae8774c9cf057a6efceaf3ee81932a46
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Nov 26 18:23:49 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 3 11:37:51 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a6a9b9
7
8 games-util/dzip: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/2920
11
12 games-util/dzip/files/dzip-2.9-system-zlib.patch | 52 ------------------------
13 1 file changed, 52 deletions(-)
14
15 diff --git a/games-util/dzip/files/dzip-2.9-system-zlib.patch b/games-util/dzip/files/dzip-2.9-system-zlib.patch
16 deleted file mode 100644
17 index f68304a..00000000
18 --- a/games-util/dzip/files/dzip-2.9-system-zlib.patch
19 +++ /dev/null
20 @@ -1,52 +0,0 @@
21 ---- dzip.h
22 -+++ dzip.h
23 -@@ -2,7 +2,7 @@
24 - #include <stdlib.h>
25 - #include <string.h>
26 -
27 --#include "zlib/zlib.h"
28 -+#include <zlib.h>
29 -
30 - typedef unsigned char uchar;
31 -
32 -@@ -177,4 +177,4 @@
33 - #else
34 - #define DIRCHAR '/'
35 - #define WRONGCHAR '\\'
36 --#endif
37 -\ No newline at end of file
38 -+#endif
39 ---- Makefile.linux
40 -+++ Makefile.linux
41 -@@ -1,18 +1,17 @@
42 - # Makefile for linux
43 -
44 --CC = gcc
45 --CFLAGS = -Wall -O3
46 -+CC ?= gcc
47 -+CFLAGS ?= -O3
48 -+CFLAGS += -Wall
49 - TARGET = dzip
50 - OBJECTS = main.o compress.o uncompress.o list.o crc32.o \
51 -- encode.o decode.o v1code.o conmain.o delete.o \
52 -- zlib/adler32.o zlib/deflate.o zlib/trees.o \
53 -- zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o \
54 -- zlib/infutil.o zlib/inffast.o
55 -+ encode.o decode.o v1code.o conmain.o delete.o
56 -+LIBS = -lz
57 -
58 - TMPFILES = gmon.out frag*
59 -
60 - $(TARGET): $(OBJECTS)
61 -- $(CC) $(CFLAGS) $(OBJECTS) -o $(TARGET) $(LDFLAGS)
62 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
63 -
64 - clean:
65 - rm -f $(TARGET) $(OBJECTS) $(TMPFILES)
66 -@@ -24,4 +23,4 @@
67 - encode.o: encode.c dzip.h
68 - list.o: list.c dzip.h dzipcon.h
69 - decode.o: decode.c dzip.h dzipcon.h
70 --v1code.o: v1code.c dzip.h dzipcon.h
71 -\ No newline at end of file
72 -+v1code.o: v1code.c dzip.h dzipcon.h