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/wmtz/files/
Date: Mon, 01 Jan 2018 21:04:08
Message-Id: 1514840486.67d8e6ab960a4756354b4b1593648287585529f5.voyageur@gentoo
1 commit: 67d8e6ab960a4756354b4b1593648287585529f5
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Dec 28 07:47:03 2017 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 1 21:01:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d8e6ab
7
8 x11-plugins/wmtz: remove unused patches
9
10 x11-plugins/wmtz/files/wmtz-0.7-list.patch | 127 -----------------------------
11 x11-plugins/wmtz/files/wmtz-0.7.patch | 48 -----------
12 2 files changed, 175 deletions(-)
13
14 diff --git a/x11-plugins/wmtz/files/wmtz-0.7-list.patch b/x11-plugins/wmtz/files/wmtz-0.7-list.patch
15 deleted file mode 100644
16 index 1b1ac317669..00000000000
17 --- a/x11-plugins/wmtz/files/wmtz-0.7-list.patch
18 +++ /dev/null
19 @@ -1,127 +0,0 @@
20 -diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
21 ---- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100
22 -+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100
23 -@@ -38,7 +38,7 @@
24 -
25 - /* Return a cons cell produced from (head . tail)
26 -
27 --INLINE LinkedList*
28 -+LinkedList*
29 - list_cons(void* head, LinkedList* tail)
30 - {
31 - LinkedList* cell;
32 -@@ -51,7 +51,7 @@
33 -
34 - /* Return the length of a list, list_length(NULL) returns zero
35 -
36 --INLINE int
37 -+int
38 - list_length(LinkedList* list)
39 - {
40 - int i = 0;
41 -@@ -66,7 +66,7 @@
42 - /* Return the Nth element of LIST, where N count from zero. If N
43 - larger than the list length, NULL is returned
44 -
45 --INLINE void*
46 -+void*
47 - list_nth(int index, LinkedList* list)
48 - {
49 - while(index-- != 0)
50 -@@ -81,7 +81,7 @@
51 -
52 - /* Remove the element at the head by replacing it by its successor
53 -
54 --INLINE void
55 -+void
56 - list_remove_head(LinkedList** list)
57 - {
58 - if (!*list) return;
59 -@@ -101,7 +101,7 @@
60 -
61 - /* Remove the element with `car' set to ELEMENT
62 - /*
63 --INLINE void
64 -+void
65 - list_remove_elem(LinkedList** list, void* elem)
66 - {
67 - while (*list)
68 -@@ -112,7 +112,7 @@
69 - }
70 -
71 -
72 --INLINE LinkedList *
73 -+LinkedList *
74 - list_remove_elem(LinkedList* list, void* elem)
75 - {
76 - LinkedList *tmp;
77 -@@ -132,7 +132,7 @@
78 -
79 - /* Return element that has ELEM as car
80 -
81 --INLINE LinkedList*
82 -+LinkedList*
83 - list_find(LinkedList* list, void* elem)
84 - {
85 - while(list)
86 -@@ -146,7 +146,7 @@
87 -
88 - /* Free list (backwards recursive)
89 -
90 --INLINE void
91 -+void
92 - list_free(LinkedList* list)
93 - {
94 - if(list)
95 -@@ -158,7 +158,7 @@
96 -
97 - /* Map FUNCTION over all elements in LIST
98 -
99 --INLINE void
100 -+void
101 - list_mapcar(LinkedList* list, void(*function)(void*))
102 - {
103 - while(list)
104 -diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
105 ---- wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100
106 -+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100
107 -@@ -29,31 +29,25 @@
108 - #ifndef __LIST_H_
109 - #define __LIST_H_
110 -
111 --#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
112 --# define INLINE inline
113 --#else
114 --# define INLINE
115 --#endif
116 --
117 - typedef struct LinkedList {
118 - void *head;
119 - struct LinkedList *tail;
120 - } LinkedList;
121 -
122 --INLINE LinkedList* list_cons(void* head, LinkedList* tail);
123 -+LinkedList* list_cons(void* head, LinkedList* tail);
124 -
125 --INLINE int list_length(LinkedList* list);
126 -+int list_length(LinkedList* list);
127 -
128 --INLINE void* list_nth(int index, LinkedList* list);
129 -+void* list_nth(int index, LinkedList* list);
130 -
131 --INLINE void list_remove_head(LinkedList** list);
132 -+void list_remove_head(LinkedList** list);
133 -
134 --INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
135 -+LinkedList *list_remove_elem(LinkedList* list, void* elem);
136 -
137 --INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
138 -+void list_mapcar(LinkedList* list, void(*function)(void*));
139 -
140 --INLINE LinkedList*list_find(LinkedList* list, void* elem);
141 -+LinkedList*list_find(LinkedList* list, void* elem);
142 -
143 --INLINE void list_free(LinkedList* list);
144 -+void list_free(LinkedList* list);
145 -
146 - #endif
147
148 diff --git a/x11-plugins/wmtz/files/wmtz-0.7.patch b/x11-plugins/wmtz/files/wmtz-0.7.patch
149 deleted file mode 100644
150 index adb5c68f1b6..00000000000
151 --- a/x11-plugins/wmtz/files/wmtz-0.7.patch
152 +++ /dev/null
153 @@ -1,48 +0,0 @@
154 -diff -ur wmtz-0.7.orig/wmtz/Makefile wmtz-0.7/wmtz/Makefile
155 ---- wmtz-0.7.orig/wmtz/Makefile 2001-03-11 15:57:59.000000000 +0200
156 -+++ wmtz-0.7/wmtz/Makefile 2008-01-12 15:24:29.000000000 +0200
157 -@@ -1,5 +1,5 @@
158 - CC = gcc
159 --LIBDIR = -L/usr/X11R6/lib
160 -+LIBDIR = -L/usr/lib
161 - LIBS = -lXpm -lXext -lX11 -lm
162 - FLAGS = -O2
163 - DESTDIR = /usr/local
164 -@@ -10,7 +10,7 @@
165 -
166 -
167 - .c.o:
168 -- $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
169 -+ $(CC) -I/usr/include $(FLAGS) -c -Wall $< -o $*.o
170 -
171 - wmtz: $(OBJS)
172 - $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
173 -diff -ur wmtz-0.7.orig/wmtz/wmtz.c wmtz-0.7/wmtz/wmtz.c
174 ---- wmtz-0.7.orig/wmtz/wmtz.c 2001-04-16 22:26:34.000000000 +0300
175 -+++ wmtz-0.7/wmtz/wmtz.c 2008-01-12 15:17:37.000000000 +0200
176 -@@ -51,8 +51,7 @@
177 - #define STRSIZE 10
178 - #define LMST 1
179 - #define GMST 0
180 --#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7
181 --http://www.geocities.com/jl1n/wmtz/wmtz.html\""
182 -+#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\""
183 -
184 -
185 - /*
186 -@@ -479,6 +478,7 @@
187 - but_stat = -1;
188 - break;
189 - default:
190 -+ break;
191 - }
192 - }
193 -
194 -@@ -529,6 +529,7 @@
195 - exit(0);
196 - break;
197 - default:
198 -+ break;
199 - }
200 - return;
201 - }