Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/docker/files/
Date: Mon, 18 Feb 2019 14:13:34
Message-Id: 1550499179.76bf33070ea260d53dd8934c04fd2daf41fb5df7.voyageur@gentoo
1 commit: 76bf33070ea260d53dd8934c04fd2daf41fb5df7
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Feb 16 19:38:25 2019 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 18 14:12:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76bf3307
7
8 x11-plugins/docker: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
12
13 x11-plugins/docker/files/docker-1.5-makefile.patch | 45 ----------------------
14 1 file changed, 45 deletions(-)
15
16 diff --git a/x11-plugins/docker/files/docker-1.5-makefile.patch b/x11-plugins/docker/files/docker-1.5-makefile.patch
17 deleted file mode 100644
18 index d788bb63040..00000000000
19 --- a/x11-plugins/docker/files/docker-1.5-makefile.patch
20 +++ /dev/null
21 @@ -1,45 +0,0 @@
22 ---- Makefile.orig 2010-03-29 13:57:15.000000000 +0300
23 -+++ Makefile 2010-03-29 13:59:11.000000000 +0300
24 -@@ -5,12 +5,10 @@
25 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
26 -
27 - # Change this PREFIX to where you want docker to be installed
28 --PREFIX=/usr/local
29 --# Change this XLIBPATH to point to your X11 development package's installation
30 --XLIBPATH=/usr/X11R6/lib
31 -+PREFIX = /usr
32 -
33 - # Sets some flags for stricter compiling
34 --CFLAGS=-pedantic -Wall -W -O
35 -+CFLAGS += -pedantic -Wall -W
36 -
37 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
38 - # #
39 -@@ -24,14 +22,14 @@
40 - target=docker
41 - sources=docker.c kde.c icons.c xproperty.c net.c
42 - headers=docker.h kde.h icons.h xproperty.h net.h version.h
43 --extra=README COPYING version.h.in
44 -+extra=README version.h.in
45 -
46 - all: $(target) $(sources) $(headers)
47 - @echo Build Successful
48 -
49 - $(target): $(sources:.c=.o)
50 -- $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
51 -- `pkg-config --libs glib-2.0` $^ -o $@
52 -+ $(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
53 -+ `pkg-config --libs glib-2.0` -o $@
54 -
55 - %.o: %.c
56 - $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
57 -@@ -40,7 +38,8 @@
58 - sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
59 -
60 - install: all
61 -- install $(target) $(PREFIX)/bin/$(target)
62 -+ install -d $(DESTDIR)$(PREFIX)/bin
63 -+ install $(target) $(DESTDIR)$(PREFIX)/bin/$(target)
64 -
65 - uninstall:
66 - rm -f $(PREFIX)/$(target)