1 |
commit: b6720362771e2c68667c751b20f57521f6f9e79d |
2 |
Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 12 16:19:20 2017 +0000 |
4 |
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 12 16:55:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6720362 |
7 |
|
8 |
x11-libs/libcompizconfig: cleanup unused patch |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
...pizconfig-0.8.2-allow-system-libiniparser.patch | 239 --------------------- |
13 |
1 file changed, 239 deletions(-) |
14 |
|
15 |
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch |
16 |
deleted file mode 100644 |
17 |
index 3028faf967..0000000000 |
18 |
--- a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch |
19 |
+++ /dev/null |
20 |
@@ -1,239 +0,0 @@ |
21 |
-diff -Naur libcompizconfig-0.8.2.orig/config.h.in libcompizconfig-0.8.2/config.h.in |
22 |
---- libcompizconfig-0.8.2.orig/config.h.in 2009-03-05 15:29:12.000000000 +0000 |
23 |
-+++ libcompizconfig-0.8.2/config.h.in 2009-05-02 14:55:48.000000000 +0100 |
24 |
-@@ -30,6 +30,9 @@ |
25 |
- /* Define if your <locale.h> file defines LC_MESSAGES. */ |
26 |
- #undef HAVE_LC_MESSAGES |
27 |
- |
28 |
-+/* Define to 1 if you have the `iniparser' library (-liniparser). */ |
29 |
-+#undef HAVE_LIBINIPARSER |
30 |
-+ |
31 |
- /* Define to 1 if you have the `protobuf' library (-lprotobuf). */ |
32 |
- #undef HAVE_LIBPROTOBUF |
33 |
- |
34 |
-diff -Naur libcompizconfig-0.8.2.orig/configure.ac libcompizconfig-0.8.2/configure.ac |
35 |
---- libcompizconfig-0.8.2.orig/configure.ac 2009-03-05 03:22:22.000000000 +0000 |
36 |
-+++ libcompizconfig-0.8.2/configure.ac 2009-05-02 14:55:48.000000000 +0100 |
37 |
-@@ -116,6 +116,16 @@ |
38 |
- fi |
39 |
- AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"]) |
40 |
- |
41 |
-+AC_ARG_WITH(internal-iniparser, |
42 |
-+ [AS_HELP_STRING([--without-internal-iniparser],[Don't use bundled iniparser lib])], |
43 |
-+ [], [with_internal_iniparser=yes]) |
44 |
-+ |
45 |
-+if test "x$with_internal_iniparser" = "xno"; then |
46 |
-+ AC_CHECK_LIB([iniparser], [iniparser_getnsec], [], |
47 |
-+ [AC_MSG_ERROR([Error! You need to have libiniparser])]) |
48 |
-+fi |
49 |
-+AM_CONDITIONAL([WITH_INTERNAL_INIPARSER], [test "x$with_internal_iniparser" = "xyes"]) |
50 |
-+ |
51 |
- AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no]) |
52 |
- |
53 |
- AC_ARG_ENABLE(debug, |
54 |
-diff -Naur libcompizconfig-0.8.2.orig/include/ccs.h libcompizconfig-0.8.2/include/ccs.h |
55 |
---- libcompizconfig-0.8.2.orig/include/ccs.h 2009-03-05 03:22:22.000000000 +0000 |
56 |
-+++ libcompizconfig-0.8.2/include/ccs.h 2009-05-02 14:55:48.000000000 +0100 |
57 |
-@@ -695,19 +695,9 @@ |
58 |
- |
59 |
- /* INI file stuff */ |
60 |
- |
61 |
--typedef struct _dictionary_ |
62 |
--{ |
63 |
-- /** Number of entries in dictionary */ |
64 |
-- int n; |
65 |
-- /** Storage size */ |
66 |
-- int size; |
67 |
-- /** List of string values */ |
68 |
-- char **val; |
69 |
-- /** List of string keys */ |
70 |
-- char **key ; |
71 |
-- /** List of hash values for keys */ |
72 |
-- unsigned *hash; |
73 |
--} IniDictionary; |
74 |
-+#include <iniparser.h> |
75 |
-+ |
76 |
-+typedef dictionary IniDictionary; |
77 |
- |
78 |
- IniDictionary* ccsIniNew (void); |
79 |
- IniDictionary* ccsIniOpen (const char *fileName); |
80 |
-diff -Naur libcompizconfig-0.8.2.orig/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am |
81 |
---- libcompizconfig-0.8.2.orig/src/Makefile.am 2009-03-05 15:28:59.000000000 +0000 |
82 |
-+++ libcompizconfig-0.8.2/src/Makefile.am 2009-05-02 14:55:48.000000000 +0100 |
83 |
-@@ -39,14 +39,17 @@ |
84 |
- lists.c \ |
85 |
- compiz.cpp \ |
86 |
- config.c \ |
87 |
-- iniparser.c \ |
88 |
- ini.c \ |
89 |
- bindings.c \ |
90 |
- filewatch.c \ |
91 |
-- ccs-private.h \ |
92 |
-- iniparser.h |
93 |
-+ ccs-private.h |
94 |
- |
95 |
- libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) |
96 |
- |
97 |
- lib_LTLIBRARIES=libcompizconfig.la |
98 |
- |
99 |
-+if WITH_INTERNAL_INIPARSER |
100 |
-+ |
101 |
-+ libcompizconfig_la_SOURCES += iniparser.h iniparser.c |
102 |
-+ |
103 |
-+endif |
104 |
-diff -Naur libcompizconfig-0.8.2.orig/src/ini.c libcompizconfig-0.8.2/src/ini.c |
105 |
---- libcompizconfig-0.8.2.orig/src/ini.c 2009-03-05 03:22:22.000000000 +0000 |
106 |
-+++ libcompizconfig-0.8.2/src/ini.c 2009-05-02 14:56:12.000000000 +0100 |
107 |
-@@ -23,9 +23,10 @@ |
108 |
- #include <sys/stat.h> |
109 |
- #include <sys/types.h> |
110 |
- #include <errno.h> |
111 |
-+#include <ctype.h> |
112 |
- |
113 |
- #include <ccs.h> |
114 |
--#include "iniparser.h" |
115 |
-+#include <iniparser.h> |
116 |
- |
117 |
- /** |
118 |
- * Creates the parent directory for @fileName, recursively creating a directory |
119 |
-@@ -77,7 +78,7 @@ |
120 |
- if (file) |
121 |
- fclose (file); |
122 |
- |
123 |
-- return iniparser_new ((char*) fileName); |
124 |
-+ return iniparser_load ((char*) fileName); |
125 |
- } |
126 |
- |
127 |
- IniDictionary* |
128 |
-@@ -89,17 +90,22 @@ |
129 |
- void |
130 |
- ccsIniClose (IniDictionary *dictionary) |
131 |
- { |
132 |
-- iniparser_free (dictionary); |
133 |
-+ iniparser_freedict (dictionary); |
134 |
- } |
135 |
- |
136 |
- void |
137 |
- ccsIniSave (IniDictionary *dictionary, |
138 |
- const char *fileName) |
139 |
- { |
140 |
-+ FILE *f; |
141 |
- if (!ccsCreateDirFor (fileName)) |
142 |
- return; |
143 |
- |
144 |
-- iniparser_dump_ini (dictionary, fileName); |
145 |
-+ f = fopen(fileName, "w"); |
146 |
-+ if(!f) |
147 |
-+ return; |
148 |
-+ iniparser_dump_ini (dictionary, f); |
149 |
-+ fclose(f); |
150 |
- } |
151 |
- |
152 |
- static char* |
153 |
-@@ -127,11 +133,11 @@ |
154 |
- char *sectionName; |
155 |
- |
156 |
- asprintf (§ionName, "%s:%s", section, entry); |
157 |
-- |
158 |
-+/* |
159 |
- if (!iniparser_find_entry (dictionary, (char*) section)) |
160 |
- iniparser_add_entry (dictionary, (char*) section, NULL, NULL); |
161 |
-- |
162 |
-- iniparser_setstr (dictionary, sectionName, (char*) value); |
163 |
-+*/ |
164 |
-+ iniparser_set (dictionary, sectionName, (char*) value); |
165 |
- |
166 |
- free (sectionName); |
167 |
- } |
168 |
-diff -Naur libcompizconfig-0.8.2.orig/src/iniparser.h libcompizconfig-0.8.2/src/iniparser.h |
169 |
---- libcompizconfig-0.8.2.orig/src/iniparser.h 2009-03-05 03:22:22.000000000 +0000 |
170 |
-+++ libcompizconfig-0.8.2/src/iniparser.h 1970-01-01 01:00:00.000000000 +0100 |
171 |
-@@ -1,65 +0,0 @@ |
172 |
--/* |
173 |
-- Based upon libiniparser, by Nicolas Devillard |
174 |
-- Hacked into 1 file (m-iniparser) by Freek/2005 |
175 |
-- Original terms following: |
176 |
-- |
177 |
-- -- - |
178 |
-- |
179 |
-- Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr). |
180 |
-- |
181 |
-- Written by Nicolas Devillard. Not derived from licensed software. |
182 |
-- |
183 |
-- Permission is granted to anyone to use this software for any |
184 |
-- purpose on any computer system, and to redistribute it freely, |
185 |
-- subject to the following restrictions: |
186 |
-- |
187 |
-- 1. The author is not responsible for the consequences of use of |
188 |
-- this software, no matter how awful, even if they arise |
189 |
-- from defects in it. |
190 |
-- |
191 |
-- 2. The origin of this software must not be misrepresented, either |
192 |
-- by explicit claim or by omission. |
193 |
-- |
194 |
-- 3. Altered versions must be plainly marked as such, and must not |
195 |
-- be misrepresented as being the original software. |
196 |
-- |
197 |
-- 4. This notice may not be removed or altered. |
198 |
-- |
199 |
-- */ |
200 |
-- |
201 |
-- |
202 |
--#ifndef _INIPARSER_H_ |
203 |
--#define _INIPARSER_H_ |
204 |
--#include <stdio.h> |
205 |
--#include <stdlib.h> |
206 |
--#include <string.h> |
207 |
--#include <unistd.h> |
208 |
--#include <ctype.h> |
209 |
-- |
210 |
--#include <ccs.h> |
211 |
-- |
212 |
--typedef IniDictionary dictionary; |
213 |
-- |
214 |
--typedef struct _FileLock |
215 |
--{ |
216 |
-- int fd; |
217 |
--} FileLock; |
218 |
-- |
219 |
--/* generated by genproto */ |
220 |
-- |
221 |
--dictionary * iniparser_new(char *ininame); |
222 |
--dictionary * dictionary_new(int size); |
223 |
--void iniparser_free(dictionary * d); |
224 |
-- |
225 |
-- |
226 |
--int iniparser_getnsec(dictionary * d); |
227 |
--char * iniparser_getsecname(dictionary * d, int n); |
228 |
--void iniparser_dump_ini(dictionary * d, const char * file_name); |
229 |
--char * iniparser_getstring(dictionary * d, char * key, char * def); |
230 |
--void iniparser_add_entry(dictionary * d, char * sec, char * key, char * val); |
231 |
--int iniparser_find_entry(dictionary * ini, char * entry); |
232 |
--int iniparser_setstr(dictionary * ini, char * entry, char * val); |
233 |
--void iniparser_unset(dictionary * ini, char * entry); |
234 |
-- |
235 |
--#endif |
236 |
-- |
237 |
-diff -Naur libcompizconfig-0.8.2.orig/src/main.c libcompizconfig-0.8.2/src/main.c |
238 |
---- libcompizconfig-0.8.2.orig/src/main.c 2009-03-05 03:22:22.000000000 +0000 |
239 |
-+++ libcompizconfig-0.8.2/src/main.c 2009-05-02 14:56:26.000000000 +0100 |
240 |
-@@ -34,9 +34,9 @@ |
241 |
- #include <math.h> |
242 |
- |
243 |
- #include <ccs.h> |
244 |
-+#include <iniparser.h> |
245 |
- |
246 |
- #include "ccs-private.h" |
247 |
--#include "iniparser.h" |
248 |
- |
249 |
- Bool basicMetadata = FALSE; |
250 |
- |
251 |
-@@ -2577,7 +2577,7 @@ |
252 |
- return FALSE; |
253 |
- fclose (fp); |
254 |
- |
255 |
-- importFile = iniparser_new ((char *) fileName); |
256 |
-+ importFile = iniparser_load ((char *) fileName); |
257 |
- if (!importFile) |
258 |
- return FALSE; |
259 |
- |