1 |
tetromino 12/04/08 02:24:05 |
2 |
|
3 |
Added: pan-0.135-glib-2.31.patch |
4 |
Log: |
5 |
Fix building with >=glib-2.31 (bug #401437, thanks to Mathias for reporting). |
6 |
|
7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-nntp/pan/files/pan-0.135-glib-2.31.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/pan/files/pan-0.135-glib-2.31.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/pan/files/pan-0.135-glib-2.31.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: pan-0.135-glib-2.31.patch |
16 |
=================================================================== |
17 |
Author: Dominique Leuenberger <dominique-gnomezilla@×××××××××××.net> |
18 |
|
19 |
glib 2.31 only allows #include'ing glib.h (and a few exceptions to this). |
20 |
|
21 |
https://bugzilla.gnome.org/show_bug.cgi?id=665289 |
22 |
|
23 |
Index: pan-0.135/pan/data-impl/data-impl.cc |
24 |
=================================================================== |
25 |
--- pan-0.135.orig/pan/data-impl/data-impl.cc |
26 |
+++ pan-0.135/pan/data-impl/data-impl.cc |
27 |
@@ -24,7 +24,7 @@ |
28 |
#include <config.h> |
29 |
extern "C" { |
30 |
#include <glib/gi18n.h> |
31 |
- #include <glib/gfileutils.h> // for g_build_filename |
32 |
+ #include <glib.h> // for g_build_filename |
33 |
} |
34 |
#include <pan/general/debug.h> |
35 |
#include <pan/general/file-util.h> |
36 |
Index: pan-0.135/pan/data/article-cache.h |
37 |
=================================================================== |
38 |
--- pan-0.135.orig/pan/data/article-cache.h |
39 |
+++ pan-0.135/pan/data/article-cache.h |
40 |
@@ -23,7 +23,7 @@ |
41 |
#include <map> |
42 |
#include <vector> |
43 |
extern "C" { |
44 |
- #include <glib/gtypes.h> // for guint64 |
45 |
+ #include <glib.h> // for guint64 |
46 |
} |
47 |
#include <pan/general/string-view.h> |
48 |
#include <pan/general/quark.h> |
49 |
Index: pan-0.135/pan/general/file-util.h |
50 |
=================================================================== |
51 |
--- pan-0.135.orig/pan/general/file-util.h |
52 |
+++ pan-0.135/pan/general/file-util.h |
53 |
@@ -25,7 +25,7 @@ |
54 |
extern "C" { |
55 |
#include <stddef.h> |
56 |
#include <stdio.h> |
57 |
- #include <glib/gtypes.h> |
58 |
+ #include <glib.h> |
59 |
#include <glib/gstdio.h> |
60 |
} |
61 |
#include <pan/general/string-view.h> |
62 |
Index: pan-0.135/pan/general/locking.h |
63 |
=================================================================== |
64 |
--- pan-0.135.orig/pan/general/locking.h |
65 |
+++ pan-0.135/pan/general/locking.h |
66 |
@@ -22,7 +22,7 @@ |
67 |
#ifndef _Mutex_h_ |
68 |
#define _Mutex_h_ |
69 |
|
70 |
-#include <glib/gthread.h> |
71 |
+#include <glib.h> |
72 |
|
73 |
namespace pan |
74 |
{ |
75 |
Index: pan-0.135/pan/general/macros.h |
76 |
=================================================================== |
77 |
--- pan-0.135.orig/pan/general/macros.h |
78 |
+++ pan-0.135/pan/general/macros.h |
79 |
@@ -62,12 +62,11 @@ |
80 |
|
81 |
extern "C" |
82 |
{ |
83 |
- #include <glibconfig.h> // get the version |
84 |
- #include <glib/gutils.h> // get GLIB_CHECK_VERSION |
85 |
+ #include <glib.h> |
86 |
|
87 |
// pick up g_assert() |
88 |
#if GLIB_CHECK_VERSION(2,16,0) |
89 |
- #include <glib/gtestutils.h> |
90 |
+ #include <glib.h> |
91 |
#else |
92 |
#include <glib/gmessages.h> |
93 |
#endif |
94 |
Index: pan-0.135/pan/general/time-elapsed.h |
95 |
=================================================================== |
96 |
--- pan-0.135.orig/pan/general/time-elapsed.h |
97 |
+++ pan-0.135/pan/general/time-elapsed.h |
98 |
@@ -1,9 +1,7 @@ |
99 |
#ifndef __Time_Elapsed_h__ |
100 |
#define __Time_Elapsed_h__ |
101 |
|
102 |
-#include <glib/gtypes.h> // for GTimeVal |
103 |
-#include <glib/gmain.h> // for g_get_current_time |
104 |
-#include <glib/gtimer.h> // for GUSEC_PER_SEC |
105 |
+#include <glib.h> |
106 |
|
107 |
namespace pan |
108 |
{ |
109 |
Index: pan-0.135/pan/general/worker-pool.cc |
110 |
=================================================================== |
111 |
--- pan-0.135.orig/pan/general/worker-pool.cc |
112 |
+++ pan-0.135/pan/general/worker-pool.cc |
113 |
@@ -21,7 +21,7 @@ |
114 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
115 |
*/ |
116 |
#include <cassert> |
117 |
-#include <glib/gmain.h> // for g_idle_add |
118 |
+#include <glib.h> // for g_idle_add |
119 |
#include <pan/general/debug.h> |
120 |
#include <pan/general/macros.h> |
121 |
#include "worker-pool.h" |
122 |
Index: pan-0.135/pan/general/worker-pool.h |
123 |
=================================================================== |
124 |
--- pan-0.135.orig/pan/general/worker-pool.h |
125 |
+++ pan-0.135/pan/general/worker-pool.h |
126 |
@@ -24,8 +24,7 @@ |
127 |
#define _Worker_Pool_H_ |
128 |
|
129 |
#include <set> |
130 |
-#include <glib/gtypes.h> |
131 |
-#include <glib/gthreadpool.h> |
132 |
+#include <glib.h> |
133 |
|
134 |
namespace pan |
135 |
{ |
136 |
Index: pan-0.135/pan/gui/render-bytes.cc |
137 |
=================================================================== |
138 |
--- pan-0.135.orig/pan/gui/render-bytes.cc |
139 |
+++ pan-0.135/pan/gui/render-bytes.cc |
140 |
@@ -1,4 +1,4 @@ |
141 |
-#include <glib/gutils.h> // g_snprintf |
142 |
+#include <glib.h> // g_snprintf |
143 |
#include "render-bytes.h" |
144 |
|
145 |
namespace pan |
146 |
Index: pan-0.135/pan/gui/render-bytes.h |
147 |
=================================================================== |
148 |
--- pan-0.135.orig/pan/gui/render-bytes.h |
149 |
+++ pan-0.135/pan/gui/render-bytes.h |
150 |
@@ -1,6 +1,6 @@ |
151 |
#ifndef RENDER_BYTES_H |
152 |
#define RENDER_BYTES_H |
153 |
-#include <glib/gtypes.h> |
154 |
+#include <glib.h> |
155 |
namespace pan { |
156 |
extern char* render_bytes (guint64); |
157 |
} |
158 |
Index: pan-0.135/pan/tasks/socket-impl-gio.h |
159 |
=================================================================== |
160 |
--- pan-0.135.orig/pan/tasks/socket-impl-gio.h |
161 |
+++ pan-0.135/pan/tasks/socket-impl-gio.h |
162 |
@@ -21,8 +21,7 @@ |
163 |
#define __SocketGIO_h__ |
164 |
|
165 |
#include <string> |
166 |
-#include <glib/giochannel.h> |
167 |
-#include <glib/gstring.h> |
168 |
+#include <glib.h> |
169 |
#include <pan/tasks/socket.h> |
170 |
|
171 |
namespace pan |
172 |
Index: pan-0.135/pan/usenet-utils/mime-utils.h |
173 |
=================================================================== |
174 |
--- pan-0.135.orig/pan/usenet-utils/mime-utils.h |
175 |
+++ pan-0.135/pan/usenet-utils/mime-utils.h |
176 |
@@ -21,7 +21,7 @@ |
177 |
#define _UtilMime_h_ |
178 |
|
179 |
#include <vector> |
180 |
-#include <glib/gtypes.h> |
181 |
+#include <glib.h> |
182 |
#include <gmime/gmime-filter.h> |
183 |
#include <gmime/gmime-stream.h> |
184 |
#include <gmime/gmime-message.h> |
185 |
Index: pan-0.135/pan/usenet-utils/text-massager.cc |
186 |
=================================================================== |
187 |
--- pan-0.135.orig/pan/usenet-utils/text-massager.cc |
188 |
+++ pan-0.135/pan/usenet-utils/text-massager.cc |
189 |
@@ -25,7 +25,6 @@ |
190 |
extern "C" { |
191 |
#include <glib/gi18n.h> |
192 |
} |
193 |
-#include <glib/gunicode.h> |
194 |
#include "text-massager.h" |
195 |
#include <pan/general/log.h> |
196 |
using namespace pan; |