[gentoo-commits] gentoo-x86 commit in media-libs/libchamplain/files: libchamplain-gthread.patch libchamplain-0.8.3-gthread.patch - gentoo-commits

From:	"Justin Lecher (jlec)" <jlec@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-libs/libchamplain/files: libchamplain-gthread.patch libchamplain-0.8.3-gthread.patch
Date:	Thu, 01 Nov 2012 10:32:35
Message-Id:	`20121101103218.5F19521601@flycatcher.gentoo.org`

1

jlec        12/11/01 10:32:18

2

3

  Added:                libchamplain-gthread.patch

4

                        libchamplain-0.8.3-gthread.patch

5

  Log:

6

  media-libs/libchamplain: Backport upstream fixes for #440646

7

8

  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

9

10

Revision  Changes    Path

11

1.1                  media-libs/libchamplain/files/libchamplain-gthread.patch

12

13

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-gthread.patch?rev=1.1&view=markup

14

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-gthread.patch?rev=1.1&content-type=text/plain

15

16

Index: libchamplain-gthread.patch

17

===================================================================

18

From b6098de723f14f8dd5051a83f54bb7503f7e8a47 Mon Sep 17 00:00:00 2001

19

From: Colin Walters <walters@××××××.org>

20

Date: Fri, 04 Nov 2011 02:29:37 +0000

21

Subject: demos: Don't call g_thread_init

22

23

Doing so now requires linking -lgthread, but it's been pointless

24

since GLib 2.18, which is ancient history now.

25

---

26

diff --git a/demos/animated-marker.c b/demos/animated-marker.c

27

index 7f3fd6e..71580a7 100644

28

--- a/demos/animated-marker.c

29

+++ b/demos/animated-marker.c

30

@@ -127,7 +127,6 @@ main (int argc, char *argv[])

31

   ChamplainMarkerLayer *layer;

32

   GpsCallbackData callback_data;

33

34

-  g_thread_init (NULL);

35

   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)

36

     return 1;

37

38

diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c

39

index 67b7a6a..8e699a9 100644

40

--- a/demos/launcher-gtk.c

41

+++ b/demos/launcher-gtk.c

42

@@ -223,7 +223,6 @@ main (int argc,

43

   ClutterActor *scale;

44

   ChamplainLicense *license_actor;

45

46

-  g_thread_init (NULL);

47

   gtk_clutter_init (&argc, &argv);

48

49

   /* create the main, top level, window */

50

diff --git a/demos/launcher.c b/demos/launcher.c

51

index 1f222d4..26e585f 100644

52

--- a/demos/launcher.c

53

+++ b/demos/launcher.c

54

@@ -95,7 +95,6 @@ main (int argc,

55

   ChamplainPathLayer *path;

56

   gfloat width, total_width = 0;

57

58

-  g_thread_init (NULL);

59

   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)

60

     return 1;

61

62

diff --git a/demos/local-rendering.c b/demos/local-rendering.c

63

index 16bc9a5..98208b9 100644

64

--- a/demos/local-rendering.c

65

+++ b/demos/local-rendering.c

66

@@ -730,7 +730,6 @@ main (int argc,

67

{

68

   GtkWidget *widget, *hbox, *bbox, *menubox, *button, *viewport, *label;

69

70

-  g_thread_init (NULL);

71

   gtk_clutter_init (&argc, &argv);

72

73

   /* create the main, top level, window */

74

diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c

75

index ea3383a..195f9e4 100644

76

--- a/demos/minimal-gtk.c

77

+++ b/demos/minimal-gtk.c

78

@@ -29,7 +29,6 @@ main (int argc, char *argv[])

79

   GtkWidget *window, *widget;

80

81

   /* initialize threads and clutter */

82

-  g_thread_init (NULL);

83

   gtk_clutter_init (&argc, &argv);

84

85

   /* create the top-level window and quit the main loop when it's closed */

86

diff --git a/demos/minimal.c b/demos/minimal.c

87

index 6ada0a9..b3ec2ef 100644

88

--- a/demos/minimal.c

89

+++ b/demos/minimal.c

90

@@ -23,7 +23,6 @@ main (int argc, char *argv[])

91

{

92

   ClutterActor *actor, *stage;

93

94

-  g_thread_init (NULL);

95

   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)

96

     return 1;

97

98

diff --git a/demos/polygons.c b/demos/polygons.c

99

index 996a61f..df54689 100644

100

--- a/demos/polygons.c

101

+++ b/demos/polygons.c

102

@@ -84,7 +84,6 @@ main (int argc,

103

   ChamplainPathLayer *layer;

104

   gfloat width, total_width = 0;;

105

106

-  g_thread_init (NULL);

107

   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)

108

     return 1;

109

110

diff --git a/demos/url-marker.c b/demos/url-marker.c

111

index 6e34d09..a73bd27 100644

112

--- a/demos/url-marker.c

113

+++ b/demos/url-marker.c

114

@@ -243,7 +243,6 @@ main (int argc, char *argv[])

115

   ChamplainMarkerLayer *layer;

116

   SoupSession *session;

117

118

-  g_thread_init (NULL);

119

   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)

120

     return 1;

121

122

--

123

cgit v0.9.0.2

1.1                  media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch

128

129

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch?rev=1.1&view=markup

130

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch?rev=1.1&content-type=text/plain

131

132

Index: libchamplain-0.8.3-gthread.patch

133

===================================================================

134

 demos/animated-marker.c | 1 -

135

 demos/launcher-gtk.c    | 1 -

136

 demos/launcher.c        | 1 -

137

 demos/local-rendering.c | 1 -

138

 demos/minimal-gtk.c     | 1 -

139

 demos/minimal.c         | 1 -

140

 demos/polygons.c        | 1 -

141

 demos/url-marker.c      | 1 -

142

 8 files changed, 8 deletions(-)

143

144

diff --git a/demos/animated-marker.c b/demos/animated-marker.c

145

index ebcbe72..5c5a8ce 100644

146

--- a/demos/animated-marker.c

147

+++ b/demos/animated-marker.c

148

@@ -123,7 +123,6 @@ main (int argc, char *argv[])

149

   ChamplainLayer *layer;

150

   GpsCallbackData callback_data;

151

152

-  g_thread_init (NULL);

153

   clutter_init (&argc, &argv);

154

155

   stage = clutter_stage_get_default ();

156

diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c

157

index 897e148..b4cb06d 100644

158

--- a/demos/launcher-gtk.c

159

+++ b/demos/launcher-gtk.c

160

@@ -207,7 +207,6 @@ main (int argc,

161

   ChamplainView *view;

162

   ChamplainLayer *layer;

163

164

-  g_thread_init (NULL);

165

   gtk_clutter_init (&argc, &argv);

166

167

   /* create the main, top level, window */

168

diff --git a/demos/launcher.c b/demos/launcher.c

169

index a7a5fd8..acdd1cf 100644

170

--- a/demos/launcher.c

171

+++ b/demos/launcher.c

172

@@ -93,7 +93,6 @@ main (int argc,

173

   ChamplainLayer *layer;

174

   gfloat width, total_width = 0;

175

176

-  g_thread_init (NULL);

177

   clutter_init (&argc, &argv);

178

179

   stage = clutter_stage_get_default ();

180

diff --git a/demos/local-rendering.c b/demos/local-rendering.c

181

index 43ad2ad..7577071 100644

182

--- a/demos/local-rendering.c

183

+++ b/demos/local-rendering.c

184

@@ -725,7 +725,6 @@ main (int argc,

185

{

186

   GtkWidget *widget, *hbox, *bbox, *menubox, *button, *viewport, *label;

187

188

-  g_thread_init (NULL);

189

   gtk_clutter_init (&argc, &argv);

190

191

   /* create the main, top level, window */

192

diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c

193

index ea3383a..195f9e4 100644

194

--- a/demos/minimal-gtk.c

195

+++ b/demos/minimal-gtk.c

196

@@ -29,7 +29,6 @@ main (int argc, char *argv[])

197

   GtkWidget *window, *widget;

198

199

   /* initialize threads and clutter */

200

-  g_thread_init (NULL);

201

   gtk_clutter_init (&argc, &argv);

202

203

   /* create the top-level window and quit the main loop when it's closed */

204

diff --git a/demos/minimal.c b/demos/minimal.c

205

index 4a66c6e..bd20929 100644

206

--- a/demos/minimal.c

207

+++ b/demos/minimal.c

208

@@ -23,7 +23,6 @@ main (int argc, char *argv[])

209

{

210

   ClutterActor *actor, *stage;

211

212

-  g_thread_init (NULL);

213

   clutter_init (&argc, &argv);

214

215

   stage = clutter_stage_get_default ();

216

diff --git a/demos/polygons.c b/demos/polygons.c

217

index 5d07bb3..6884a3c 100644

218

--- a/demos/polygons.c

219

+++ b/demos/polygons.c

220

@@ -74,7 +74,6 @@ main (int argc,

221

   ChamplainPolygon *polygon;

222

   gfloat width, total_width = 0;;

223

224

-  g_thread_init (NULL);

225

   clutter_init (&argc, &argv);

226

227

   stage = clutter_stage_get_default ();

228

diff --git a/demos/url-marker.c b/demos/url-marker.c

229

index 6fbbfb0..71d90c5 100644

230

--- a/demos/url-marker.c

231

+++ b/demos/url-marker.c

232

@@ -244,7 +244,6 @@ main (int argc, char *argv[])

233

   ChamplainLayer *layer;

234

   SoupSession *session;

235

236

-  g_thread_init (NULL);

237

   clutter_init (&argc, &argv);

238

239

   stage = clutter_stage_get_default ();

1	jlec 12/11/01 10:32:18
2
3	Added: libchamplain-gthread.patch
4	libchamplain-0.8.3-gthread.patch
5	Log:
6	media-libs/libchamplain: Backport upstream fixes for #440646
7
8	(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
9
10	Revision Changes Path
11	1.1 media-libs/libchamplain/files/libchamplain-gthread.patch
12
13	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-gthread.patch?rev=1.1&view=markup
14	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-gthread.patch?rev=1.1&content-type=text/plain
15
16	Index: libchamplain-gthread.patch
17	===================================================================
18	From b6098de723f14f8dd5051a83f54bb7503f7e8a47 Mon Sep 17 00:00:00 2001
19	From: Colin Walters <walters@××××××.org>
20	Date: Fri, 04 Nov 2011 02:29:37 +0000
21	Subject: demos: Don't call g_thread_init
22
23	Doing so now requires linking -lgthread, but it's been pointless
24	since GLib 2.18, which is ancient history now.
25	---
26	diff --git a/demos/animated-marker.c b/demos/animated-marker.c
27	index 7f3fd6e..71580a7 100644
28	--- a/demos/animated-marker.c
29	+++ b/demos/animated-marker.c
30	@@ -127,7 +127,6 @@ main (int argc, char *argv[])
31	ChamplainMarkerLayer *layer;
32	GpsCallbackData callback_data;
33
34	- g_thread_init (NULL);
35	if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
36	return 1;
37
38	diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
39	index 67b7a6a..8e699a9 100644
40	--- a/demos/launcher-gtk.c
41	+++ b/demos/launcher-gtk.c
42	@@ -223,7 +223,6 @@ main (int argc,
43	ClutterActor *scale;
44	ChamplainLicense *license_actor;
45
46	- g_thread_init (NULL);
47	gtk_clutter_init (&argc, &argv);
48
49	/* create the main, top level, window */
50	diff --git a/demos/launcher.c b/demos/launcher.c
51	index 1f222d4..26e585f 100644
52	--- a/demos/launcher.c
53	+++ b/demos/launcher.c
54	@@ -95,7 +95,6 @@ main (int argc,
55	ChamplainPathLayer *path;
56	gfloat width, total_width = 0;
57
58	- g_thread_init (NULL);
59	if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
60	return 1;
61
62	diff --git a/demos/local-rendering.c b/demos/local-rendering.c
63	index 16bc9a5..98208b9 100644
64	--- a/demos/local-rendering.c
65	+++ b/demos/local-rendering.c
66	@@ -730,7 +730,6 @@ main (int argc,
67	{
68	GtkWidget widget, hbox, bbox, menubox, button, viewport, *label;
69
70	- g_thread_init (NULL);
71	gtk_clutter_init (&argc, &argv);
72
73	/* create the main, top level, window */
74	diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c
75	index ea3383a..195f9e4 100644
76	--- a/demos/minimal-gtk.c
77	+++ b/demos/minimal-gtk.c
78	@@ -29,7 +29,6 @@ main (int argc, char *argv[])
79	GtkWidget window, widget;
80
81	/* initialize threads and clutter */
82	- g_thread_init (NULL);
83	gtk_clutter_init (&argc, &argv);
84
85	/* create the top-level window and quit the main loop when it's closed */
86	diff --git a/demos/minimal.c b/demos/minimal.c
87	index 6ada0a9..b3ec2ef 100644
88	--- a/demos/minimal.c
89	+++ b/demos/minimal.c
90	@@ -23,7 +23,6 @@ main (int argc, char *argv[])
91	{
92	ClutterActor actor, stage;
93
94	- g_thread_init (NULL);
95	if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
96	return 1;
97
98	diff --git a/demos/polygons.c b/demos/polygons.c
99	index 996a61f..df54689 100644
100	--- a/demos/polygons.c
101	+++ b/demos/polygons.c
102	@@ -84,7 +84,6 @@ main (int argc,
103	ChamplainPathLayer *layer;
104	gfloat width, total_width = 0;;
105
106	- g_thread_init (NULL);
107	if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
108	return 1;
109
110	diff --git a/demos/url-marker.c b/demos/url-marker.c
111	index 6e34d09..a73bd27 100644
112	--- a/demos/url-marker.c
113	+++ b/demos/url-marker.c
114	@@ -243,7 +243,6 @@ main (int argc, char *argv[])
115	ChamplainMarkerLayer *layer;
116	SoupSession *session;
117
118	- g_thread_init (NULL);
119	if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
120	return 1;
121
122	--
123	cgit v0.9.0.2
124
125
126
127	1.1 media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch
128
129	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch?rev=1.1&view=markup
130	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch?rev=1.1&content-type=text/plain
131
132	Index: libchamplain-0.8.3-gthread.patch
133	===================================================================
134	demos/animated-marker.c \| 1 -
135	demos/launcher-gtk.c \| 1 -
136	demos/launcher.c \| 1 -
137	demos/local-rendering.c \| 1 -
138	demos/minimal-gtk.c \| 1 -
139	demos/minimal.c \| 1 -
140	demos/polygons.c \| 1 -
141	demos/url-marker.c \| 1 -
142	8 files changed, 8 deletions(-)
143
144	diff --git a/demos/animated-marker.c b/demos/animated-marker.c
145	index ebcbe72..5c5a8ce 100644
146	--- a/demos/animated-marker.c
147	+++ b/demos/animated-marker.c
148	@@ -123,7 +123,6 @@ main (int argc, char *argv[])
149	ChamplainLayer *layer;
150	GpsCallbackData callback_data;
151
152	- g_thread_init (NULL);
153	clutter_init (&argc, &argv);
154
155	stage = clutter_stage_get_default ();
156	diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
157	index 897e148..b4cb06d 100644
158	--- a/demos/launcher-gtk.c
159	+++ b/demos/launcher-gtk.c
160	@@ -207,7 +207,6 @@ main (int argc,
161	ChamplainView *view;
162	ChamplainLayer *layer;
163
164	- g_thread_init (NULL);
165	gtk_clutter_init (&argc, &argv);
166
167	/* create the main, top level, window */
168	diff --git a/demos/launcher.c b/demos/launcher.c
169	index a7a5fd8..acdd1cf 100644
170	--- a/demos/launcher.c
171	+++ b/demos/launcher.c
172	@@ -93,7 +93,6 @@ main (int argc,
173	ChamplainLayer *layer;
174	gfloat width, total_width = 0;
175
176	- g_thread_init (NULL);
177	clutter_init (&argc, &argv);
178
179	stage = clutter_stage_get_default ();
180	diff --git a/demos/local-rendering.c b/demos/local-rendering.c
181	index 43ad2ad..7577071 100644
182	--- a/demos/local-rendering.c
183	+++ b/demos/local-rendering.c
184	@@ -725,7 +725,6 @@ main (int argc,
185	{
186	GtkWidget widget, hbox, bbox, menubox, button, viewport, *label;
187
188	- g_thread_init (NULL);
189	gtk_clutter_init (&argc, &argv);
190
191	/* create the main, top level, window */
192	diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c
193	index ea3383a..195f9e4 100644
194	--- a/demos/minimal-gtk.c
195	+++ b/demos/minimal-gtk.c
196	@@ -29,7 +29,6 @@ main (int argc, char *argv[])
197	GtkWidget window, widget;
198
199	/* initialize threads and clutter */
200	- g_thread_init (NULL);
201	gtk_clutter_init (&argc, &argv);
202
203	/* create the top-level window and quit the main loop when it's closed */
204	diff --git a/demos/minimal.c b/demos/minimal.c
205	index 4a66c6e..bd20929 100644
206	--- a/demos/minimal.c
207	+++ b/demos/minimal.c
208	@@ -23,7 +23,6 @@ main (int argc, char *argv[])
209	{
210	ClutterActor actor, stage;
211
212	- g_thread_init (NULL);
213	clutter_init (&argc, &argv);
214
215	stage = clutter_stage_get_default ();
216	diff --git a/demos/polygons.c b/demos/polygons.c
217	index 5d07bb3..6884a3c 100644
218	--- a/demos/polygons.c
219	+++ b/demos/polygons.c
220	@@ -74,7 +74,6 @@ main (int argc,
221	ChamplainPolygon *polygon;
222	gfloat width, total_width = 0;;
223
224	- g_thread_init (NULL);
225	clutter_init (&argc, &argv);
226
227	stage = clutter_stage_get_default ();
228	diff --git a/demos/url-marker.c b/demos/url-marker.c
229	index 6fbbfb0..71d90c5 100644
230	--- a/demos/url-marker.c
231	+++ b/demos/url-marker.c
232	@@ -244,7 +244,6 @@ main (int argc, char *argv[])
233	ChamplainLayer *layer;
234	SoupSession *session;
235
236	- g_thread_init (NULL);
237	clutter_init (&argc, &argv);
238
239	stage = clutter_stage_get_default ();

Gentoo Archives: gentoo-commits