~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix
» Revision
161
: debian/patches/070_mandatory-relibtoolize.patch
« back to all changes in this revision
Viewing changes to debian/patches/070_mandatory-relibtoolize.patch
- browse files at revision 161
- compare with another revision
- download diff
- download tarball
- view history from revision 161
- Committer: Bazaar Package Importer
- Author(s): Didier Roche
- Date: 2010-03-25 10:44:46 UTC
- Revision ID: james.westby@ubuntu.com-20100325104446-jvhke94wqmkyzqg0
Tags: 2.20.0-0ubuntu2
* add introspection:
- debian/rules:
- toogle configure option
- add new package to BINARY_ARCH_PKGS
- add dh_girepository call
- debian/control.in:
- add gobject-introspection, libgirepository1.0-dev, gir1.0-atk-1.0,
gir1.0-pango-1.0, gir1.0-glib-2.0 and gir1.0-freedesktop build-dep
- add gir package (gir1.0-gtk-2.0)
- debian/libgtk2.0-dev.install.in: add gir files
- add debian/gir1.0-gtk-2.0.install
- add debian/patches/065_build_introspection_file.patch to get proper
source dir (build dir != src dir for debian/ubuntu)
* debian/patches/070_mandatory-relibtoolize.patch:
- refreshed
- debian/rules:
- toogle configure option
- add new package to BINARY_ARCH_PKGS
- add dh_girepository call
- debian/control.in:
- add gobject-introspection, libgirepository1.0-dev, gir1.0-atk-1.0,
gir1.0-pango-1.0, gir1.0-glib-2.0 and gir1.0-freedesktop build-dep
- add gir package (gir1.0-gtk-2.0)
- debian/libgtk2.0-dev.install.in: add gir files
- add debian/gir1.0-gtk-2.0.install
- add debian/patches/065_build_introspection_file.patch to get proper
source dir (build dir != src dir for debian/ubuntu)
* debian/patches/070_mandatory-relibtoolize.patch:
- refreshed
added
removed
debian/patches/070_mandatory-relibtoolize.patch
1
diff -Naur gtk+2.0-2.20.0.old/aclocal.m4 gtk+2.0-2.20.0/aclocal.m4
2
--- gtk+2.0-2.20.0.old/aclocal.m4 2010-03-23 04:32:53.000000000 +0100
3
+++ gtk+2.0-2.20.0/aclocal.m4 2010-03-23 16:10:17.568931245 +0100
4
@@ -732,14 +732,16 @@
5
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
6
# ---------------------------------------------
7
m4_define([_PKG_CONFIG],
8
-[if test -n "$$1"; then
9
- pkg_cv_[]$1="$$1"
10
- elif test -n "$PKG_CONFIG"; then
11
- PKG_CHECK_EXISTS([$3],
12
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
13
- [pkg_failed=yes])
14
- else
15
- pkg_failed=untried
16
+[if test -n "$PKG_CONFIG"; then
17
+ if test -n "$$1"; then
18
+ pkg_cv_[]$1="$$1"
19
+ else
20
+ PKG_CHECK_EXISTS([$3],
21
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
22
+ [pkg_failed=yes])
23
+ fi
24
+else
25
+ pkg_failed=untried
26
fi[]dnl
27
])# _PKG_CONFIG
28
29
@@ -783,9 +785,9 @@
30
if test $pkg_failed = yes; then
31
_PKG_SHORT_ERRORS_SUPPORTED
32
if test $_pkg_short_errors_supported = yes; then
33
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
34
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
35
else
36
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
37
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
38
fi
39
# Put the nasty error message in config.log where it belongs
40
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
41
diff -Naur gtk+2.0-2.20.0.old/configure gtk+2.0-2.20.0/configure
42
--- gtk+2.0-2.20.0.old/configure 2010-03-23 04:33:03.000000000 +0100
43
+++ gtk+2.0-2.20.0/configure 2010-03-23 16:10:19.056953886 +0100
1
Index: gtk+2.0-2.20.0/configure
2
===================================================================
3
--- gtk+2.0-2.20.0.orig/configure 2010-03-23 04:33:03.000000000 +0100
4
+++ gtk+2.0-2.20.0/configure 2010-03-24 11:37:03.694624491 +0100
44
5
@@ -816,6 +816,7 @@
45
6
GDK_DEP_LIBS
46
7
GDK_EXTRA_CFLAGS
58
19
am__fastdepCC_FALSE
59
20
am__fastdepCC_TRUE
60
21
CCDEPMODE
61
@@ -1147,6 +1150,10 @@
62
enable_shm
63
enable_xkb
64
enable_xinerama
65
+enable_xrandr
66
+enable_xfixes
67
+enable_xcomposite
68
+enable_xdamage
69
enable_rebuilds
70
enable_visibility
71
with_xinput
72
@@ -1837,6 +1844,12 @@
73
--enable-xkb support XKB [default=maybe]
74
--enable-xinerama support xinerama extension if available
75
[default=yes]
76
+ --enable-xrandr support XRandR extension if available [default=yes]
77
+ --enable-xfixes support XFixes extension if available [default=yes]
78
+ --enable-xcomposite support X Composite extension if available
79
+ [default=yes]
80
+ --enable-xdamage support X Damage extension if available
81
+ [default=yes]
82
--disable-rebuilds disable all source autogeneration rules
83
--disable-visibility don't use ELF visibility attributes
84
--enable-explicit-deps=[yes/no/auto]
85
@@ -4586,6 +4599,14 @@
22
@@ -4586,6 +4589,14 @@
86
23
87
24
88
25
97
34
98
35
if test -n "$ac_tool_prefix"; then
99
36
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
100
@@ -6066,13 +6087,13 @@
37
@@ -6066,13 +6077,13 @@
101
38
else
102
39
lt_cv_nm_interface="BSD nm"
103
40
echo "int some_variable = 0;" > conftest.$ac_ext
104
41
- (eval echo "\"\$as_me:6069: $ac_compile\"" >&5)
105
+ (eval echo "\"\$as_me:6090: $ac_compile\"" >&5)
42
+ (eval echo "\"\$as_me:6080: $ac_compile\"" >&5)
106
43
(eval "$ac_compile" 2>conftest.err)
107
44
cat conftest.err >&5
108
45
- (eval echo "\"\$as_me:6072: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
109
+ (eval echo "\"\$as_me:6093: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
46
+ (eval echo "\"\$as_me:6083: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
110
47
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
111
48
cat conftest.err >&5
112
49
- (eval echo "\"\$as_me:6075: output\"" >&5)
113
+ (eval echo "\"\$as_me:6096: output\"" >&5)
50
+ (eval echo "\"\$as_me:6086: output\"" >&5)
114
51
cat conftest.out >&5
115
52
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
116
53
lt_cv_nm_interface="MS dumpbin"
117
@@ -6535,11 +6556,11 @@
118
;;
119
120
# This must be Linux ELF.
121
-linux* | k*bsd*-gnu)
122
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
123
lt_cv_deplibs_check_method=pass_all
124
;;
125
126
-netbsd*)
127
+netbsd* | netbsdelf*-gnu)
128
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
129
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
130
else
131
@@ -7275,7 +7296,7 @@
54
@@ -7275,7 +7286,7 @@
132
55
;;
133
56
*-*-irix6*)
134
57
# Find out which ABI we are using.
135
58
- echo '#line 7278 "configure"' > conftest.$ac_ext
136
+ echo '#line 7299 "configure"' > conftest.$ac_ext
59
+ echo '#line 7289 "configure"' > conftest.$ac_ext
137
60
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
138
61
(eval $ac_compile) 2>&5
139
62
ac_status=$?
140
@@ -9299,11 +9320,11 @@
63
@@ -9299,11 +9310,11 @@
141
64
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
142
65
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
143
66
-e 's:$: $lt_compiler_flag:'`
144
67
- (eval echo "\"\$as_me:9302: $lt_compile\"" >&5)
145
+ (eval echo "\"\$as_me:9323: $lt_compile\"" >&5)
68
+ (eval echo "\"\$as_me:9313: $lt_compile\"" >&5)
146
69
(eval "$lt_compile" 2>conftest.err)
147
70
ac_status=$?
148
71
cat conftest.err >&5
149
72
- echo "$as_me:9306: \$? = $ac_status" >&5
150
+ echo "$as_me:9327: \$? = $ac_status" >&5
73
+ echo "$as_me:9317: \$? = $ac_status" >&5
151
74
if (exit $ac_status) && test -s "$ac_outfile"; then
152
75
# The compiler can only warn and ignore the option if not recognized
153
76
# So say no if there are warnings other than the usual output.
154
@@ -9468,7 +9489,7 @@
155
lt_prog_compiler_static='-non_shared'
156
;;
157
158
- linux* | k*bsd*-gnu)
159
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
160
case $cc_basename in
161
# old Intel for x86_64 which still supported -KPIC.
162
ecc*)
163
@@ -9638,11 +9659,11 @@
77
@@ -9638,11 +9649,11 @@
164
78
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
165
79
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
166
80
-e 's:$: $lt_compiler_flag:'`
167
81
- (eval echo "\"\$as_me:9641: $lt_compile\"" >&5)
168
+ (eval echo "\"\$as_me:9662: $lt_compile\"" >&5)
82
+ (eval echo "\"\$as_me:9652: $lt_compile\"" >&5)
169
83
(eval "$lt_compile" 2>conftest.err)
170
84
ac_status=$?
171
85
cat conftest.err >&5
172
86
- echo "$as_me:9645: \$? = $ac_status" >&5
173
+ echo "$as_me:9666: \$? = $ac_status" >&5
87
+ echo "$as_me:9656: \$? = $ac_status" >&5
174
88
if (exit $ac_status) && test -s "$ac_outfile"; then
175
89
# The compiler can only warn and ignore the option if not recognized
176
90
# So say no if there are warnings other than the usual output.
177
@@ -9743,11 +9764,11 @@
91
@@ -9743,11 +9754,11 @@
178
92
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
179
93
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
180
94
-e 's:$: $lt_compiler_flag:'`
181
95
- (eval echo "\"\$as_me:9746: $lt_compile\"" >&5)
182
+ (eval echo "\"\$as_me:9767: $lt_compile\"" >&5)
96
+ (eval echo "\"\$as_me:9757: $lt_compile\"" >&5)
183
97
(eval "$lt_compile" 2>out/conftest.err)
184
98
ac_status=$?
185
99
cat out/conftest.err >&5
186
100
- echo "$as_me:9750: \$? = $ac_status" >&5
187
+ echo "$as_me:9771: \$? = $ac_status" >&5
101
+ echo "$as_me:9761: \$? = $ac_status" >&5
188
102
if (exit $ac_status) && test -s out/conftest2.$ac_objext
189
103
then
190
104
# The compiler can only warn and ignore the option if not recognized
191
@@ -9798,11 +9819,11 @@
105
@@ -9798,11 +9809,11 @@
192
106
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
193
107
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
194
108
-e 's:$: $lt_compiler_flag:'`
195
109
- (eval echo "\"\$as_me:9801: $lt_compile\"" >&5)
196
+ (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)
110
+ (eval echo "\"\$as_me:9812: $lt_compile\"" >&5)
197
111
(eval "$lt_compile" 2>out/conftest.err)
198
112
ac_status=$?
199
113
cat out/conftest.err >&5
200
114
- echo "$as_me:9805: \$? = $ac_status" >&5
201
+ echo "$as_me:9826: \$? = $ac_status" >&5
115
+ echo "$as_me:9816: \$? = $ac_status" >&5
202
116
if (exit $ac_status) && test -s out/conftest2.$ac_objext
203
117
then
204
118
# The compiler can only warn and ignore the option if not recognized
205
@@ -9917,6 +9938,9 @@
206
openbsd*)
207
with_gnu_ld=no
208
;;
209
+ linux* | k*bsd*-gnu)
210
+ link_all_deplibs=no
211
+ ;;
212
esac
213
214
ld_shlibs=yes
215
@@ -9938,6 +9962,7 @@
216
fi
217
supports_anon_versioning=no
218
case `$LD -v 2>&1` in
219
+ *GNU\ gold*) supports_anon_versioning=yes ;;
220
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
221
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
222
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
223
@@ -10029,7 +10054,7 @@
224
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
225
;;
226
227
- gnu* | linux* | tpf* | k*bsd*-gnu)
228
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
229
tmp_diet=no
230
if test "$host_os" = linux-dietlibc; then
231
case $cc_basename in
232
@@ -10099,7 +10124,7 @@
233
fi
234
;;
235
236
- netbsd*)
237
+ netbsd* | netbsdelf*-gnu)
238
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
239
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
240
wlarc=
241
@@ -10274,6 +10299,7 @@
242
if test "$aix_use_runtimelinking" = yes; then
243
shared_flag="$shared_flag "'${wl}-G'
244
fi
245
+ link_all_deplibs=no
246
else
247
# not using gcc
248
if test "$host_cpu" = ia64; then
249
@@ -10600,7 +10626,7 @@
250
link_all_deplibs=yes
251
;;
252
253
- netbsd*)
254
+ netbsd* | netbsdelf*-gnu)
255
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
256
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
257
else
258
@@ -11490,7 +11516,7 @@
259
;;
260
261
# This must be Linux ELF.
262
-linux* | k*bsd*-gnu)
263
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
264
version_type=linux
265
need_lib_prefix=no
266
need_version=no
267
@@ -11530,13 +11556,10 @@
268
# before this can be enabled.
269
hardcode_into_libs=yes
270
271
- # Add ABI-specific directories to the system library path.
272
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
273
-
274
# Append ld.so.conf contents to the search path
275
if test -f /etc/ld.so.conf; then
276
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
277
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
278
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
279
fi
280
281
# We used to test for /lib/ld.so.1 and disable shared libraries on
282
@@ -11548,6 +11571,18 @@
283
dynamic_linker='GNU/Linux ld.so'
284
;;
285
286
+netbsdelf*-gnu)
287
+ version_type=linux
288
+ need_lib_prefix=no
289
+ need_version=no
290
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
291
+ soname_spec='${libname}${release}${shared_ext}$major'
292
+ shlibpath_var=LD_LIBRARY_PATH
293
+ shlibpath_overrides_runpath=no
294
+ hardcode_into_libs=yes
295
+ dynamic_linker='NetBSD ld.elf_so'
296
+ ;;
297
+
298
netbsd*)
299
version_type=sunos
300
need_lib_prefix=no
301
@@ -12168,7 +12203,7 @@
119
@@ -12168,7 +12179,7 @@
302
120
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
303
121
lt_status=$lt_dlunknown
304
122
cat > conftest.$ac_ext <<_LT_EOF
305
123
-#line 12171 "configure"
306
+#line 12206 "configure"
124
+#line 12182 "configure"
307
125
#include "confdefs.h"
308
126
309
127
#if HAVE_DLFCN_H
310
@@ -12264,7 +12299,7 @@
128
@@ -12264,7 +12275,7 @@
311
129
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
312
130
lt_status=$lt_dlunknown
313
131
cat > conftest.$ac_ext <<_LT_EOF
314
132
-#line 12267 "configure"
315
+#line 12302 "configure"
133
+#line 12278 "configure"
316
134
#include "confdefs.h"
317
135
318
136
#if HAVE_DLFCN_H
319
@@ -13204,7 +13239,7 @@
320
inherit_rpath_CXX=yes
321
;;
322
323
- linux* | k*bsd*-gnu)
324
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
325
case $cc_basename in
326
KCC*)
327
# Kuck and Associates, Inc. (KAI) C++ Compiler
328
@@ -14032,7 +14067,7 @@
329
;;
330
esac
331
;;
332
- linux* | k*bsd*-gnu)
333
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
334
case $cc_basename in
335
KCC*)
336
# KAI C++ Compiler
337
@@ -14096,7 +14131,7 @@
338
;;
339
esac
340
;;
341
- netbsd*)
342
+ netbsd* | netbsdelf*-gnu)
343
;;
344
*qnx* | *nto*)
345
# QNX uses GNU C++, but need to define -shared option too, otherwise
346
@@ -14220,11 +14255,11 @@
137
@@ -14220,11 +14231,11 @@
347
138
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
348
139
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
349
140
-e 's:$: $lt_compiler_flag:'`
350
141
- (eval echo "\"\$as_me:14223: $lt_compile\"" >&5)
351
+ (eval echo "\"\$as_me:14258: $lt_compile\"" >&5)
142
+ (eval echo "\"\$as_me:14234: $lt_compile\"" >&5)
352
143
(eval "$lt_compile" 2>conftest.err)
353
144
ac_status=$?
354
145
cat conftest.err >&5
355
146
- echo "$as_me:14227: \$? = $ac_status" >&5
356
+ echo "$as_me:14262: \$? = $ac_status" >&5
147
+ echo "$as_me:14238: \$? = $ac_status" >&5
357
148
if (exit $ac_status) && test -s "$ac_outfile"; then
358
149
# The compiler can only warn and ignore the option if not recognized
359
150
# So say no if there are warnings other than the usual output.
360
@@ -14319,11 +14354,11 @@
151
@@ -14319,11 +14330,11 @@
361
152
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
362
153
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
363
154
-e 's:$: $lt_compiler_flag:'`
364
155
- (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
365
+ (eval echo "\"\$as_me:14357: $lt_compile\"" >&5)
156
+ (eval echo "\"\$as_me:14333: $lt_compile\"" >&5)
366
157
(eval "$lt_compile" 2>out/conftest.err)
367
158
ac_status=$?
368
159
cat out/conftest.err >&5
369
160
- echo "$as_me:14326: \$? = $ac_status" >&5
370
+ echo "$as_me:14361: \$? = $ac_status" >&5
161
+ echo "$as_me:14337: \$? = $ac_status" >&5
371
162
if (exit $ac_status) && test -s out/conftest2.$ac_objext
372
163
then
373
164
# The compiler can only warn and ignore the option if not recognized
374
@@ -14371,11 +14406,11 @@
165
@@ -14371,11 +14382,11 @@
375
166
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
376
167
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
377
168
-e 's:$: $lt_compiler_flag:'`
378
169
- (eval echo "\"\$as_me:14374: $lt_compile\"" >&5)
379
+ (eval echo "\"\$as_me:14409: $lt_compile\"" >&5)
170
+ (eval echo "\"\$as_me:14385: $lt_compile\"" >&5)
380
171
(eval "$lt_compile" 2>out/conftest.err)
381
172
ac_status=$?
382
173
cat out/conftest.err >&5
383
174
- echo "$as_me:14378: \$? = $ac_status" >&5
384
+ echo "$as_me:14413: \$? = $ac_status" >&5
175
+ echo "$as_me:14389: \$? = $ac_status" >&5
385
176
if (exit $ac_status) && test -s out/conftest2.$ac_objext
386
177
then
387
178
# The compiler can only warn and ignore the option if not recognized
388
@@ -14447,6 +14482,9 @@
389
cygwin* | mingw* | cegcc*)
390
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
391
;;
392
+ linux* | k*bsd*-gnu)
393
+ link_all_deplibs_CXX=no
394
+ ;;
395
*)
396
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
397
;;
398
@@ -14946,7 +14984,7 @@
399
;;
400
401
# This must be Linux ELF.
402
-linux* | k*bsd*-gnu)
403
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
404
version_type=linux
405
need_lib_prefix=no
406
need_version=no
407
@@ -14986,13 +15024,10 @@
408
# before this can be enabled.
409
hardcode_into_libs=yes
410
411
- # Add ABI-specific directories to the system library path.
412
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
413
-
414
# Append ld.so.conf contents to the search path
415
if test -f /etc/ld.so.conf; then
416
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
417
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
418
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
419
fi
420
421
# We used to test for /lib/ld.so.1 and disable shared libraries on
422
@@ -15004,6 +15039,18 @@
423
dynamic_linker='GNU/Linux ld.so'
424
;;
425
426
+netbsdelf*-gnu)
427
+ version_type=linux
428
+ need_lib_prefix=no
429
+ need_version=no
430
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
431
+ soname_spec='${libname}${release}${shared_ext}$major'
432
+ shlibpath_var=LD_LIBRARY_PATH
433
+ shlibpath_overrides_runpath=no
434
+ hardcode_into_libs=yes
435
+ dynamic_linker='NetBSD ld.elf_so'
436
+ ;;
437
+
438
netbsd*)
439
version_type=sunos
440
need_lib_prefix=no
441
@@ -17575,6 +17622,26 @@
442
enable_xinerama="yes"
443
fi
444
445
+# Check whether --enable-xrandr was given.
446
+if test "${enable_xrandr+set}" = set; then :
447
+ enableval=$enable_xrandr;
448
+fi
449
+
450
+# Check whether --enable-xfixes was given.
451
+if test "${enable_xfixes+set}" = set; then :
452
+ enableval=$enable_xfixes;
453
+fi
454
+
455
+# Check whether --enable-xcomposite was given.
456
+if test "${enable_xcomposite+set}" = set; then :
457
+ enableval=$enable_xcomposite;
458
+fi
459
+
460
+# Check whether --enable-xdamage was given.
461
+if test "${enable_xdamage+set}" = set; then :
462
+ enableval=$enable_xdamage;
463
+fi
464
+
465
# Check whether --enable-rebuilds was given.
466
if test "${enable_rebuilds+set}" = set; then :
467
enableval=$enable_rebuilds;
468
@@ -18776,10 +18843,11 @@
179
@@ -18776,10 +18787,11 @@
469
180
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
470
181
$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
471
182
481
192
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
482
193
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
483
194
ac_status=$?
484
@@ -18789,13 +18857,15 @@
195
@@ -18789,13 +18801,15 @@
485
196
else
486
197
pkg_failed=yes
487
198
fi
503
214
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6\""; } >&5
504
215
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.23.6 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6") 2>&5
505
216
ac_status=$?
506
@@ -18805,8 +18875,9 @@
217
@@ -18805,8 +18819,9 @@
507
218
else
508
219
pkg_failed=yes
509
220
fi
515
226
fi
516
227
517
228
518
@@ -18819,9 +18890,9 @@
229
@@ -18819,9 +18834,9 @@
519
230
_pkg_short_errors_supported=no
520
231
fi
521
232
if test $_pkg_short_errors_supported = yes; then
527
238
fi
528
239
# Put the nasty error message in config.log where it belongs
529
240
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
530
@@ -18873,10 +18944,11 @@
241
@@ -18873,10 +18888,11 @@
531
242
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
532
243
$as_echo_n "checking for CAIRO_BACKEND... " >&6; }
533
244
543
254
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
544
255
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
545
256
ac_status=$?
546
@@ -18886,13 +18958,15 @@
257
@@ -18886,13 +18902,15 @@
547
258
else
548
259
pkg_failed=yes
549
260
fi
565
276
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
566
277
($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
567
278
ac_status=$?
568
@@ -18902,8 +18976,9 @@
279
@@ -18902,8 +18920,9 @@
569
280
else
570
281
pkg_failed=yes
571
282
fi
577
288
fi
578
289
579
290
580
@@ -18916,9 +18991,9 @@
291
@@ -18916,9 +18935,9 @@
581
292
_pkg_short_errors_supported=no
582
293
fi
583
294
if test $_pkg_short_errors_supported = yes; then
589
300
fi
590
301
# Put the nasty error message in config.log where it belongs
591
302
echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
592
@@ -24022,7 +24097,8 @@
593
594
595
# Check for the RANDR extension
596
- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
597
+ if test x"$enable_xrandr" != xno && \
598
+ $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
599
600
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
601
602
@@ -24042,7 +24118,8 @@
603
604
# Checks for XFixes extension
605
606
- if $PKG_CONFIG --exists xfixes ; then
607
+ if test x"$enable_xfixes" != xno && \
608
+ $PKG_CONFIG --exists xfixes ; then
609
610
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
611
612
@@ -24053,7 +24130,8 @@
613
614
# Checks for Xcomposite extension
615
616
- if $PKG_CONFIG --exists xcomposite ; then
617
+ if test x"$enable_xcomposite" != xno && \
618
+ $PKG_CONFIG --exists xcomposite ; then
619
620
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
621
622
@@ -24064,7 +24142,7 @@
623
624
# Checks for Xdamage extension
625
626
- if $PKG_CONFIG --exists xdamage ; then
627
+ if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then
628
629
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
630
631
@@ -24180,10 +24258,11 @@
303
@@ -24180,10 +24199,11 @@
632
304
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
633
305
$as_echo_n "checking for DIRECTFB... " >&6; }
634
306
644
316
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
645
317
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
646
318
ac_status=$?
647
@@ -24193,13 +24272,15 @@
319
@@ -24193,13 +24213,15 @@
648
320
else
649
321
pkg_failed=yes
650
322
fi
666
338
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
667
339
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
668
340
ac_status=$?
669
@@ -24209,8 +24290,9 @@
341
@@ -24209,8 +24231,9 @@
670
342
else
671
343
pkg_failed=yes
672
344
fi
678
350
fi
679
351
680
352
681
@@ -24223,9 +24305,9 @@
353
@@ -24223,9 +24246,9 @@
682
354
_pkg_short_errors_supported=no
683
355
fi
684
356
if test $_pkg_short_errors_supported = yes; then
690
362
fi
691
363
# Put the nasty error message in config.log where it belongs
692
364
echo "$DIRECTFB_PKG_ERRORS" >&5
693
@@ -24345,16 +24427,18 @@
365
@@ -24345,16 +24368,18 @@
694
366
LDFLAGS="$saved_ldflags"
695
367
696
368
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
713
385
fi
714
386
715
387
716
@@ -24364,6 +24448,7 @@
388
@@ -24364,6 +24389,7 @@
717
389
718
390
719
391
721
393
########################################
722
394
# Check for Accessibility Toolkit flags
723
395
########################################
724
@@ -24438,7 +24523,7 @@
396
@@ -24438,7 +24464,7 @@
725
397
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
726
398
727
399
if test $enable_explicit_deps != yes ; then
730
402
fi
731
403
732
404
733
@@ -25669,6 +25754,10 @@
405
@@ -25669,6 +25695,10 @@
734
406
as_fn_error "conditional \"am__fastdepCC\" was never defined.
735
407
Usually this means the macro was only invoked conditionally." "$LINENO" 5
736
408
fi
741
413
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
742
414
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
743
415
Usually this means the macro was only invoked conditionally." "$LINENO" 5
744
diff -Naur gtk+2.0-2.20.0.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in
745
--- gtk+2.0-2.20.0.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
746
+++ gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-23 16:10:20.284927621 +0100
416
Index: gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in
417
===================================================================
418
--- gtk+2.0-2.20.0.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
419
+++ gtk+2.0-2.20.0/contrib/gdk-pixbuf-xlib/Makefile.in 2010-03-24 11:37:05.277625120 +0100
747
420
@@ -51,7 +51,7 @@
748
421
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
749
422
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
761
434
GDK_WLIBS = @GDK_WLIBS@
762
435
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
763
436
GLIB_CFLAGS = @GLIB_CFLAGS@
764
diff -Naur gtk+2.0-2.20.0.old/contrib/Makefile.in gtk+2.0-2.20.0/contrib/Makefile.in
765
--- gtk+2.0-2.20.0.old/contrib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
766
+++ gtk+2.0-2.20.0/contrib/Makefile.in 2010-03-23 16:10:20.164928008 +0100
437
Index: gtk+2.0-2.20.0/contrib/Makefile.in
438
===================================================================
439
--- gtk+2.0-2.20.0.orig/contrib/Makefile.in 2010-03-23 04:32:56.000000000 +0100
440
+++ gtk+2.0-2.20.0/contrib/Makefile.in 2010-03-24 11:37:05.101625250 +0100
767
441
@@ -47,7 +47,7 @@
768
442
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
769
443
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
781
455
GDK_WLIBS = @GDK_WLIBS@
782
456
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
783
457
GLIB_CFLAGS = @GLIB_CFLAGS@
784
diff -Naur gtk+2.0-2.20.0.old/demos/gtk-demo/Makefile.in gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in
785
--- gtk+2.0-2.20.0.old/demos/gtk-demo/Makefile.in 2010-03-23 04:32:57.000000000 +0100
786
+++ gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in 2010-03-23 16:10:20.496928036 +0100
458
Index: gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in
459
===================================================================
460
--- gtk+2.0-2.20.0.orig/demos/gtk-demo/Makefile.in 2010-03-23 04:32:57.000000000 +0100
461
+++ gtk+2.0-2.20.0/demos/gtk-demo/Makefile.in 2010-03-24 11:37:05.581626410 +0100
787
462
@@ -49,7 +49,7 @@
788
463
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
789
464
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
801
476
GDK_WLIBS = @GDK_WLIBS@
802
477
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
803
478
GLIB_CFLAGS = @GLIB_CFLAGS@
804
diff -Naur gtk+2.0-2.20.0.old/demos/Makefile.in gtk+2.0-2.20.0/demos/Makefile.in
805
--- gtk+2.0-2.20.0.old/demos/Makefile.in 2010-03-23 04:32:56.000000000 +0100
806
+++ gtk+2.0-2.20.0/demos/Makefile.in 2010-03-23 16:10:20.396927968 +0100
479
Index: gtk+2.0-2.20.0/demos/Makefile.in
480
===================================================================
481
--- gtk+2.0-2.20.0.orig/demos/Makefile.in 2010-03-23 04:32:56.000000000 +0100
482
+++ gtk+2.0-2.20.0/demos/Makefile.in 2010-03-24 11:37:05.457624052 +0100
807
483
@@ -53,7 +53,7 @@
808
484
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
809
485
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
821
497
GDK_WLIBS = @GDK_WLIBS@
822
498
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
823
499
GLIB_CFLAGS = @GLIB_CFLAGS@
824
diff -Naur gtk+2.0-2.20.0.old/docs/faq/Makefile.in gtk+2.0-2.20.0/docs/faq/Makefile.in
825
--- gtk+2.0-2.20.0.old/docs/faq/Makefile.in 2010-03-23 04:32:57.000000000 +0100
826
+++ gtk+2.0-2.20.0/docs/faq/Makefile.in 2010-03-23 16:10:20.644927633 +0100
500
Index: gtk+2.0-2.20.0/docs/faq/Makefile.in
501
===================================================================
502
--- gtk+2.0-2.20.0.orig/docs/faq/Makefile.in 2010-03-23 04:32:57.000000000 +0100
503
+++ gtk+2.0-2.20.0/docs/faq/Makefile.in 2010-03-24 11:37:05.789626087 +0100
827
504
@@ -46,7 +46,7 @@
828
505
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
829
506
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
841
518
GDK_WLIBS = @GDK_WLIBS@
842
519
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
843
520
GLIB_CFLAGS = @GLIB_CFLAGS@
844
diff -Naur gtk+2.0-2.20.0.old/docs/Makefile.in gtk+2.0-2.20.0/docs/Makefile.in
845
--- gtk+2.0-2.20.0.old/docs/Makefile.in 2010-03-23 04:32:57.000000000 +0100
846
+++ gtk+2.0-2.20.0/docs/Makefile.in 2010-03-23 16:10:20.572927701 +0100
521
Index: gtk+2.0-2.20.0/docs/Makefile.in
522
===================================================================
523
--- gtk+2.0-2.20.0.orig/docs/Makefile.in 2010-03-23 04:32:57.000000000 +0100
524
+++ gtk+2.0-2.20.0/docs/Makefile.in 2010-03-24 11:37:05.689624904 +0100
847
525
@@ -46,7 +46,7 @@
848
526
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
849
527
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
861
539
GDK_WLIBS = @GDK_WLIBS@
862
540
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
863
541
GLIB_CFLAGS = @GLIB_CFLAGS@
864
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk/Makefile.in gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in
865
--- gtk+2.0-2.20.0.old/docs/reference/gdk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
866
+++ gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in 2010-03-23 16:10:20.896927691 +0100
542
Index: gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in
543
===================================================================
544
--- gtk+2.0-2.20.0.orig/docs/reference/gdk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
545
+++ gtk+2.0-2.20.0/docs/reference/gdk/Makefile.in 2010-03-24 11:37:06.241625503 +0100
867
546
@@ -53,7 +53,7 @@
868
547
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
869
548
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
881
560
GDK_WLIBS = @GDK_WLIBS@
882
561
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
883
562
GLIB_CFLAGS = @GLIB_CFLAGS@
884
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in
885
--- gtk+2.0-2.20.0.old/docs/reference/gdk-pixbuf/Makefile.in 2010-03-23 04:32:57.000000000 +0100
886
+++ gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in 2010-03-23 16:10:20.812927904 +0100
887
@@ -53,7 +53,7 @@
888
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
889
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
890
$(ACLOCAL_M4)
891
-mkinstalldirs = $(install_sh) -d
892
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
893
CONFIG_HEADER = $(top_builddir)/config.h
894
CONFIG_CLEAN_FILES = version.xml
895
CONFIG_CLEAN_VPATH_FILES =
896
@@ -165,6 +165,7 @@
897
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
898
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
899
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
900
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
901
GDK_WLIBS = @GDK_WLIBS@
902
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
903
GLIB_CFLAGS = @GLIB_CFLAGS@
904
diff -Naur gtk+2.0-2.20.0.old/docs/reference/gtk/Makefile.in gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in
905
--- gtk+2.0-2.20.0.old/docs/reference/gtk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
906
+++ gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in 2010-03-23 16:10:20.992928088 +0100
907
@@ -53,7 +53,7 @@
908
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
909
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
910
$(ACLOCAL_M4)
911
-mkinstalldirs = $(install_sh) -d
912
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
913
CONFIG_HEADER = $(top_builddir)/config.h
914
CONFIG_CLEAN_FILES = version.xml
915
CONFIG_CLEAN_VPATH_FILES =
916
@@ -165,6 +165,7 @@
917
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
918
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
919
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
920
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
921
GDK_WLIBS = @GDK_WLIBS@
922
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
923
GLIB_CFLAGS = @GLIB_CFLAGS@
924
diff -Naur gtk+2.0-2.20.0.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in
925
--- gtk+2.0-2.20.0.old/docs/reference/libgail-util/Makefile.in 2010-03-23 04:32:57.000000000 +0100
926
+++ gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in 2010-03-23 16:10:21.080928160 +0100
563
Index: gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in
564
===================================================================
565
--- gtk+2.0-2.20.0.orig/docs/reference/gdk-pixbuf/Makefile.in 2010-03-23 04:32:57.000000000 +0100
566
+++ gtk+2.0-2.20.0/docs/reference/gdk-pixbuf/Makefile.in 2010-03-24 11:37:06.085626429 +0100
567
@@ -53,7 +53,7 @@
568
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
569
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
570
$(ACLOCAL_M4)
571
-mkinstalldirs = $(install_sh) -d
572
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
573
CONFIG_HEADER = $(top_builddir)/config.h
574
CONFIG_CLEAN_FILES = version.xml
575
CONFIG_CLEAN_VPATH_FILES =
576
@@ -165,6 +165,7 @@
577
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
578
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
579
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
580
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
581
GDK_WLIBS = @GDK_WLIBS@
582
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
583
GLIB_CFLAGS = @GLIB_CFLAGS@
584
Index: gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in
585
===================================================================
586
--- gtk+2.0-2.20.0.orig/docs/reference/gtk/Makefile.in 2010-03-23 04:32:57.000000000 +0100
587
+++ gtk+2.0-2.20.0/docs/reference/gtk/Makefile.in 2010-03-24 11:37:06.449624990 +0100
588
@@ -53,7 +53,7 @@
589
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
590
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
591
$(ACLOCAL_M4)
592
-mkinstalldirs = $(install_sh) -d
593
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
594
CONFIG_HEADER = $(top_builddir)/config.h
595
CONFIG_CLEAN_FILES = version.xml
596
CONFIG_CLEAN_VPATH_FILES =
597
@@ -165,6 +165,7 @@
598
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
599
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
600
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
601
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
602
GDK_WLIBS = @GDK_WLIBS@
603
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
604
GLIB_CFLAGS = @GLIB_CFLAGS@
605
Index: gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in
606
===================================================================
607
--- gtk+2.0-2.20.0.orig/docs/reference/libgail-util/Makefile.in 2010-03-23 04:32:57.000000000 +0100
608
+++ gtk+2.0-2.20.0/docs/reference/libgail-util/Makefile.in 2010-03-24 11:37:06.573624695 +0100
927
609
@@ -52,7 +52,7 @@
928
610
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
929
611
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
941
623
GDK_WLIBS = @GDK_WLIBS@
942
624
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
943
625
GLIB_CFLAGS = @GLIB_CFLAGS@
944
diff -Naur gtk+2.0-2.20.0.old/docs/reference/Makefile.in gtk+2.0-2.20.0/docs/reference/Makefile.in
945
--- gtk+2.0-2.20.0.old/docs/reference/Makefile.in 2010-03-23 04:32:57.000000000 +0100
946
+++ gtk+2.0-2.20.0/docs/reference/Makefile.in 2010-03-23 16:10:20.720928078 +0100
626
Index: gtk+2.0-2.20.0/docs/reference/Makefile.in
627
===================================================================
628
--- gtk+2.0-2.20.0.orig/docs/reference/Makefile.in 2010-03-23 04:32:57.000000000 +0100
629
+++ gtk+2.0-2.20.0/docs/reference/Makefile.in 2010-03-24 11:37:05.881624794 +0100
947
630
@@ -46,7 +46,7 @@
948
631
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
949
632
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
961
644
GDK_WLIBS = @GDK_WLIBS@
962
645
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
963
646
GLIB_CFLAGS = @GLIB_CFLAGS@
964
diff -Naur gtk+2.0-2.20.0.old/docs/tools/Makefile.in gtk+2.0-2.20.0/docs/tools/Makefile.in
965
--- gtk+2.0-2.20.0.old/docs/tools/Makefile.in 2010-03-23 04:32:57.000000000 +0100
966
+++ gtk+2.0-2.20.0/docs/tools/Makefile.in 2010-03-23 16:10:21.172927840 +0100
647
Index: gtk+2.0-2.20.0/docs/tools/Makefile.in
648
===================================================================
649
--- gtk+2.0-2.20.0.orig/docs/tools/Makefile.in 2010-03-23 04:32:57.000000000 +0100
650
+++ gtk+2.0-2.20.0/docs/tools/Makefile.in 2010-03-24 11:37:06.713625577 +0100
967
651
@@ -48,7 +48,7 @@
968
652
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
969
653
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
981
665
GDK_WLIBS = @GDK_WLIBS@
982
666
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
983
667
GLIB_CFLAGS = @GLIB_CFLAGS@
984
diff -Naur gtk+2.0-2.20.0.old/docs/tutorial/Makefile.in gtk+2.0-2.20.0/docs/tutorial/Makefile.in
985
--- gtk+2.0-2.20.0.old/docs/tutorial/Makefile.in 2010-03-23 04:32:57.000000000 +0100
986
+++ gtk+2.0-2.20.0/docs/tutorial/Makefile.in 2010-03-23 16:10:21.248928284 +0100
668
Index: gtk+2.0-2.20.0/docs/tutorial/Makefile.in
669
===================================================================
670
--- gtk+2.0-2.20.0.orig/docs/tutorial/Makefile.in 2010-03-23 04:32:57.000000000 +0100
671
+++ gtk+2.0-2.20.0/docs/tutorial/Makefile.in 2010-03-24 11:37:06.813627672 +0100
987
672
@@ -46,7 +46,7 @@
988
673
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
989
674
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1001
686
GDK_WLIBS = @GDK_WLIBS@
1002
687
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1003
688
GLIB_CFLAGS = @GLIB_CFLAGS@
1004
diff -Naur gtk+2.0-2.20.0.old/gdk/directfb/Makefile.in gtk+2.0-2.20.0/gdk/directfb/Makefile.in
1005
--- gtk+2.0-2.20.0.old/gdk/directfb/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1006
+++ gtk+2.0-2.20.0/gdk/directfb/Makefile.in 2010-03-23 16:10:21.884927771 +0100
689
Index: gtk+2.0-2.20.0/gdk/directfb/Makefile.in
690
===================================================================
691
--- gtk+2.0-2.20.0.orig/gdk/directfb/Makefile.in 2010-03-23 04:32:58.000000000 +0100
692
+++ gtk+2.0-2.20.0/gdk/directfb/Makefile.in 2010-03-24 11:37:07.742624373 +0100
1007
693
@@ -48,7 +48,7 @@
1008
694
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1009
695
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1021
707
GDK_WLIBS = @GDK_WLIBS@
1022
708
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1023
709
GLIB_CFLAGS = @GLIB_CFLAGS@
1024
diff -Naur gtk+2.0-2.20.0.old/gdk/Makefile.in gtk+2.0-2.20.0/gdk/Makefile.in
1025
--- gtk+2.0-2.20.0.old/gdk/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1026
+++ gtk+2.0-2.20.0/gdk/Makefile.in 2010-03-23 16:10:21.784927902 +0100
710
Index: gtk+2.0-2.20.0/gdk/Makefile.in
711
===================================================================
712
--- gtk+2.0-2.20.0.orig/gdk/Makefile.in 2010-03-23 04:32:58.000000000 +0100
713
+++ gtk+2.0-2.20.0/gdk/Makefile.in 2010-03-24 11:37:07.630624674 +0100
1027
714
@@ -52,7 +52,7 @@
1028
715
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1029
716
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1041
728
GDK_WLIBS = @GDK_WLIBS@
1042
729
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1043
730
GLIB_CFLAGS = @GLIB_CFLAGS@
1044
diff -Naur gtk+2.0-2.20.0.old/gdk/quartz/Makefile.in gtk+2.0-2.20.0/gdk/quartz/Makefile.in
1045
--- gtk+2.0-2.20.0.old/gdk/quartz/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1046
+++ gtk+2.0-2.20.0/gdk/quartz/Makefile.in 2010-03-23 16:10:21.984927840 +0100
731
@@ -701,7 +702,7 @@
732
@HAVE_INTROSPECTION_TRUE@ $(gdk_c_sources) \
733
@HAVE_INTROSPECTION_TRUE@ gdkenumtypes.c \
734
@HAVE_INTROSPECTION_TRUE@ gdkenumtypes.h \
735
-@HAVE_INTROSPECTION_TRUE@ $(srcdir)/x11/*.c
736
+@HAVE_INTROSPECTION_TRUE@ x11/*.c
737
738
@HAVE_INTROSPECTION_TRUE@Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
739
@HAVE_INTROSPECTION_TRUE@Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
740
Index: gtk+2.0-2.20.0/gdk/quartz/Makefile.in
741
===================================================================
742
--- gtk+2.0-2.20.0.orig/gdk/quartz/Makefile.in 2010-03-23 04:32:58.000000000 +0100
743
+++ gtk+2.0-2.20.0/gdk/quartz/Makefile.in 2010-03-24 11:37:07.858624734 +0100
1047
744
@@ -48,7 +48,7 @@
1048
745
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1049
746
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1061
758
GDK_WLIBS = @GDK_WLIBS@
1062
759
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1063
760
GLIB_CFLAGS = @GLIB_CFLAGS@
1064
diff -Naur gtk+2.0-2.20.0.old/gdk/tests/Makefile.in gtk+2.0-2.20.0/gdk/tests/Makefile.in
1065
--- gtk+2.0-2.20.0.old/gdk/tests/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1066
+++ gtk+2.0-2.20.0/gdk/tests/Makefile.in 2010-03-23 16:10:22.064928013 +0100
761
Index: gtk+2.0-2.20.0/gdk/tests/Makefile.in
762
===================================================================
763
--- gtk+2.0-2.20.0.orig/gdk/tests/Makefile.in 2010-03-23 04:32:58.000000000 +0100
764
+++ gtk+2.0-2.20.0/gdk/tests/Makefile.in 2010-03-24 11:37:07.950624070 +0100
1067
765
@@ -48,7 +48,7 @@
1068
766
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1069
767
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1081
779
GDK_WLIBS = @GDK_WLIBS@
1082
780
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1083
781
GLIB_CFLAGS = @GLIB_CFLAGS@
1084
diff -Naur gtk+2.0-2.20.0.old/gdk/win32/Makefile.in gtk+2.0-2.20.0/gdk/win32/Makefile.in
1085
--- gtk+2.0-2.20.0.old/gdk/win32/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1086
+++ gtk+2.0-2.20.0/gdk/win32/Makefile.in 2010-03-23 16:10:22.168927890 +0100
782
Index: gtk+2.0-2.20.0/gdk/win32/Makefile.in
783
===================================================================
784
--- gtk+2.0-2.20.0.orig/gdk/win32/Makefile.in 2010-03-23 04:32:59.000000000 +0100
785
+++ gtk+2.0-2.20.0/gdk/win32/Makefile.in 2010-03-24 11:37:08.106624209 +0100
1087
786
@@ -48,7 +48,7 @@
1088
787
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1089
788
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1101
800
GDK_WLIBS = @GDK_WLIBS@
1102
801
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1103
802
GLIB_CFLAGS = @GLIB_CFLAGS@
1104
diff -Naur gtk+2.0-2.20.0.old/gdk/win32/rc/Makefile.in gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in
1105
--- gtk+2.0-2.20.0.old/gdk/win32/rc/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1106
+++ gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in 2010-03-23 16:10:22.244954176 +0100
803
Index: gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in
804
===================================================================
805
--- gtk+2.0-2.20.0.orig/gdk/win32/rc/Makefile.in 2010-03-23 04:32:59.000000000 +0100
806
+++ gtk+2.0-2.20.0/gdk/win32/rc/Makefile.in 2010-03-24 11:37:08.214624796 +0100
1107
807
@@ -47,7 +47,7 @@
1108
808
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1109
809
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1121
821
GDK_WLIBS = @GDK_WLIBS@
1122
822
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1123
823
GLIB_CFLAGS = @GLIB_CFLAGS@
1124
diff -Naur gtk+2.0-2.20.0.old/gdk/x11/Makefile.in gtk+2.0-2.20.0/gdk/x11/Makefile.in
1125
--- gtk+2.0-2.20.0.old/gdk/x11/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1126
+++ gtk+2.0-2.20.0/gdk/x11/Makefile.in 2010-03-23 16:10:22.357928458 +0100
824
Index: gtk+2.0-2.20.0/gdk/x11/Makefile.in
825
===================================================================
826
--- gtk+2.0-2.20.0.orig/gdk/x11/Makefile.in 2010-03-23 04:32:59.000000000 +0100
827
+++ gtk+2.0-2.20.0/gdk/x11/Makefile.in 2010-03-24 11:37:08.369624735 +0100
1127
828
@@ -53,7 +53,7 @@
1128
829
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1129
830
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1141
842
GDK_WLIBS = @GDK_WLIBS@
1142
843
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1143
844
GLIB_CFLAGS = @GLIB_CFLAGS@
1144
diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/Makefile.in gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in
1145
--- gtk+2.0-2.20.0.old/gdk-pixbuf/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1146
+++ gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in 2010-03-23 16:10:21.524928241 +0100
845
Index: gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in
846
===================================================================
847
--- gtk+2.0-2.20.0.orig/gdk-pixbuf/Makefile.in 2010-03-23 04:32:58.000000000 +0100
848
+++ gtk+2.0-2.20.0/gdk-pixbuf/Makefile.in 2010-03-24 11:37:07.253624862 +0100
1147
849
@@ -58,7 +58,7 @@
1148
850
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1149
851
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1178
880
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
1179
881
test_gdk_pixbuf_LDADD = $(LDADDS)
1180
882
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
1181
diff -Naur gtk+2.0-2.20.0.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in
1182
--- gtk+2.0-2.20.0.old/gdk-pixbuf/pixops/Makefile.in 2010-03-23 04:32:58.000000000 +0100
1183
+++ gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in 2010-03-23 16:10:21.632928620 +0100
883
Index: gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in
884
===================================================================
885
--- gtk+2.0-2.20.0.orig/gdk-pixbuf/pixops/Makefile.in 2010-03-23 04:32:58.000000000 +0100
886
+++ gtk+2.0-2.20.0/gdk-pixbuf/pixops/Makefile.in 2010-03-24 11:37:07.385625303 +0100
1184
887
@@ -49,7 +49,7 @@
1185
888
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1186
889
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1198
901
GDK_WLIBS = @GDK_WLIBS@
1199
902
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1200
903
GLIB_CFLAGS = @GLIB_CFLAGS@
1201
diff -Naur gtk+2.0-2.20.0.old/gtk/Makefile.in gtk+2.0-2.20.0/gtk/Makefile.in
1202
--- gtk+2.0-2.20.0.old/gtk/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1203
+++ gtk+2.0-2.20.0/gtk/Makefile.in 2010-03-23 16:10:22.693928066 +0100
904
Index: gtk+2.0-2.20.0/gtk/Makefile.in
905
===================================================================
906
--- gtk+2.0-2.20.0.orig/gtk/Makefile.in 2010-03-23 04:32:59.000000000 +0100
907
+++ gtk+2.0-2.20.0/gtk/Makefile.in 2010-03-24 11:37:08.805626166 +0100
1204
908
@@ -84,7 +84,7 @@
1205
909
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1206
910
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1257
961
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
1258
962
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
1259
963
gtkrbtree.h gtkrecentchooserdefault.h \
1260
diff -Naur gtk+2.0-2.20.0.old/gtk/tests/Makefile.in gtk+2.0-2.20.0/gtk/tests/Makefile.in
1261
--- gtk+2.0-2.20.0.old/gtk/tests/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1262
+++ gtk+2.0-2.20.0/gtk/tests/Makefile.in 2010-03-23 16:10:22.817927910 +0100
964
Index: gtk+2.0-2.20.0/gtk/tests/Makefile.in
965
===================================================================
966
--- gtk+2.0-2.20.0.orig/gtk/tests/Makefile.in 2010-03-23 04:32:59.000000000 +0100
967
+++ gtk+2.0-2.20.0/gtk/tests/Makefile.in 2010-03-24 11:37:08.977625200 +0100
1263
968
@@ -49,7 +49,7 @@
1264
969
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1265
970
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1277
982
GDK_WLIBS = @GDK_WLIBS@
1278
983
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1279
984
GLIB_CFLAGS = @GLIB_CFLAGS@
1280
diff -Naur gtk+2.0-2.20.0.old/gtk/theme-bits/Makefile.in gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in
1281
--- gtk+2.0-2.20.0.old/gtk/theme-bits/Makefile.in 2010-03-23 04:32:59.000000000 +0100
1282
+++ gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in 2010-03-23 16:10:22.913927896 +0100
985
Index: gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in
986
===================================================================
987
--- gtk+2.0-2.20.0.orig/gtk/theme-bits/Makefile.in 2010-03-23 04:32:59.000000000 +0100
988
+++ gtk+2.0-2.20.0/gtk/theme-bits/Makefile.in 2010-03-24 11:37:09.110625276 +0100
1283
989
@@ -48,7 +48,7 @@
1284
990
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1285
991
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1297
1003
GDK_WLIBS = @GDK_WLIBS@
1298
1004
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1299
1005
GLIB_CFLAGS = @GLIB_CFLAGS@
1300
diff -Naur gtk+2.0-2.20.0.old/ltmain.sh gtk+2.0-2.20.0/ltmain.sh
1301
--- gtk+2.0-2.20.0.old/ltmain.sh 2010-01-21 22:11:50.000000000 +0100
1302
+++ gtk+2.0-2.20.0/ltmain.sh 2010-03-23 16:10:14.001945713 +0100
1006
Index: gtk+2.0-2.20.0/ltmain.sh
1007
===================================================================
1008
--- gtk+2.0-2.20.0.orig/ltmain.sh 2010-01-21 22:11:50.000000000 +0100
1009
+++ gtk+2.0-2.20.0/ltmain.sh 2010-03-24 11:36:41.754624919 +0100
1303
1010
@@ -65,7 +65,7 @@
1304
1011
# compiler: $LTCC
1305
1012
# compiler flags: $LTCFLAGS
1378
1085
esac
1379
1086
;;
1380
1087
no)
1381
diff -Naur gtk+2.0-2.20.0.old/m4/libtool.m4 gtk+2.0-2.20.0/m4/libtool.m4
1382
--- gtk+2.0-2.20.0.old/m4/libtool.m4 2010-01-21 22:11:50.000000000 +0100
1383
+++ gtk+2.0-2.20.0/m4/libtool.m4 2010-03-23 16:10:14.108935558 +0100
1384
@@ -2445,7 +2445,7 @@
1385
;;
1386
1387
# This must be Linux ELF.
1388
-linux* | k*bsd*-gnu)
1389
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1390
version_type=linux
1391
need_lib_prefix=no
1392
need_version=no
1393
@@ -2470,13 +2470,10 @@
1394
# before this can be enabled.
1395
hardcode_into_libs=yes
1396
1397
- # Add ABI-specific directories to the system library path.
1398
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1399
-
1400
# Append ld.so.conf contents to the search path
1401
if test -f /etc/ld.so.conf; then
1402
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1403
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1404
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1405
fi
1406
1407
# We used to test for /lib/ld.so.1 and disable shared libraries on
1408
@@ -2488,6 +2485,18 @@
1409
dynamic_linker='GNU/Linux ld.so'
1410
;;
1411
1412
+netbsdelf*-gnu)
1413
+ version_type=linux
1414
+ need_lib_prefix=no
1415
+ need_version=no
1416
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1417
+ soname_spec='${libname}${release}${shared_ext}$major'
1418
+ shlibpath_var=LD_LIBRARY_PATH
1419
+ shlibpath_overrides_runpath=no
1420
+ hardcode_into_libs=yes
1421
+ dynamic_linker='NetBSD ld.elf_so'
1422
+ ;;
1423
+
1424
netbsd*)
1425
version_type=sunos
1426
need_lib_prefix=no
1427
@@ -3075,11 +3084,11 @@
1428
;;
1429
1430
# This must be Linux ELF.
1431
-linux* | k*bsd*-gnu)
1432
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
1433
lt_cv_deplibs_check_method=pass_all
1434
;;
1435
1436
-netbsd*)
1437
+netbsd* | netbsdelf*-gnu)
1438
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
1439
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
1440
else
1441
@@ -3696,7 +3705,7 @@
1442
;;
1443
esac
1444
;;
1445
- linux* | k*bsd*-gnu)
1446
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1447
case $cc_basename in
1448
KCC*)
1449
# KAI C++ Compiler
1450
@@ -3760,7 +3769,7 @@
1451
;;
1452
esac
1453
;;
1454
- netbsd*)
1455
+ netbsd* | netbsdelf*-gnu)
1456
;;
1457
*qnx* | *nto*)
1458
# QNX uses GNU C++, but need to define -shared option too, otherwise
1459
@@ -3980,7 +3989,7 @@
1460
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
1461
;;
1462
1463
- linux* | k*bsd*-gnu)
1464
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1465
case $cc_basename in
1466
# old Intel for x86_64 which still supported -KPIC.
1467
ecc*)
1468
@@ -4185,6 +4194,9 @@
1469
cygwin* | mingw* | cegcc*)
1470
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
1471
;;
1472
+ linux* | k*bsd*-gnu)
1473
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1474
+ ;;
1475
*)
1476
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1477
;;
1478
@@ -4249,6 +4261,9 @@
1479
openbsd*)
1480
with_gnu_ld=no
1481
;;
1482
+ linux* | k*bsd*-gnu)
1483
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1484
+ ;;
1485
esac
1486
1487
_LT_TAGVAR(ld_shlibs, $1)=yes
1488
@@ -4270,6 +4285,7 @@
1489
fi
1490
supports_anon_versioning=no
1491
case `$LD -v 2>&1` in
1492
+ *GNU\ gold*) supports_anon_versioning=yes ;;
1493
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
1494
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
1495
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
1496
@@ -4361,7 +4377,7 @@
1497
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
1498
;;
1499
1500
- gnu* | linux* | tpf* | k*bsd*-gnu)
1501
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
1502
tmp_diet=no
1503
if test "$host_os" = linux-dietlibc; then
1504
case $cc_basename in
1505
@@ -4431,7 +4447,7 @@
1506
fi
1507
;;
1508
1509
- netbsd*)
1510
+ netbsd* | netbsdelf*-gnu)
1511
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1512
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1513
wlarc=
1514
@@ -4606,6 +4622,7 @@
1515
if test "$aix_use_runtimelinking" = yes; then
1516
shared_flag="$shared_flag "'${wl}-G'
1517
fi
1518
+ _LT_TAGVAR(link_all_deplibs, $1)=no
1519
else
1520
# not using gcc
1521
if test "$host_cpu" = ia64; then
1522
@@ -4844,7 +4861,7 @@
1523
_LT_TAGVAR(link_all_deplibs, $1)=yes
1524
;;
1525
1526
- netbsd*)
1527
+ netbsd* | netbsdelf*-gnu)
1528
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1529
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1530
else
1531
@@ -5844,7 +5861,7 @@
1532
_LT_TAGVAR(inherit_rpath, $1)=yes
1533
;;
1534
1535
- linux* | k*bsd*-gnu)
1536
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
1537
case $cc_basename in
1538
KCC*)
1539
# Kuck and Associates, Inc. (KAI) C++ Compiler
1540
diff -Naur gtk+2.0-2.20.0.old/m4macros/Makefile.in gtk+2.0-2.20.0/m4macros/Makefile.in
1541
--- gtk+2.0-2.20.0.old/m4macros/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1542
+++ gtk+2.0-2.20.0/m4macros/Makefile.in 2010-03-23 16:10:22.989927986 +0100
1088
Index: gtk+2.0-2.20.0/m4macros/Makefile.in
1089
===================================================================
1090
--- gtk+2.0-2.20.0.orig/m4macros/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1091
+++ gtk+2.0-2.20.0/m4macros/Makefile.in 2010-03-24 11:37:09.206624827 +0100
1543
1092
@@ -47,7 +47,7 @@
1544
1093
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1545
1094
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1557
1106
GDK_WLIBS = @GDK_WLIBS@
1558
1107
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1559
1108
GLIB_CFLAGS = @GLIB_CFLAGS@
1560
diff -Naur gtk+2.0-2.20.0.old/Makefile.in gtk+2.0-2.20.0/Makefile.in
1561
--- gtk+2.0-2.20.0.old/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1562
+++ gtk+2.0-2.20.0/Makefile.in 2010-03-23 16:10:25.389927848 +0100
1109
Index: gtk+2.0-2.20.0/Makefile.in
1110
===================================================================
1111
--- gtk+2.0-2.20.0.orig/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1112
+++ gtk+2.0-2.20.0/Makefile.in 2010-03-24 11:37:12.065624725 +0100
1563
1113
@@ -47,7 +47,7 @@
1564
1114
$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
1565
1115
$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
1608
1158
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
1609
1159
1610
1160
# require automake 1.4
1611
diff -Naur gtk+2.0-2.20.0.old/mkinstalldirs gtk+2.0-2.20.0/mkinstalldirs
1612
--- gtk+2.0-2.20.0.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
1613
+++ gtk+2.0-2.20.0/mkinstalldirs 2010-03-23 16:10:25.336954632 +0100
1161
Index: gtk+2.0-2.20.0/mkinstalldirs
1162
===================================================================
1163
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1164
+++ gtk+2.0-2.20.0/mkinstalldirs 2010-03-24 11:36:41.774625227 +0100
1614
1165
@@ -0,0 +1,162 @@
1615
1166
+#! /bin/sh
1616
1167
+# mkinstalldirs --- make directory hierarchy
1774
1325
+# time-stamp-time-zone: "UTC"
1775
1326
+# time-stamp-end: "; # UTC"
1776
1327
+# End:
1777
diff -Naur gtk+2.0-2.20.0.old/modules/engines/Makefile.in gtk+2.0-2.20.0/modules/engines/Makefile.in
1778
--- gtk+2.0-2.20.0.old/modules/engines/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1779
+++ gtk+2.0-2.20.0/modules/engines/Makefile.in 2010-03-23 16:10:23.149927918 +0100
1328
Index: gtk+2.0-2.20.0/modules/engines/Makefile.in
1329
===================================================================
1330
--- gtk+2.0-2.20.0.orig/modules/engines/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1331
+++ gtk+2.0-2.20.0/modules/engines/Makefile.in 2010-03-24 11:37:09.390624192 +0100
1780
1332
@@ -46,7 +46,7 @@
1781
1333
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1782
1334
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1794
1346
GDK_WLIBS = @GDK_WLIBS@
1795
1347
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1796
1348
GLIB_CFLAGS = @GLIB_CFLAGS@
1797
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in
1798
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1799
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in 2010-03-23 16:10:23.249927713 +0100
1349
Index: gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in
1350
===================================================================
1351
--- gtk+2.0-2.20.0.orig/modules/engines/ms-windows/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1352
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Makefile.in 2010-03-24 11:37:09.502625026 +0100
1800
1353
@@ -47,7 +47,7 @@
1801
1354
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1802
1355
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1814
1367
GDK_WLIBS = @GDK_WLIBS@
1815
1368
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1816
1369
GLIB_CFLAGS = @GLIB_CFLAGS@
1817
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
1818
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1819
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-23 16:10:23.405928416 +0100
1370
Index: gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
1371
===================================================================
1372
--- gtk+2.0-2.20.0.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1373
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-03-24 11:37:09.686624802 +0100
1820
1374
@@ -47,7 +47,7 @@
1821
1375
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1822
1376
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1834
1388
GDK_WLIBS = @GDK_WLIBS@
1835
1389
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1836
1390
GLIB_CFLAGS = @GLIB_CFLAGS@
1837
diff -Naur gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in
1838
--- gtk+2.0-2.20.0.old/modules/engines/ms-windows/Theme/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1839
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in 2010-03-23 16:10:23.325928020 +0100
1391
Index: gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in
1392
===================================================================
1393
--- gtk+2.0-2.20.0.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1394
+++ gtk+2.0-2.20.0/modules/engines/ms-windows/Theme/Makefile.in 2010-03-24 11:37:09.594624500 +0100
1840
1395
@@ -46,7 +46,7 @@
1841
1396
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1842
1397
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1854
1409
GDK_WLIBS = @GDK_WLIBS@
1855
1410
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1856
1411
GLIB_CFLAGS = @GLIB_CFLAGS@
1857
diff -Naur gtk+2.0-2.20.0.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in
1858
--- gtk+2.0-2.20.0.old/modules/engines/pixbuf/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1859
+++ gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in 2010-03-23 16:10:23.501927974 +0100
1412
Index: gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in
1413
===================================================================
1414
--- gtk+2.0-2.20.0.orig/modules/engines/pixbuf/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1415
+++ gtk+2.0-2.20.0/modules/engines/pixbuf/Makefile.in 2010-03-24 11:37:09.794624348 +0100
1860
1416
@@ -47,7 +47,7 @@
1861
1417
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1862
1418
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1874
1430
GDK_WLIBS = @GDK_WLIBS@
1875
1431
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1876
1432
GLIB_CFLAGS = @GLIB_CFLAGS@
1877
diff -Naur gtk+2.0-2.20.0.old/modules/input/Makefile.in gtk+2.0-2.20.0/modules/input/Makefile.in
1878
--- gtk+2.0-2.20.0.old/modules/input/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1879
+++ gtk+2.0-2.20.0/modules/input/Makefile.in 2010-03-23 16:10:23.689928326 +0100
1433
Index: gtk+2.0-2.20.0/modules/input/Makefile.in
1434
===================================================================
1435
--- gtk+2.0-2.20.0.orig/modules/input/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1436
+++ gtk+2.0-2.20.0/modules/input/Makefile.in 2010-03-24 11:37:10.029624339 +0100
1880
1437
@@ -48,7 +48,7 @@
1881
1438
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1882
1439
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1924
1481
1925
1482
@CROSS_COMPILING_FALSE@all-local: gtk.immodules
1926
1483
1927
diff -Naur gtk+2.0-2.20.0.old/modules/Makefile.in gtk+2.0-2.20.0/modules/Makefile.in
1928
--- gtk+2.0-2.20.0.old/modules/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1929
+++ gtk+2.0-2.20.0/modules/Makefile.in 2010-03-23 16:10:23.073929156 +0100
1484
Index: gtk+2.0-2.20.0/modules/Makefile.in
1485
===================================================================
1486
--- gtk+2.0-2.20.0.orig/modules/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1487
+++ gtk+2.0-2.20.0/modules/Makefile.in 2010-03-24 11:37:09.298624228 +0100
1930
1488
@@ -47,7 +47,7 @@
1931
1489
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1932
1490
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1944
1502
GDK_WLIBS = @GDK_WLIBS@
1945
1503
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1946
1504
GLIB_CFLAGS = @GLIB_CFLAGS@
1947
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in
1948
--- gtk+2.0-2.20.0.old/modules/other/gail/libgail-util/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1949
+++ gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in 2010-03-23 16:10:24.177927917 +0100
1505
Index: gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in
1506
===================================================================
1507
--- gtk+2.0-2.20.0.orig/modules/other/gail/libgail-util/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1508
+++ gtk+2.0-2.20.0/modules/other/gail/libgail-util/Makefile.in 2010-03-24 11:37:10.629623989 +0100
1950
1509
@@ -49,7 +49,7 @@
1951
1510
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1952
1511
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1964
1523
GDK_WLIBS = @GDK_WLIBS@
1965
1524
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1966
1525
GLIB_CFLAGS = @GLIB_CFLAGS@
1967
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/Makefile.in gtk+2.0-2.20.0/modules/other/gail/Makefile.in
1968
--- gtk+2.0-2.20.0.old/modules/other/gail/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1969
+++ gtk+2.0-2.20.0/modules/other/gail/Makefile.in 2010-03-23 16:10:24.065928000 +0100
1526
Index: gtk+2.0-2.20.0/modules/other/gail/Makefile.in
1527
===================================================================
1528
--- gtk+2.0-2.20.0.orig/modules/other/gail/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1529
+++ gtk+2.0-2.20.0/modules/other/gail/Makefile.in 2010-03-24 11:37:10.497624112 +0100
1970
1530
@@ -48,7 +48,7 @@
1971
1531
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1972
1532
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1984
1544
GDK_WLIBS = @GDK_WLIBS@
1985
1545
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
1986
1546
GLIB_CFLAGS = @GLIB_CFLAGS@
1987
diff -Naur gtk+2.0-2.20.0.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in
1988
--- gtk+2.0-2.20.0.old/modules/other/gail/tests/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1989
+++ gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in 2010-03-23 16:10:24.325927950 +0100
1547
Index: gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in
1548
===================================================================
1549
--- gtk+2.0-2.20.0.orig/modules/other/gail/tests/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1550
+++ gtk+2.0-2.20.0/modules/other/gail/tests/Makefile.in 2010-03-24 11:37:10.809624510 +0100
1990
1551
@@ -47,7 +47,7 @@
1991
1552
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
1992
1553
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2004
1565
GDK_WLIBS = @GDK_WLIBS@
2005
1566
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2006
1567
GLIB_CFLAGS = @GLIB_CFLAGS@
2007
diff -Naur gtk+2.0-2.20.0.old/modules/other/Makefile.in gtk+2.0-2.20.0/modules/other/Makefile.in
2008
--- gtk+2.0-2.20.0.old/modules/other/Makefile.in 2010-03-23 04:33:00.000000000 +0100
2009
+++ gtk+2.0-2.20.0/modules/other/Makefile.in 2010-03-23 16:10:23.769929417 +0100
1568
Index: gtk+2.0-2.20.0/modules/other/Makefile.in
1569
===================================================================
1570
--- gtk+2.0-2.20.0.orig/modules/other/Makefile.in 2010-03-23 04:33:00.000000000 +0100
1571
+++ gtk+2.0-2.20.0/modules/other/Makefile.in 2010-03-24 11:37:10.129624547 +0100
2010
1572
@@ -46,7 +46,7 @@
2011
1573
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2012
1574
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2024
1586
GDK_WLIBS = @GDK_WLIBS@
2025
1587
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2026
1588
GLIB_CFLAGS = @GLIB_CFLAGS@
2027
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in
2028
--- gtk+2.0-2.20.0.old/modules/printbackends/cups/Makefile.in 2010-03-23 04:33:01.000000000 +0100
2029
+++ gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in 2010-03-23 16:10:24.501928323 +0100
1589
Index: gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in
1590
===================================================================
1591
--- gtk+2.0-2.20.0.orig/modules/printbackends/cups/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1592
+++ gtk+2.0-2.20.0/modules/printbackends/cups/Makefile.in 2010-03-24 11:37:11.021624649 +0100
2030
1593
@@ -48,7 +48,7 @@
2031
1594
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2032
1595
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2044
1607
GDK_WLIBS = @GDK_WLIBS@
2045
1608
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2046
1609
GLIB_CFLAGS = @GLIB_CFLAGS@
2047
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/file/Makefile.in gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in
2048
--- gtk+2.0-2.20.0.old/modules/printbackends/file/Makefile.in 2010-03-23 04:33:01.000000000 +0100
2049
+++ gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in 2010-03-23 16:10:24.601927825 +0100
1610
Index: gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in
1611
===================================================================
1612
--- gtk+2.0-2.20.0.orig/modules/printbackends/file/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1613
+++ gtk+2.0-2.20.0/modules/printbackends/file/Makefile.in 2010-03-24 11:37:11.141623767 +0100
2050
1614
@@ -48,7 +48,7 @@
2051
1615
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2052
1616
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2064
1628
GDK_WLIBS = @GDK_WLIBS@
2065
1629
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2066
1630
GLIB_CFLAGS = @GLIB_CFLAGS@
2067
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in
2068
--- gtk+2.0-2.20.0.old/modules/printbackends/lpr/Makefile.in 2010-03-23 04:33:01.000000000 +0100
2069
+++ gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in 2010-03-23 16:10:24.701928035 +0100
1631
Index: gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in
1632
===================================================================
1633
--- gtk+2.0-2.20.0.orig/modules/printbackends/lpr/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1634
+++ gtk+2.0-2.20.0/modules/printbackends/lpr/Makefile.in 2010-03-24 11:37:11.253625281 +0100
2070
1635
@@ -48,7 +48,7 @@
2071
1636
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2072
1637
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2084
1649
GDK_WLIBS = @GDK_WLIBS@
2085
1650
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2086
1651
GLIB_CFLAGS = @GLIB_CFLAGS@
2087
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/Makefile.in gtk+2.0-2.20.0/modules/printbackends/Makefile.in
2088
--- gtk+2.0-2.20.0.old/modules/printbackends/Makefile.in 2010-03-23 04:33:01.000000000 +0100
2089
+++ gtk+2.0-2.20.0/modules/printbackends/Makefile.in 2010-03-23 16:10:24.405927927 +0100
1652
Index: gtk+2.0-2.20.0/modules/printbackends/Makefile.in
1653
===================================================================
1654
--- gtk+2.0-2.20.0.orig/modules/printbackends/Makefile.in 2010-03-23 04:33:01.000000000 +0100
1655
+++ gtk+2.0-2.20.0/modules/printbackends/Makefile.in 2010-03-24 11:37:10.905624283 +0100
2090
1656
@@ -49,7 +49,7 @@
2091
1657
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2092
1658
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2104
1670
GDK_WLIBS = @GDK_WLIBS@
2105
1671
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2106
1672
GLIB_CFLAGS = @GLIB_CFLAGS@
2107
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in
2108
--- gtk+2.0-2.20.0.old/modules/printbackends/papi/Makefile.in 2010-03-23 04:33:02.000000000 +0100
2109
+++ gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in 2010-03-23 16:10:24.797927670 +0100
1673
Index: gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in
1674
===================================================================
1675
--- gtk+2.0-2.20.0.orig/modules/printbackends/papi/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1676
+++ gtk+2.0-2.20.0/modules/printbackends/papi/Makefile.in 2010-03-24 11:37:11.361624556 +0100
2110
1677
@@ -46,7 +46,7 @@
2111
1678
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2112
1679
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2124
1691
GDK_WLIBS = @GDK_WLIBS@
2125
1692
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2126
1693
GLIB_CFLAGS = @GLIB_CFLAGS@
2127
diff -Naur gtk+2.0-2.20.0.old/modules/printbackends/test/Makefile.in gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in
2128
--- gtk+2.0-2.20.0.old/modules/printbackends/test/Makefile.in 2010-03-23 04:33:02.000000000 +0100
2129
+++ gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in 2010-03-23 16:10:24.897927957 +0100
1694
Index: gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in
1695
===================================================================
1696
--- gtk+2.0-2.20.0.orig/modules/printbackends/test/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1697
+++ gtk+2.0-2.20.0/modules/printbackends/test/Makefile.in 2010-03-24 11:37:11.481624312 +0100
2130
1698
@@ -48,7 +48,7 @@
2131
1699
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2132
1700
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2144
1712
GDK_WLIBS = @GDK_WLIBS@
2145
1713
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2146
1714
GLIB_CFLAGS = @GLIB_CFLAGS@
2147
diff -Naur gtk+2.0-2.20.0.old/perf/Makefile.in gtk+2.0-2.20.0/perf/Makefile.in
2148
--- gtk+2.0-2.20.0.old/perf/Makefile.in 2010-03-23 04:33:02.000000000 +0100
2149
+++ gtk+2.0-2.20.0/perf/Makefile.in 2010-03-23 16:10:24.993927866 +0100
1715
Index: gtk+2.0-2.20.0/perf/Makefile.in
1716
===================================================================
1717
--- gtk+2.0-2.20.0.orig/perf/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1718
+++ gtk+2.0-2.20.0/perf/Makefile.in 2010-03-24 11:37:11.601624621 +0100
2150
1719
@@ -48,7 +48,7 @@
2151
1720
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2152
1721
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
2164
1733
GDK_WLIBS = @GDK_WLIBS@
2165
1734
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
2166
1735
GLIB_CFLAGS = @GLIB_CFLAGS@
2167
diff -Naur gtk+2.0-2.20.0.old/po/Makefile.in.in gtk+2.0-2.20.0/po/Makefile.in.in
2168
--- gtk+2.0-2.20.0.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
2169
+++ gtk+2.0-2.20.0/po/Makefile.in.in 2010-03-23 16:10:14.465929058 +0100
1736
Index: gtk+2.0-2.20.0/po/Makefile.in.in
1737
===================================================================
1738
--- gtk+2.0-2.20.0.orig/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
1739
+++ gtk+2.0-2.20.0/po/Makefile.in.in 2010-03-24 11:36:41.806625176 +0100
2170
1740
@@ -25,22 +25,23 @@
2171
1741
2172
1742
prefix = @prefix@
2278
1848
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
2279
1849
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
2280
1850
else \
2281
diff -Naur gtk+2.0-2.20.0.old/tests/Makefile.in gtk+2.0-2.20.0/tests/Makefile.in
2282
--- gtk+2.0-2.20.0.old/tests/Makefile.in 2010-03-23 04:33:02.000000000 +0100
2283
+++ gtk+2.0-2.20.0/tests/Makefile.in 2010-03-23 16:10:25.245928182 +0100
1851
Index: gtk+2.0-2.20.0/tests/Makefile.in
1852
===================================================================
1853
--- gtk+2.0-2.20.0.orig/tests/Makefile.in 2010-03-23 04:33:02.000000000 +0100
1854
+++ gtk+2.0-2.20.0/tests/Makefile.in 2010-03-24 11:37:11.917624831 +0100
2284
1855
@@ -82,7 +82,7 @@
2285
1856
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
2286
1857
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
Loggerhead is a web-based interface for Breezy
Version: 2.0.1