1 |
pacho 12/04/29 18:58:07 |
2 |
|
3 |
Added: libgsf-1.14.23-clone-identifier.patch |
4 |
Log: |
5 |
Fix test compilation problems reported by Hans de Graaff in bug #413701 with upstream patch. |
6 |
|
7 |
(Portage version: 2.1.10.57/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: libgsf-1.14.23-clone-identifier.patch |
16 |
=================================================================== |
17 |
From 7a4a9d62e0efa8510a9c8aa957233327d11f355b Mon Sep 17 00:00:00 2001 |
18 |
From: Morten Welinder <terra@×××××.org> |
19 |
Date: Fri, 20 Apr 2012 13:54:54 +0000 |
20 |
Subject: compilation: avoid identifier "clone". |
21 |
|
22 |
It clashes with the clone syscall when the wrong headers get included. |
23 |
--- |
24 |
diff --git a/tests/test-cp-msole.c b/tests/test-cp-msole.c |
25 |
index e076bb4..4ed3246 100644 |
26 |
--- a/tests/test-cp-msole.c |
27 |
+++ b/tests/test-cp-msole.c |
28 |
@@ -34,7 +34,7 @@ |
29 |
static void clone_dir (GsfInfile *in, GsfOutfile *out); |
30 |
|
31 |
static void |
32 |
-clone (GsfInput *input, GsfOutput *output) |
33 |
+clone_ (GsfInput *input, GsfOutput *output) |
34 |
{ |
35 |
if (gsf_input_size (input) > 0) { |
36 |
guint8 const *data; |
37 |
@@ -87,7 +87,7 @@ clone_dir (GsfInfile *in, GsfOutfile *out) |
38 |
gsf_infile_name_by_index (in, i), |
39 |
is_dir); |
40 |
|
41 |
- clone (new_input, new_output); |
42 |
+ clone_ (new_input, new_output); |
43 |
} |
44 |
/* An observation: when you think about the explanation to is_dir |
45 |
* above, you realize that clone_dir is called even for regular files. |
46 |
@@ -137,7 +137,7 @@ test (char *argv[]) |
47 |
|
48 |
outfile = gsf_outfile_msole_new (output); |
49 |
g_object_unref (G_OBJECT (output)); |
50 |
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
51 |
+ clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
52 |
|
53 |
return 0; |
54 |
} |
55 |
diff --git a/tests/test-cp-zip.c b/tests/test-cp-zip.c |
56 |
index 5523f33..3263c02 100644 |
57 |
--- a/tests/test-cp-zip.c |
58 |
+++ b/tests/test-cp-zip.c |
59 |
@@ -32,7 +32,7 @@ |
60 |
#include <stdio.h> |
61 |
|
62 |
static void |
63 |
-clone (GsfInfile *in, GsfOutfile *out) |
64 |
+clone_ (GsfInfile *in, GsfOutfile *out) |
65 |
{ |
66 |
GsfInput *input = GSF_INPUT (in); |
67 |
GsfOutput *output = GSF_OUTPUT (out); |
68 |
@@ -85,7 +85,7 @@ clone (GsfInfile *in, GsfOutfile *out) |
69 |
output = gsf_outfile_new_child_full (out, name, is_dir, |
70 |
"compression-level", level, |
71 |
NULL); |
72 |
- clone (GSF_INFILE (input), GSF_OUTFILE (output)); |
73 |
+ clone_ (GSF_INFILE (input), GSF_OUTFILE (output)); |
74 |
} |
75 |
} |
76 |
gsf_output_close (GSF_OUTPUT (out)); |
77 |
@@ -137,7 +137,7 @@ test (char *argv[]) |
78 |
|
79 |
outfile = gsf_outfile_zip_new (output, &err); |
80 |
g_object_unref (G_OBJECT (output)); |
81 |
- clone (infile, outfile); |
82 |
+ clone_ (infile, outfile); |
83 |
|
84 |
return 0; |
85 |
} |
86 |
diff --git a/tests/test-dump-msole.c b/tests/test-dump-msole.c |
87 |
index 3837394..b6ef5ce 100644 |
88 |
--- a/tests/test-dump-msole.c |
89 |
+++ b/tests/test-dump-msole.c |
90 |
@@ -32,7 +32,7 @@ |
91 |
#include <stdio.h> |
92 |
|
93 |
static void |
94 |
-clone (GsfInput *input, GsfOutput *output) |
95 |
+clone_ (GsfInput *input, GsfOutput *output) |
96 |
{ |
97 |
guint8 const *data; |
98 |
size_t len; |
99 |
@@ -72,7 +72,7 @@ clone (GsfInput *input, GsfOutput *output) |
100 |
dst = gsf_outfile_new_child (out, |
101 |
gsf_infile_name_by_index (in, i), |
102 |
is_dir); |
103 |
- clone (src, dst); |
104 |
+ clone_ (src, dst); |
105 |
} |
106 |
} |
107 |
|
108 |
@@ -118,7 +118,7 @@ test (char *argv[]) |
109 |
g_error_free (err); |
110 |
return 1; |
111 |
} |
112 |
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
113 |
+ clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
114 |
|
115 |
return 0; |
116 |
} |
117 |
diff --git a/tests/test-restore-msole.c b/tests/test-restore-msole.c |
118 |
index cfd1d68..b9c54b5 100644 |
119 |
--- a/tests/test-restore-msole.c |
120 |
+++ b/tests/test-restore-msole.c |
121 |
@@ -32,7 +32,7 @@ |
122 |
#include <stdio.h> |
123 |
|
124 |
static void |
125 |
-clone (GsfInput *input, GsfOutput *output) |
126 |
+clone_ (GsfInput *input, GsfOutput *output) |
127 |
{ |
128 |
guint8 const *data; |
129 |
size_t len; |
130 |
@@ -72,7 +72,7 @@ clone (GsfInput *input, GsfOutput *output) |
131 |
dst = gsf_outfile_new_child (out, |
132 |
gsf_infile_name_by_index (in, i), |
133 |
is_dir); |
134 |
- clone (src, dst); |
135 |
+ clone_ (src, dst); |
136 |
} |
137 |
} |
138 |
|
139 |
@@ -111,7 +111,7 @@ test (char *argv[]) |
140 |
|
141 |
outfile = gsf_outfile_msole_new (output); |
142 |
g_object_unref (G_OBJECT (output)); |
143 |
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
144 |
+ clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile)); |
145 |
|
146 |
return 0; |
147 |
} |
148 |
-- |
149 |
cgit v0.9.0.2 |