Changeset 4111 for pkg/viola/main/gtk+2.0/trunk
- Timestamp:
- 07/21/08 22:45:13 (5 years ago)
- Location:
- pkg/viola/main/gtk+2.0/trunk/debian
- Files:
-
- 1 added
- 6 edited
-
changelog (modified) (1 diff)
-
control (modified) (1 diff)
-
control.in (modified) (1 diff)
-
patches/031_directfb_dead-keys.patch (added)
-
patches/033_treeview_resizing.patch (modified) (16 diffs)
-
patches/070_mandatory-relibtoolize.patch (modified) (72 diffs)
-
patches/series (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pkg/viola/main/gtk+2.0/trunk/debian/changelog
r4096 r4111 1 gtk+2.0 (2.12.11-parsix2) unstable; urgency=low 2 3 * Sync'd with Debian 2.12.11-2 4 5 -- Alan Baghumian <alan@technotux.org> Fri, 18 Jul 2008 20:40:53 +0200 1 gtk+2.0 (2.12.11-parsix3) unstable; urgency=low 2 3 * Sync'd with Debian 2.12.11-3 4 5 -- Alan Baghumian <alan@technotux.org> Mon, 21 Jul 2008 22:43:34 +0200 6 7 gtk+2.0 (2.12.11-3) unstable; urgency=low 8 9 * 031_directfb_dead-keys.patch: patch from Jérémy Bobbio to fix dead 10 keys in the DirectFB backend. Closes: #394871. 11 * Now require DirectFB 0.9.26. 12 * 070_mandatory_relibtoolize: updated to match the dependency bump. 13 * 033_treeview_resizing.patch: 14 + Fix crasher introduced by the patch. Closes: #491611. 15 + Add references. 16 17 -- Josselin Mouette <joss@debian.org> Mon, 21 Jul 2008 15:22:38 +0200 6 18 7 19 gtk+2.0 (2.12.11-2) unstable; urgency=low -
pkg/viola/main/gtk+2.0/trunk/debian/control
r4096 r4111 32 32 dpkg-dev (>= 1.13.19), 33 33 x11proto-xext-dev, 34 libdirectfb-dev (>= 0.9.2 4),34 libdirectfb-dev (>= 0.9.26), 35 35 libcups2-dev (>= 1.2), 36 36 quilt -
pkg/viola/main/gtk+2.0/trunk/debian/control.in
r4010 r4111 32 32 dpkg-dev (>= 1.13.19), 33 33 x11proto-xext-dev, 34 libdirectfb-dev (>= 0.9.2 4),34 libdirectfb-dev (>= 0.9.26), 35 35 libcups2-dev (>= 1.2), 36 36 quilt -
pkg/viola/main/gtk+2.0/trunk/debian/patches/033_treeview_resizing.patch
r4096 r4111 1 GNOME #316087. 2 Debian #471073, #491611. 3 1 4 Index: gtk+-2.12.11/gtk/gtktreeview.c 2 5 =================================================================== 3 6 --- gtk+-2.12.11.orig/gtk/gtktreeview.c 2008-07-01 15:42:39.000000000 +0200 4 +++ gtk+-2.12.11/gtk/gtktreeview.c 2008-07- 10 19:00:15.873743659+02005 @@ -1364,6 +1364,8 @@ gtk_tree_view_init (GtkTreeView *tree_vi7 +++ gtk+-2.12.11/gtk/gtktreeview.c 2008-07-21 15:10:24.382008186 +0200 8 @@ -1364,6 +1364,8 @@ 6 9 tree_view->priv->tree_lines_enabled = FALSE; 7 10 … … 13 16 14 17 15 @@ -1998,6 +2000,7 @@ gtk_tree_view_update_size (GtkTreeView *18 @@ -1998,6 +2000,7 @@ 16 19 17 20 tree_view->priv->prev_width = tree_view->priv->width; … … 21 24 for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++) 22 25 { 23 @@ -2164,18 +2167,20 @@ gtk_tree_view_get_real_requested_width_f26 @@ -2164,18 +2167,20 @@ 24 27 25 28 /* GtkWidget::size_allocate helper */ … … 44 47 tree_view = GTK_TREE_VIEW (widget); 45 48 46 @@ -2210,12 +2215,42 @@ gtk_tree_view_size_allocate_columns (Gtk49 @@ -2210,12 +2215,42 @@ 47 50 number_of_expand_columns++; 48 51 } … … 88 91 list != (rtl ? first_column->prev : last_column->next); 89 92 list = (rtl ? list->prev : list->next)) 90 @@ -2271,6 +2306,12 @@ gtk_tree_view_size_allocate_columns (Gtk93 @@ -2271,6 +2306,12 @@ 91 94 column->width += extra; 92 95 } … … 101 104 102 105 allocation.width = column->width; 103 @@ -2288,6 +2329,1 4 @@ gtk_tree_view_size_allocate_columns (Gtk106 @@ -2288,6 +2329,15 @@ 104 107 TREE_VIEW_DRAG_WIDTH, allocation.height); 105 108 } … … 111 114 + */ 112 115 + tree_view->priv->width = width; 113 + *width_changed = TRUE; 116 + if (width_changed) 117 + *width_changed = TRUE; 114 118 + 115 119 if (column_changed) 116 120 gtk_widget_queue_draw (GTK_WIDGET (tree_view)); 117 121 } 118 @@ -2328,6 +237 7,7 @@ gtk_tree_view_size_allocate (GtkWidget122 @@ -2328,6 +2378,7 @@ 119 123 gtk_widget_size_allocate (child->widget, &allocation); 120 124 } … … 124 128 tree_view->priv->hadjustment->page_size = allocation->width; 125 129 tree_view->priv->hadjustment->page_increment = allocation->width * 0.9; 126 @@ -2336,28 +238 6,30 @@ gtk_tree_view_size_allocate (GtkWidget130 @@ -2336,28 +2387,30 @@ 127 131 tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width); 128 132 … … 175 179 gtk_adjustment_changed (tree_view->priv->hadjustment); 176 180 177 @@ -2397,8 +24 49,6 @@ gtk_tree_view_size_allocate (GtkWidget181 @@ -2397,8 +2450,6 @@ 178 182 allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)); 179 183 } … … 184 188 invalidate_empty_focus (tree_view); 185 189 186 @@ -2842,7 +289 2,7 @@ gtk_tree_view_button_press (GtkWidget190 @@ -2842,7 +2893,7 @@ 187 191 188 192 gtk_grab_add (widget); … … 193 197 /* block attached dnd signal handler */ 194 198 drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data"); 195 @@ -3554,6 +360 4,8 @@ gtk_tree_view_motion_resize_column (GtkW199 @@ -3554,6 +3605,8 @@ 196 200 { 197 201 column->use_resized_width = TRUE; … … 202 206 } 203 207 204 @@ -5661,6 +571 3,7 @@ validate_row (GtkTreeView *tree_view,208 @@ -5661,6 +5714,7 @@ 205 209 _gtk_rbtree_node_set_height (tree, node, height); 206 210 } … … 210 214 return retval; 211 215 } 212 @@ -11516,7 +115 69,7 @@ gtk_tree_view_move_column_after (GtkTree216 @@ -11516,7 +11570,7 @@ 213 217 if (GTK_WIDGET_REALIZED (tree_view)) 214 218 { … … 222 226 =================================================================== 223 227 --- gtk+-2.12.11.orig/gtk/gtktreeviewcolumn.c 2008-07-01 15:42:39.000000000 +0200 224 +++ gtk+-2.12.11/gtk/gtktreeviewcolumn.c 2008-07- 10 19:00:15.873743659+0200225 @@ -2141,6 +2141,7 @@ gtk_tree_view_column_set_expand (GtkTree228 +++ gtk+-2.12.11/gtk/gtktreeviewcolumn.c 2008-07-21 14:58:07.660991687 +0200 229 @@ -2141,6 +2141,7 @@ 226 230 tree_column->tree_view != NULL && 227 231 GTK_WIDGET_REALIZED (tree_column->tree_view)) … … 234 238 =================================================================== 235 239 --- gtk+-2.12.11.orig/gtk/gtktreeprivate.h 2008-07-01 15:42:40.000000000 +0200 236 +++ gtk+-2.12.11/gtk/gtktreeprivate.h 2008-07- 10 19:00:15.877745215+0200237 @@ -236,6 +236,8 @@ struct _GtkTreeViewPrivate240 +++ gtk+-2.12.11/gtk/gtktreeprivate.h 2008-07-21 14:58:07.660991687 +0200 241 @@ -236,6 +236,8 @@ 238 242 239 243 guint in_grab : 1; … … 244 248 /* Auto expand/collapse timeout in hover mode */ 245 249 guint auto_expand_timeout; 246 @@ -268,6 +270,10 @@ struct _GtkTreeViewPrivate250 @@ -268,6 +270,10 @@ 247 251 GdkGC *tree_line_gc; 248 252 -
pkg/viola/main/gtk+2.0/trunk/debian/patches/070_mandatory-relibtoolize.patch
r4010 r4111 1 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/aclocal.m4 gtk+2.0-2.12.11/aclocal.m4 2 --- gtk+2.0-2.12.11.old/aclocal.m4 2008-07-01 15:43:50.000000000 +0200 3 +++ gtk+2.0-2.12.11/aclocal.m4 2008-07-02 07:22:23.000000000 +0200 4 @@ -941,7 +941,7 @@ 1 Index: gtk+-2.12.11/aclocal.m4 2 =================================================================== 3 --- gtk+-2.12.11.orig/aclocal.m4 2008-07-19 12:11:05.833816867 +0200 4 +++ gtk+-2.12.11/aclocal.m4 2008-07-19 12:23:59.661824198 +0200 5 @@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ 5 6 6 7 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- … … 11 12 12 13 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) 13 @@ -1565,7 +1565,6 @@ 14 @@ -1565,7 +1565,6 @@ s390*-*linux*|sparc*-*linux*) 14 15 esac 15 16 ;; … … 19 20 x86_64-*kfreebsd*-gnu) 20 21 LD="${LD-ld} -m elf_x86_64_fbsd" 21 @@ -2628,13 +2627,11 @@ 22 @@ -2628,13 +2627,11 @@ linux* | k*bsd*-gnu) 22 23 # Some rework will be needed to allow for fast_install 23 24 # before this can be enabled. … … 34 35 35 36 # We used to test for /lib/ld.so.1 and disable shared libraries on 36 @@ -2646,6 +2643,18 @@ 37 @@ -2646,6 +2643,18 @@ linux* | k*bsd*-gnu) 37 38 dynamic_linker='GNU/Linux ld.so' 38 39 ;; … … 53 54 version_type=sunos 54 55 need_lib_prefix=no 55 @@ -3427,7 +3436,7 @@ 56 @@ -3427,7 +3436,7 @@ linux* | k*bsd*-gnu) 56 57 lt_cv_deplibs_check_method=pass_all 57 58 ;; … … 62 63 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' 63 64 else 64 @@ -4434,7 +4443,7 @@ 65 @@ -4434,7 +4443,7 @@ case $host_os in 65 66 ;; 66 67 esac … … 71 72 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 72 73 wlarc= 73 @@ -6126,7 +6135,7 @@ 74 @@ -6126,7 +6135,7 @@ AC_MSG_CHECKING([for $compiler option to 74 75 ;; 75 76 esac … … 80 81 osf3* | osf4* | osf5*) 81 82 case $cc_basename in 82 @@ -6503,6 +6512,9 @@ 83 @@ -6503,6 +6512,9 @@ ifelse([$1],[CXX],[ 83 84 cygwin* | mingw*) 84 85 _LT_AC_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' … … 90 91 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 91 92 ;; 92 @@ -6711,12 +6723,13 @@ 93 @@ -6711,12 +6723,13 @@ EOF 93 94 $echo "local: *; };" >> $output_objdir/$libname.ver~ 94 95 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' … … 105 106 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 106 107 wlarc= 107 @@ -7147,7 +7160,7 @@ 108 @@ -7147,7 +7160,7 @@ _LT_EOF 108 109 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 109 110 ;; … … 114 115 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 115 116 else 116 @@ -7825,14 +7838,16 @@ 117 @@ -7825,14 +7838,16 @@ fi]) 117 118 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 118 119 # --------------------------------------------- … … 139 140 ])# _PKG_CONFIG 140 141 141 @@ -7876,9 +7891,9 @@ 142 @@ -7876,9 +7891,9 @@ See the pkg-config man page for more det 142 143 if test $pkg_failed = yes; then 143 144 _PKG_SHORT_ERRORS_SUPPORTED … … 151 152 # Put the nasty error message in config.log where it belongs 152 153 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 153 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/configure gtk+2.0-2.12.11/configure 154 --- gtk+2.0-2.12.11.old/configure 2008-07-01 15:44:08.000000000 +0200 155 +++ gtk+2.0-2.12.11/configure 2008-07-02 07:22:28.000000000 +0200 156 @@ -885,6 +885,8 @@ 154 Index: gtk+-2.12.11/configure 155 =================================================================== 156 --- gtk+-2.12.11.orig/configure 2008-07-19 12:11:05.805819664 +0200 157 +++ gtk+-2.12.11/configure 2008-07-19 12:24:28.501819016 +0200 158 @@ -885,6 +885,8 @@ AMDEPBACKSLASH 157 159 CCDEPMODE 158 160 am__fastdepCC_TRUE … … 163 165 CXXFLAGS 164 166 ac_ct_CXX 165 @@ -1040,6 +1042,7 @@ 167 @@ -1040,6 +1042,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS 166 168 USE_DIRECTFB_TRUE 167 169 USE_DIRECTFB_FALSE … … 171 173 GDK_EXTRA_CFLAGS 172 174 GDK_DEP_LIBS 173 @@ -4023,6 +4026,16 @@ 175 @@ -4023,6 +4026,16 @@ fi 174 176 175 177 … … 188 190 do 189 191 # Extract the first word of "$ac_prog", so it can be a program name with args. 190 @@ -5235,7 +5248,7 @@ 192 @@ -5235,7 +5248,7 @@ linux* | k*bsd*-gnu) 191 193 lt_cv_deplibs_check_method=pass_all 192 194 ;; … … 197 199 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 198 200 else 199 @@ -5356,7 +5369,7 @@ 201 @@ -5356,7 +5369,7 @@ ia64-*-hpux*) 200 202 ;; 201 203 *-*-irix6*) … … 206 208 (eval $ac_compile) 2>&5 207 209 ac_status=$? 208 @@ -5421,7 +5434,6 @@ 210 @@ -5421,7 +5434,6 @@ s390*-*linux*|sparc*-*linux*) 209 211 esac 210 212 ;; … … 214 216 x86_64-*kfreebsd*-gnu) 215 217 LD="${LD-ld} -m elf_x86_64_fbsd" 216 @@ -8269,11 +8281,11 @@ 218 @@ -8269,11 +8281,11 @@ else 217 219 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 218 220 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 228 230 # The compiler can only warn and ignore the option if not recognized 229 231 # So say no if there are warnings other than the usual output. 230 @@ -8559,11 +8571,11 @@ 232 @@ -8559,11 +8571,11 @@ else 231 233 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 232 234 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 242 244 # The compiler can only warn and ignore the option if not recognized 243 245 # So say no if there are warnings other than the usual output. 244 @@ -8663,11 +8675,11 @@ 246 @@ -8663,11 +8675,11 @@ else 245 247 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 246 248 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 256 258 then 257 259 # The compiler can only warn and ignore the option if not recognized 258 @@ -8928,12 +8940,13 @@ 260 @@ -8928,12 +8940,13 @@ EOF 259 261 $echo "local: *; };" >> $output_objdir/$libname.ver~ 260 262 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' … … 271 273 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 272 274 wlarc= 273 @@ -9484,7 +9497,7 @@ 275 @@ -9484,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libp 274 276 link_all_deplibs=yes 275 277 ;; … … 280 282 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 281 283 else 282 @@ -10179,13 +10192,11 @@ 284 @@ -10179,13 +10192,11 @@ linux* | k*bsd*-gnu) 283 285 # Some rework will be needed to allow for fast_install 284 286 # before this can be enabled. … … 295 297 296 298 # We used to test for /lib/ld.so.1 and disable shared libraries on 297 @@ -10197,6 +10208,18 @@ 299 @@ -10197,6 +10208,18 @@ linux* | k*bsd*-gnu) 298 300 dynamic_linker='GNU/Linux ld.so' 299 301 ;; … … 314 316 version_type=sunos 315 317 need_lib_prefix=no 316 @@ -11065,7 +11088,7 @@ 318 @@ -11065,7 +11088,7 @@ else 317 319 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 318 320 lt_status=$lt_dlunknown … … 323 325 324 326 #if HAVE_DLFCN_H 325 @@ -11165,7 +11188,7 @@ 327 @@ -11165,7 +11188,7 @@ else 326 328 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 327 329 lt_status=$lt_dlunknown … … 332 334 333 335 #if HAVE_DLFCN_H 334 @@ -12761,7 +12784,7 @@ 336 @@ -12761,7 +12784,7 @@ if test -z "$aix_libpath"; then aix_libp 335 337 ;; 336 338 esac … … 341 343 archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' 342 344 wlarc= 343 @@ -13465,7 +13488,7 @@ 345 @@ -13465,7 +13488,7 @@ $as_echo_n "checking for $compiler optio 344 346 ;; 345 347 esac … … 350 352 osf3* | osf4* | osf5*) 351 353 case $cc_basename in 352 @@ -13574,11 +13597,11 @@ 354 @@ -13574,11 +13597,11 @@ else 353 355 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 354 356 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 364 366 # The compiler can only warn and ignore the option if not recognized 365 367 # So say no if there are warnings other than the usual output. 366 @@ -13678,11 +13701,11 @@ 368 @@ -13678,11 +13701,11 @@ else 367 369 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 368 370 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 378 380 then 379 381 # The compiler can only warn and ignore the option if not recognized 380 @@ -13750,6 +13773,9 @@ 382 @@ -13750,6 +13773,9 @@ $as_echo_n "checking whether the $compil 381 383 cygwin* | mingw*) 382 384 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' … … 388 390 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 389 391 ;; 390 @@ -14180,13 +14206,11 @@ 392 @@ -14180,13 +14206,11 @@ linux* | k*bsd*-gnu) 391 393 # Some rework will be needed to allow for fast_install 392 394 # before this can be enabled. … … 403 405 404 406 # We used to test for /lib/ld.so.1 and disable shared libraries on 405 @@ -14198,6 +14222,18 @@ 407 @@ -14198,6 +14222,18 @@ linux* | k*bsd*-gnu) 406 408 dynamic_linker='GNU/Linux ld.so' 407 409 ;; … … 422 424 version_type=sunos 423 425 need_lib_prefix=no 424 @@ -15263,11 +15299,11 @@ 426 @@ -15263,11 +15299,11 @@ else 425 427 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 426 428 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 436 438 # The compiler can only warn and ignore the option if not recognized 437 439 # So say no if there are warnings other than the usual output. 438 @@ -15367,11 +15403,11 @@ 440 @@ -15367,11 +15403,11 @@ else 439 441 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 440 442 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 450 452 then 451 453 # The compiler can only warn and ignore the option if not recognized 452 @@ -15632,12 +15668,13 @@ 454 @@ -15632,12 +15668,13 @@ EOF 453 455 $echo "local: *; };" >> $output_objdir/$libname.ver~ 454 456 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' … … 465 467 archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 466 468 wlarc= 467 @@ -16168,7 +16205,7 @@ 469 @@ -16168,7 +16205,7 @@ if test -z "$aix_libpath"; then aix_libp 468 470 link_all_deplibs_F77=yes 469 471 ;; … … 474 476 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 475 477 else 476 @@ -16811,13 +16848,11 @@ 478 @@ -16811,13 +16848,11 @@ linux* | k*bsd*-gnu) 477 479 # Some rework will be needed to allow for fast_install 478 480 # before this can be enabled. … … 489 491 490 492 # We used to test for /lib/ld.so.1 and disable shared libraries on 491 @@ -16829,6 +16864,18 @@ 493 @@ -16829,6 +16864,18 @@ linux* | k*bsd*-gnu) 492 494 dynamic_linker='GNU/Linux ld.so' 493 495 ;; … … 508 510 version_type=sunos 509 511 need_lib_prefix=no 510 @@ -17584,11 +17631,11 @@ 512 @@ -17584,11 +17631,11 @@ else 511 513 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 512 514 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 522 524 # The compiler can only warn and ignore the option if not recognized 523 525 # So say no if there are warnings other than the usual output. 524 @@ -17874,11 +17921,11 @@ 526 @@ -17874,11 +17921,11 @@ else 525 527 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 526 528 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 536 538 # The compiler can only warn and ignore the option if not recognized 537 539 # So say no if there are warnings other than the usual output. 538 @@ -17978,11 +18025,11 @@ 540 @@ -17978,11 +18025,11 @@ else 539 541 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 540 542 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ … … 550 552 then 551 553 # The compiler can only warn and ignore the option if not recognized 552 @@ -18243,12 +18290,13 @@ 554 @@ -18243,12 +18290,13 @@ EOF 553 555 $echo "local: *; };" >> $output_objdir/$libname.ver~ 554 556 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' … … 565 567 archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 566 568 wlarc= 567 @@ -18799,7 +18847,7 @@ 569 @@ -18799,7 +18847,7 @@ if test -z "$aix_libpath"; then aix_libp 568 570 link_all_deplibs_GCJ=yes 569 571 ;; … … 574 576 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 575 577 else 576 @@ -19442,13 +19490,11 @@ 578 @@ -19442,13 +19490,11 @@ linux* | k*bsd*-gnu) 577 579 # Some rework will be needed to allow for fast_install 578 580 # before this can be enabled. … … 589 591 590 592 # We used to test for /lib/ld.so.1 and disable shared libraries on 591 @@ -19460,6 +19506,18 @@ 593 @@ -19460,6 +19506,18 @@ linux* | k*bsd*-gnu) 592 594 dynamic_linker='GNU/Linux ld.so' 593 595 ;; … … 608 610 version_type=sunos 609 611 need_lib_prefix=no 610 @@ -21967,10 +22025,11 @@ 612 @@ -21967,10 +22025,11 @@ pkg_failed=no 611 613 { $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 612 614 $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } … … 624 626 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 625 627 ac_status=$? 626 @@ -21980,13 +22039,15 @@ 628 @@ -21980,13 +22039,15 @@ if test -n "$BASE_DEPENDENCIES_CFLAGS"; 627 629 else 628 630 pkg_failed=yes … … 646 648 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 647 649 ac_status=$? 648 @@ -21996,8 +22057,9 @@ 650 @@ -21996,8 +22057,9 @@ if test -n "$BASE_DEPENDENCIES_LIBS"; th 649 651 else 650 652 pkg_failed=yes … … 658 660 659 661 660 @@ -22010,9 +22072,9 @@ 662 @@ -22010,9 +22072,9 @@ else 661 663 _pkg_short_errors_supported=no 662 664 fi … … 670 672 # Put the nasty error message in config.log where it belongs 671 673 echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 672 @@ -33453,8 +33515,18 @@ 674 @@ -33446,15 +33508,25 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG 675 676 677 if test "x$gdktarget" = "xdirectfb"; then 678 - DIRECTFB_REQUIRED_VERSION=0.9.24 679 + DIRECTFB_REQUIRED_VERSION=0.9.26 680 { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 681 $as_echo_n "checking for DirectFB... " >&6; } 682 673 683 if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then 674 684 { $as_echo "$as_me:$LINENO: result: found" >&5 … … 691 701 { { $as_echo "$as_me:$LINENO: error: 692 702 *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 693 @@ -33594,20 +33666,21 @@ 703 @@ -33594,20 +33666,21 @@ fi 694 704 CFLAGS="$saved_cflags" 695 705 LDFLAGS="$saved_ldflags" … … 718 728 719 729 720 @@ -33617,6 +33690,7 @@ 730 @@ -33617,6 +33690,7 @@ fi 721 731 722 732 … … 726 736 # Check for Accessibility Toolkit flags 727 737 ######################################## 728 @@ -33726,7 +33800,7 @@ 738 @@ -33726,7 +33800,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr 729 739 CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" 730 740 … … 735 745 736 746 737 @@ -34948,6 +35022,13 @@ 747 @@ -34948,6 +35022,13 @@ $as_echo "$as_me: error: conditional \"a 738 748 Usually this means the macro was only invoked conditionally." >&2;} 739 749 { (exit 1); exit 1; }; } … … 749 759 { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. 750 760 Usually this means the macro was only invoked conditionally." >&5 751 @@ -36186,9 +36267,9 @@ 761 @@ -36186,9 +36267,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ 752 762 } 753 763 split(mac1, mac2, "(") #) … … 760 770 next 761 771 } else { 762 @@ -36196,7 +36277,7 @@ 772 @@ -36196,7 +36277,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ 763 773 # in the case of _POSIX_SOURCE, which is predefined and required 764 774 # on some systems where configure will not decide to define it. … … 769 779 } 770 780 } 771 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in 772 --- gtk+2.0-2.12.11.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-07-01 15:44:00.000000000 +0200 773 +++ gtk+2.0-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in 2008-07-02 07:22:29.000000000 +0200 774 @@ -90,6 +90,8 @@ 775 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 776 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 777 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 778 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 779 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 780 EXEEXT = @EXEEXT@ 781 F77 = @F77@ 782 FFLAGS = @FFLAGS@ 783 @@ -113,6 +115,7 @@ 784 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 785 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 786 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 787 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 788 GDK_WLIBS = @GDK_WLIBS@ 789 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 790 GLIB_CFLAGS = @GLIB_CFLAGS@ 791 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/contrib/Makefile.in gtk+2.0-2.12.11/contrib/Makefile.in 792 --- gtk+2.0-2.12.11.old/contrib/Makefile.in 2008-07-01 15:44:00.000000000 +0200 793 +++ gtk+2.0-2.12.11/contrib/Makefile.in 2008-07-02 07:22:29.000000000 +0200 794 @@ -91,6 +91,8 @@ 795 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 796 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 797 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 798 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 799 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 800 EXEEXT = @EXEEXT@ 801 F77 = @F77@ 802 FFLAGS = @FFLAGS@ 803 @@ -114,6 +116,7 @@ 804 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 805 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 806 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 807 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 808 GDK_WLIBS = @GDK_WLIBS@ 809 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 810 GLIB_CFLAGS = @GLIB_CFLAGS@ 811 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/demos/gtk-demo/Makefile.in gtk+2.0-2.12.11/demos/gtk-demo/Makefile.in 812 --- gtk+2.0-2.12.11.old/demos/gtk-demo/Makefile.in 2008-07-01 15:44:01.000000000 +0200 813 +++ gtk+2.0-2.12.11/demos/gtk-demo/Makefile.in 2008-07-02 07:22:29.000000000 +0200 814 @@ -90,6 +90,8 @@ 815 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 816 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 817 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 818 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 819 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 820 EXEEXT = @EXEEXT@ 821 F77 = @F77@ 822 FFLAGS = @FFLAGS@ 823 @@ -113,6 +115,7 @@ 824 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 825 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 826 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 827 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 828 GDK_WLIBS = @GDK_WLIBS@ 829 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 830 GLIB_CFLAGS = @GLIB_CFLAGS@ 831 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/demos/Makefile.in gtk+2.0-2.12.11/demos/Makefile.in 832 --- gtk+2.0-2.12.11.old/demos/Makefile.in 2008-07-01 15:44:00.000000000 +0200 833 +++ gtk+2.0-2.12.11/demos/Makefile.in 2008-07-02 07:22:29.000000000 +0200 834 @@ -91,6 +91,8 @@ 835 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 836 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 837 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 838 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 839 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 840 EXEEXT = @EXEEXT@ 841 F77 = @F77@ 842 FFLAGS = @FFLAGS@ 843 @@ -114,6 +116,7 @@ 844 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 845 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 846 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 847 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 848 GDK_WLIBS = @GDK_WLIBS@ 849 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 850 GLIB_CFLAGS = @GLIB_CFLAGS@ 851 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/faq/Makefile.in gtk+2.0-2.12.11/docs/faq/Makefile.in 852 --- gtk+2.0-2.12.11.old/docs/faq/Makefile.in 2008-07-01 15:44:01.000000000 +0200 853 +++ gtk+2.0-2.12.11/docs/faq/Makefile.in 2008-07-02 07:22:29.000000000 +0200 854 @@ -90,6 +90,8 @@ 855 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 856 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 857 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 858 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 859 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 860 EXEEXT = @EXEEXT@ 861 F77 = @F77@ 862 FFLAGS = @FFLAGS@ 863 @@ -113,6 +115,7 @@ 864 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 865 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 866 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 867 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 868 GDK_WLIBS = @GDK_WLIBS@ 869 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 870 GLIB_CFLAGS = @GLIB_CFLAGS@ 871 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/Makefile.in gtk+2.0-2.12.11/docs/Makefile.in 872 --- gtk+2.0-2.12.11.old/docs/Makefile.in 2008-07-01 15:44:01.000000000 +0200 873 +++ gtk+2.0-2.12.11/docs/Makefile.in 2008-07-02 07:22:29.000000000 +0200 874 @@ -90,6 +90,8 @@ 875 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 876 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 877 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 878 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 879 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 880 EXEEXT = @EXEEXT@ 881 F77 = @F77@ 882 FFLAGS = @FFLAGS@ 883 @@ -113,6 +115,7 @@ 884 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 885 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 886 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 887 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 888 GDK_WLIBS = @GDK_WLIBS@ 889 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 890 GLIB_CFLAGS = @GLIB_CFLAGS@ 891 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gdk/Makefile.in gtk+2.0-2.12.11/docs/reference/gdk/Makefile.in 892 --- gtk+2.0-2.12.11.old/docs/reference/gdk/Makefile.in 2008-07-01 15:44:01.000000000 +0200 893 +++ gtk+2.0-2.12.11/docs/reference/gdk/Makefile.in 2008-07-02 07:22:30.000000000 +0200 894 @@ -96,6 +96,8 @@ 895 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 896 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 897 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 898 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 899 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 900 EXEEXT = @EXEEXT@ 901 F77 = @F77@ 902 FFLAGS = @FFLAGS@ 903 @@ -119,6 +121,7 @@ 904 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 905 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 906 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 907 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 908 GDK_WLIBS = @GDK_WLIBS@ 909 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 910 GLIB_CFLAGS = @GLIB_CFLAGS@ 911 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.12.11/docs/reference/gdk-pixbuf/Makefile.in 912 --- gtk+2.0-2.12.11.old/docs/reference/gdk-pixbuf/Makefile.in 2008-07-01 15:44:01.000000000 +0200 913 +++ gtk+2.0-2.12.11/docs/reference/gdk-pixbuf/Makefile.in 2008-07-02 07:22:30.000000000 +0200 914 @@ -96,6 +96,8 @@ 915 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 916 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 917 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 918 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 919 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 920 EXEEXT = @EXEEXT@ 921 F77 = @F77@ 922 FFLAGS = @FFLAGS@ 923 @@ -119,6 +121,7 @@ 924 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 925 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 926 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 927 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 928 GDK_WLIBS = @GDK_WLIBS@ 929 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 930 GLIB_CFLAGS = @GLIB_CFLAGS@ 931 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/gtk/Makefile.in gtk+2.0-2.12.11/docs/reference/gtk/Makefile.in 932 --- gtk+2.0-2.12.11.old/docs/reference/gtk/Makefile.in 2008-07-01 15:44:01.000000000 +0200 933 +++ gtk+2.0-2.12.11/docs/reference/gtk/Makefile.in 2008-07-02 07:22:30.000000000 +0200 934 @@ -96,6 +96,8 @@ 935 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 936 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 937 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 938 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 939 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 940 EXEEXT = @EXEEXT@ 941 F77 = @F77@ 942 FFLAGS = @FFLAGS@ 943 @@ -119,6 +121,7 @@ 944 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 945 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 946 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 947 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 948 GDK_WLIBS = @GDK_WLIBS@ 949 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 950 GLIB_CFLAGS = @GLIB_CFLAGS@ 951 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/reference/Makefile.in gtk+2.0-2.12.11/docs/reference/Makefile.in 952 --- gtk+2.0-2.12.11.old/docs/reference/Makefile.in 2008-07-01 15:44:01.000000000 +0200 953 +++ gtk+2.0-2.12.11/docs/reference/Makefile.in 2008-07-02 07:22:30.000000000 +0200 954 @@ -90,6 +90,8 @@ 955 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 956 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 957 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 958 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 959 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 960 EXEEXT = @EXEEXT@ 961 F77 = @F77@ 962 FFLAGS = @FFLAGS@ 963 @@ -113,6 +115,7 @@ 964 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 965 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 966 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 967 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 968 GDK_WLIBS = @GDK_WLIBS@ 969 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 970 GLIB_CFLAGS = @GLIB_CFLAGS@ 971 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/tools/Makefile.in gtk+2.0-2.12.11/docs/tools/Makefile.in 972 --- gtk+2.0-2.12.11.old/docs/tools/Makefile.in 2008-07-01 15:44:01.000000000 +0200 973 +++ gtk+2.0-2.12.11/docs/tools/Makefile.in 2008-07-02 07:22:30.000000000 +0200 974 @@ -90,6 +90,8 @@ 975 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 976 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 977 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 978 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 979 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 980 EXEEXT = @EXEEXT@ 981 F77 = @F77@ 982 FFLAGS = @FFLAGS@ 983 @@ -113,6 +115,7 @@ 984 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 985 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 986 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 987 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 988 GDK_WLIBS = @GDK_WLIBS@ 989 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 990 GLIB_CFLAGS = @GLIB_CFLAGS@ 991 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/docs/tutorial/Makefile.in gtk+2.0-2.12.11/docs/tutorial/Makefile.in 992 --- gtk+2.0-2.12.11.old/docs/tutorial/Makefile.in 2008-07-01 15:44:01.000000000 +0200 993 +++ gtk+2.0-2.12.11/docs/tutorial/Makefile.in 2008-07-02 07:22:30.000000000 +0200 994 @@ -90,6 +90,8 @@ 995 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 996 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 997 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 998 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 999 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1000 EXEEXT = @EXEEXT@ 1001 F77 = @F77@ 1002 FFLAGS = @FFLAGS@ 1003 @@ -113,6 +115,7 @@ 1004 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1005 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1006 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1007 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1008 GDK_WLIBS = @GDK_WLIBS@ 1009 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1010 GLIB_CFLAGS = @GLIB_CFLAGS@ 1011 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/directfb/Makefile.in gtk+2.0-2.12.11/gdk/directfb/Makefile.in 1012 --- gtk+2.0-2.12.11.old/gdk/directfb/Makefile.in 2008-07-01 15:44:02.000000000 +0200 1013 +++ gtk+2.0-2.12.11/gdk/directfb/Makefile.in 2008-07-02 07:22:31.000000000 +0200 1014 @@ -90,6 +90,8 @@ 1015 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1016 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1017 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1018 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1019 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1020 EXEEXT = @EXEEXT@ 1021 F77 = @F77@ 1022 FFLAGS = @FFLAGS@ 1023 @@ -113,6 +115,7 @@ 1024 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1025 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1026 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1027 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1028 GDK_WLIBS = @GDK_WLIBS@ 1029 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1030 GLIB_CFLAGS = @GLIB_CFLAGS@ 1031 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/Makefile.in gtk+2.0-2.12.11/gdk/Makefile.in 1032 --- gtk+2.0-2.12.11.old/gdk/Makefile.in 2008-07-01 15:44:02.000000000 +0200 1033 +++ gtk+2.0-2.12.11/gdk/Makefile.in 2008-07-02 07:22:31.000000000 +0200 1034 @@ -90,6 +90,8 @@ 1035 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1036 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1037 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1038 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1039 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1040 EXEEXT = @EXEEXT@ 1041 F77 = @F77@ 1042 FFLAGS = @FFLAGS@ 1043 @@ -113,6 +115,7 @@ 1044 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1045 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1046 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1047 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1048 GDK_WLIBS = @GDK_WLIBS@ 1049 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1050 GLIB_CFLAGS = @GLIB_CFLAGS@ 1051 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/quartz/Makefile.in gtk+2.0-2.12.11/gdk/quartz/Makefile.in 1052 --- gtk+2.0-2.12.11.old/gdk/quartz/Makefile.in 2008-07-01 15:44:02.000000000 +0200 1053 +++ gtk+2.0-2.12.11/gdk/quartz/Makefile.in 2008-07-02 07:22:32.000000000 +0200 1054 @@ -90,6 +90,8 @@ 1055 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1056 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1057 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1058 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1059 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1060 EXEEXT = @EXEEXT@ 1061 F77 = @F77@ 1062 FFLAGS = @FFLAGS@ 1063 @@ -113,6 +115,7 @@ 1064 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1065 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1066 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1067 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1068 GDK_WLIBS = @GDK_WLIBS@ 1069 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1070 GLIB_CFLAGS = @GLIB_CFLAGS@ 1071 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/win32/Makefile.in gtk+2.0-2.12.11/gdk/win32/Makefile.in 1072 --- gtk+2.0-2.12.11.old/gdk/win32/Makefile.in 2008-07-01 15:44:03.000000000 +0200 1073 +++ gtk+2.0-2.12.11/gdk/win32/Makefile.in 2008-07-02 07:22:32.000000000 +0200 1074 @@ -90,6 +90,8 @@ 1075 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1076 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1077 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1078 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1079 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1080 EXEEXT = @EXEEXT@ 1081 F77 = @F77@ 1082 FFLAGS = @FFLAGS@ 1083 @@ -113,6 +115,7 @@ 1084 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1085 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1086 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1087 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1088 GDK_WLIBS = @GDK_WLIBS@ 1089 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1090 GLIB_CFLAGS = @GLIB_CFLAGS@ 1091 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/win32/rc/Makefile.in gtk+2.0-2.12.11/gdk/win32/rc/Makefile.in 1092 --- gtk+2.0-2.12.11.old/gdk/win32/rc/Makefile.in 2008-07-01 15:44:03.000000000 +0200 1093 +++ gtk+2.0-2.12.11/gdk/win32/rc/Makefile.in 2008-07-02 07:22:32.000000000 +0200 1094 @@ -90,6 +90,8 @@ 1095 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1096 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1097 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1098 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1099 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1100 EXEEXT = @EXEEXT@ 1101 F77 = @F77@ 1102 FFLAGS = @FFLAGS@ 1103 @@ -113,6 +115,7 @@ 1104 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1105 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1106 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1107 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1108 GDK_WLIBS = @GDK_WLIBS@ 1109 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1110 GLIB_CFLAGS = @GLIB_CFLAGS@ 1111 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk/x11/Makefile.in gtk+2.0-2.12.11/gdk/x11/Makefile.in 1112 --- gtk+2.0-2.12.11.old/gdk/x11/Makefile.in 2008-07-01 15:44:03.000000000 +0200 1113 +++ gtk+2.0-2.12.11/gdk/x11/Makefile.in 2008-07-02 07:22:32.000000000 +0200 1114 @@ -92,6 +92,8 @@ 1115 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1116 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1117 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1118 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1119 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1120 EXEEXT = @EXEEXT@ 1121 F77 = @F77@ 1122 FFLAGS = @FFLAGS@ 1123 @@ -115,6 +117,7 @@ 1124 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1125 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1126 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1127 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1128 GDK_WLIBS = @GDK_WLIBS@ 1129 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1130 GLIB_CFLAGS = @GLIB_CFLAGS@ 1131 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk-pixbuf/Makefile.in gtk+2.0-2.12.11/gdk-pixbuf/Makefile.in 1132 --- gtk+2.0-2.12.11.old/gdk-pixbuf/Makefile.in 2008-07-01 15:44:02.000000000 +0200 1133 +++ gtk+2.0-2.12.11/gdk-pixbuf/Makefile.in 2008-07-02 07:22:31.000000000 +0200 1134 @@ -90,6 +90,8 @@ 1135 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1136 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1137 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1138 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1139 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1140 EXEEXT = @EXEEXT@ 1141 F77 = @F77@ 1142 FFLAGS = @FFLAGS@ 1143 @@ -113,6 +115,7 @@ 1144 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1145 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1146 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1147 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1148 GDK_WLIBS = @GDK_WLIBS@ 1149 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1150 GLIB_CFLAGS = @GLIB_CFLAGS@ 1151 @@ -350,6 +353,7 @@ 781 Index: gtk+-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in 782 =================================================================== 783 --- gtk+-2.12.11.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-07-19 12:11:05.797820463 +0200 784 +++ gtk+-2.12.11/contrib/gdk-pixbuf-xlib/Makefile.in 2008-07-19 12:23:59.689820423 +0200 785 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 786 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 787 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 788 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 789 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 790 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 791 EXEEXT = @EXEEXT@ 792 F77 = @F77@ 793 FFLAGS = @FFLAGS@ 794 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 795 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 796 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 797 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 798 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 799 GDK_WLIBS = @GDK_WLIBS@ 800 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 801 GLIB_CFLAGS = @GLIB_CFLAGS@ 802 Index: gtk+-2.12.11/contrib/Makefile.in 803 =================================================================== 804 --- gtk+-2.12.11.orig/contrib/Makefile.in 2008-07-19 12:11:05.781819127 +0200 805 +++ gtk+-2.12.11/contrib/Makefile.in 2008-07-19 12:23:59.689820423 +0200 806 @@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 807 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 808 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 809 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 810 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 811 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 812 EXEEXT = @EXEEXT@ 813 F77 = @F77@ 814 FFLAGS = @FFLAGS@ 815 @@ -114,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 816 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 817 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 818 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 819 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 820 GDK_WLIBS = @GDK_WLIBS@ 821 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 822 GLIB_CFLAGS = @GLIB_CFLAGS@ 823 Index: gtk+-2.12.11/demos/gtk-demo/Makefile.in 824 =================================================================== 825 --- gtk+-2.12.11.orig/demos/gtk-demo/Makefile.in 2008-07-19 12:11:05.773818460 +0200 826 +++ gtk+-2.12.11/demos/gtk-demo/Makefile.in 2008-07-19 12:23:59.689820423 +0200 827 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 828 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 829 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 830 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 831 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 832 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 833 EXEEXT = @EXEEXT@ 834 F77 = @F77@ 835 FFLAGS = @FFLAGS@ 836 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 837 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 838 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 839 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 840 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 841 GDK_WLIBS = @GDK_WLIBS@ 842 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 843 GLIB_CFLAGS = @GLIB_CFLAGS@ 844 Index: gtk+-2.12.11/demos/Makefile.in 845 =================================================================== 846 --- gtk+-2.12.11.orig/demos/Makefile.in 2008-07-19 12:11:05.757822013 +0200 847 +++ gtk+-2.12.11/demos/Makefile.in 2008-07-19 12:23:59.689820423 +0200 848 @@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 849 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 850 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 851 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 852 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 853 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 854 EXEEXT = @EXEEXT@ 855 F77 = @F77@ 856 FFLAGS = @FFLAGS@ 857 @@ -114,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 858 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 859 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 860 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 861 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 862 GDK_WLIBS = @GDK_WLIBS@ 863 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 864 GLIB_CFLAGS = @GLIB_CFLAGS@ 865 Index: gtk+-2.12.11/docs/faq/Makefile.in 866 =================================================================== 867 --- gtk+-2.12.11.orig/docs/faq/Makefile.in 2008-07-19 12:11:05.745818812 +0200 868 +++ gtk+-2.12.11/docs/faq/Makefile.in 2008-07-19 12:23:59.689820423 +0200 869 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 870 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 871 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 872 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 873 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 874 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 875 EXEEXT = @EXEEXT@ 876 F77 = @F77@ 877 FFLAGS = @FFLAGS@ 878 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 879 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 880 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 881 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 882 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 883 GDK_WLIBS = @GDK_WLIBS@ 884 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 885 GLIB_CFLAGS = @GLIB_CFLAGS@ 886 Index: gtk+-2.12.11/docs/Makefile.in 887 =================================================================== 888 --- gtk+-2.12.11.orig/docs/Makefile.in 2008-07-19 12:11:05.717819164 +0200 889 +++ gtk+-2.12.11/docs/Makefile.in 2008-07-19 12:23:59.693821002 +0200 890 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 891 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 892 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 893 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 894 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 895 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 896 EXEEXT = @EXEEXT@ 897 F77 = @F77@ 898 FFLAGS = @FFLAGS@ 899 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 900 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 901 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 902 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 903 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 904 GDK_WLIBS = @GDK_WLIBS@ 905 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 906 GLIB_CFLAGS = @GLIB_CFLAGS@ 907 Index: gtk+-2.12.11/docs/reference/gdk/Makefile.in 908 =================================================================== 909 --- gtk+-2.12.11.orig/docs/reference/gdk/Makefile.in 2008-07-19 12:11:05.709818496 +0200 910 +++ gtk+-2.12.11/docs/reference/gdk/Makefile.in 2008-07-19 12:23:59.693821002 +0200 911 @@ -96,6 +96,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 912 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 913 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 914 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 915 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 916 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 917 EXEEXT = @EXEEXT@ 918 F77 = @F77@ 919 FFLAGS = @FFLAGS@ 920 @@ -119,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 921 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 922 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 923 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 924 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 925 GDK_WLIBS = @GDK_WLIBS@ 926 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 927 GLIB_CFLAGS = @GLIB_CFLAGS@ 928 Index: gtk+-2.12.11/docs/reference/gdk-pixbuf/Makefile.in 929 =================================================================== 930 --- gtk+-2.12.11.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-07-19 12:11:05.693824983 +0200 931 +++ gtk+-2.12.11/docs/reference/gdk-pixbuf/Makefile.in 2008-07-19 12:23:59.693821002 +0200 932 @@ -96,6 +96,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 933 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 934 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 935 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 936 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 937 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 938 EXEEXT = @EXEEXT@ 939 F77 = @F77@ 940 FFLAGS = @FFLAGS@ 941 @@ -119,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 942 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 943 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 944 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 945 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 946 GDK_WLIBS = @GDK_WLIBS@ 947 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 948 GLIB_CFLAGS = @GLIB_CFLAGS@ 949 Index: gtk+-2.12.11/docs/reference/gtk/Makefile.in 950 =================================================================== 951 --- gtk+-2.12.11.orig/docs/reference/gtk/Makefile.in 2008-07-19 12:11:05.681819337 +0200 952 +++ gtk+-2.12.11/docs/reference/gtk/Makefile.in 2008-07-19 12:23:59.693821002 +0200 953 @@ -96,6 +96,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 954 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 955 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 956 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 957 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 958 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 959 EXEEXT = @EXEEXT@ 960 F77 = @F77@ 961 FFLAGS = @FFLAGS@ 962 @@ -119,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 963 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 964 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 965 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 966 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 967 GDK_WLIBS = @GDK_WLIBS@ 968 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 969 GLIB_CFLAGS = @GLIB_CFLAGS@ 970 Index: gtk+-2.12.11/docs/reference/Makefile.in 971 =================================================================== 972 --- gtk+-2.12.11.orig/docs/reference/Makefile.in 2008-07-19 12:11:05.653818711 +0200 973 +++ gtk+-2.12.11/docs/reference/Makefile.in 2008-07-19 12:23:59.693821002 +0200 974 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 975 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 976 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 977 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 978 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 979 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 980 EXEEXT = @EXEEXT@ 981 F77 = @F77@ 982 FFLAGS = @FFLAGS@ 983 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 984 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 985 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 986 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 987 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 988 GDK_WLIBS = @GDK_WLIBS@ 989 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 990 GLIB_CFLAGS = @GLIB_CFLAGS@ 991 Index: gtk+-2.12.11/docs/tools/Makefile.in 992 =================================================================== 993 --- gtk+-2.12.11.orig/docs/tools/Makefile.in 2008-07-19 12:11:05.645818532 +0200 994 +++ gtk+-2.12.11/docs/tools/Makefile.in 2008-07-19 12:23:59.693821002 +0200 995 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 996 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 997 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 998 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 999 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1000 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1001 EXEEXT = @EXEEXT@ 1002 F77 = @F77@ 1003 FFLAGS = @FFLAGS@ 1004 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1005 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1006 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1007 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1008 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1009 GDK_WLIBS = @GDK_WLIBS@ 1010 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1011 GLIB_CFLAGS = @GLIB_CFLAGS@ 1012 Index: gtk+-2.12.11/docs/tutorial/Makefile.in 1013 =================================================================== 1014 --- gtk+-2.12.11.orig/docs/tutorial/Makefile.in 2008-07-19 12:11:05.633819731 +0200 1015 +++ gtk+-2.12.11/docs/tutorial/Makefile.in 2008-07-19 12:23:59.697819136 +0200 1016 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1017 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1018 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1019 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1020 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1021 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1022 EXEEXT = @EXEEXT@ 1023 F77 = @F77@ 1024 FFLAGS = @FFLAGS@ 1025 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1026 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1027 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1028 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1029 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1030 GDK_WLIBS = @GDK_WLIBS@ 1031 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1032 GLIB_CFLAGS = @GLIB_CFLAGS@ 1033 Index: gtk+-2.12.11/gdk/directfb/Makefile.in 1034 =================================================================== 1035 --- gtk+-2.12.11.orig/gdk/directfb/Makefile.in 2008-07-19 12:11:05.621820440 +0200 1036 +++ gtk+-2.12.11/gdk/directfb/Makefile.in 2008-07-19 12:23:59.697819136 +0200 1037 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1038 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1039 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1040 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1041 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1042 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1043 EXEEXT = @EXEEXT@ 1044 F77 = @F77@ 1045 FFLAGS = @FFLAGS@ 1046 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1047 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1048 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1049 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1050 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1051 GDK_WLIBS = @GDK_WLIBS@ 1052 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1053 GLIB_CFLAGS = @GLIB_CFLAGS@ 1054 Index: gtk+-2.12.11/gdk/Makefile.in 1055 =================================================================== 1056 --- gtk+-2.12.11.orig/gdk/Makefile.in 2008-07-19 12:11:05.605819105 +0200 1057 +++ gtk+-2.12.11/gdk/Makefile.in 2008-07-19 12:23:59.697819136 +0200 1058 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1059 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1060 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1061 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1062 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1063 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1064 EXEEXT = @EXEEXT@ 1065 F77 = @F77@ 1066 FFLAGS = @FFLAGS@ 1067 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1068 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1069 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1070 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1071 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1072 GDK_WLIBS = @GDK_WLIBS@ 1073 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1074 GLIB_CFLAGS = @GLIB_CFLAGS@ 1075 Index: gtk+-2.12.11/gdk/quartz/Makefile.in 1076 =================================================================== 1077 --- gtk+-2.12.11.orig/gdk/quartz/Makefile.in 2008-07-19 12:11:05.597818437 +0200 1078 +++ gtk+-2.12.11/gdk/quartz/Makefile.in 2008-07-19 12:23:59.697819136 +0200 1079 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1080 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1081 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1082 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1083 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1084 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1085 EXEEXT = @EXEEXT@ 1086 F77 = @F77@ 1087 FFLAGS = @FFLAGS@ 1088 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1089 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1090 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1091 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1092 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1093 GDK_WLIBS = @GDK_WLIBS@ 1094 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1095 GLIB_CFLAGS = @GLIB_CFLAGS@ 1096 Index: gtk+-2.12.11/gdk/win32/Makefile.in 1097 =================================================================== 1098 --- gtk+-2.12.11.orig/gdk/win32/Makefile.in 2008-07-19 12:11:05.585818658 +0200 1099 +++ gtk+-2.12.11/gdk/win32/Makefile.in 2008-07-19 12:23:59.697819136 +0200 1100 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1101 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1102 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1103 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1104 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1105 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1106 EXEEXT = @EXEEXT@ 1107 F77 = @F77@ 1108 FFLAGS = @FFLAGS@ 1109 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1110 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1111 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1112 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1113 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1114 GDK_WLIBS = @GDK_WLIBS@ 1115 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1116 GLIB_CFLAGS = @GLIB_CFLAGS@ 1117 Index: gtk+-2.12.11/gdk/win32/rc/Makefile.in 1118 =================================================================== 1119 --- gtk+-2.12.11.orig/gdk/win32/rc/Makefile.in 2008-07-19 12:11:05.573821323 +0200 1120 +++ gtk+-2.12.11/gdk/win32/rc/Makefile.in 2008-07-19 12:23:59.701820692 +0200 1121 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1122 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1123 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1124 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1125 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1126 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1127 EXEEXT = @EXEEXT@ 1128 F77 = @F77@ 1129 FFLAGS = @FFLAGS@ 1130 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1131 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1132 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1133 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1134 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1135 GDK_WLIBS = @GDK_WLIBS@ 1136 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1137 GLIB_CFLAGS = @GLIB_CFLAGS@ 1138 Index: gtk+-2.12.11/gdk/x11/Makefile.in 1139 =================================================================== 1140 --- gtk+-2.12.11.orig/gdk/x11/Makefile.in 2008-07-19 12:11:05.561821055 +0200 1141 +++ gtk+-2.12.11/gdk/x11/Makefile.in 2008-07-19 12:23:59.701820692 +0200 1142 @@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1143 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1144 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1145 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1146 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1147 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1148 EXEEXT = @EXEEXT@ 1149 F77 = @F77@ 1150 FFLAGS = @FFLAGS@ 1151 @@ -115,6 +117,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1152 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1153 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1154 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1155 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1156 GDK_WLIBS = @GDK_WLIBS@ 1157 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1158 GLIB_CFLAGS = @GLIB_CFLAGS@ 1159 Index: gtk+-2.12.11/gdk-pixbuf/Makefile.in 1160 =================================================================== 1161 --- gtk+-2.12.11.orig/gdk-pixbuf/Makefile.in 2008-07-19 12:11:05.549818342 +0200 1162 +++ gtk+-2.12.11/gdk-pixbuf/Makefile.in 2008-07-19 12:23:59.701820692 +0200 1163 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1164 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1165 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1166 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1167 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1168 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1169 EXEEXT = @EXEEXT@ 1170 F77 = @F77@ 1171 FFLAGS = @FFLAGS@ 1172 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1173 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1174 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1175 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1176 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1177 GDK_WLIBS = @GDK_WLIBS@ 1178 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1179 GLIB_CFLAGS = @GLIB_CFLAGS@ 1180 @@ -350,6 +353,7 @@ lib_LTLIBRARIES = \ 1152 1181 1153 1182 … … 1157 1186 module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) 1158 1187 1159 @@ -559,7 +563,7 @@ 1188 @@ -559,7 +563,7 @@ INCLUDES = \ 1160 1189 -DGDK_PIXBUF_ENABLE_BACKEND 1161 1190 … … 1166 1195 1167 1196 noinst_PROGRAMS = test-gdk-pixbuf 1168 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.12.11/gdk-pixbuf/pixops/Makefile.in 1169 --- gtk+2.0-2.12.11.old/gdk-pixbuf/pixops/Makefile.in 2008-07-01 15:44:02.000000000 +0200 1170 +++ gtk+2.0-2.12.11/gdk-pixbuf/pixops/Makefile.in 2008-07-02 07:22:31.000000000 +0200 1171 @@ -90,6 +90,8 @@ 1172 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1173 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1174 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1175 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1176 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1177 EXEEXT = @EXEEXT@ 1178 F77 = @F77@ 1179 FFLAGS = @FFLAGS@ 1180 @@ -113,6 +115,7 @@ 1181 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1182 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1183 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1184 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1185 GDK_WLIBS = @GDK_WLIBS@ 1186 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1187 GLIB_CFLAGS = @GLIB_CFLAGS@ 1188 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/Makefile.in gtk+2.0-2.12.11/gtk/Makefile.in 1189 --- gtk+2.0-2.12.11.old/gtk/Makefile.in 2008-07-01 15:44:03.000000000 +0200 1190 +++ gtk+2.0-2.12.11/gtk/Makefile.in 2008-07-02 07:22:33.000000000 +0200 1191 @@ -116,6 +116,8 @@ 1192 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1193 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1194 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1195 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1196 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1197 EXEEXT = @EXEEXT@ 1198 F77 = @F77@ 1199 FFLAGS = @FFLAGS@ 1200 @@ -139,6 +141,7 @@ 1201 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1202 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1203 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1204 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1205 GDK_WLIBS = @GDK_WLIBS@ 1206 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1207 GLIB_CFLAGS = @GLIB_CFLAGS@ 1208 @@ -384,6 +387,8 @@ 1197 Index: gtk+-2.12.11/gdk-pixbuf/pixops/Makefile.in 1198 =================================================================== 1199 --- gtk+-2.12.11.orig/gdk-pixbuf/pixops/Makefile.in 2008-07-19 12:11:05.537821985 +0200 1200 +++ gtk+-2.12.11/gdk-pixbuf/pixops/Makefile.in 2008-07-19 12:23:59.701820692 +0200 1201 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1202 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1203 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1204 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1205 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1206 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1207 EXEEXT = @EXEEXT@ 1208 F77 = @F77@ 1209 FFLAGS = @FFLAGS@ 1210 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1211 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1212 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1213 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1214 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1215 GDK_WLIBS = @GDK_WLIBS@ 1216 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1217 GLIB_CFLAGS = @GLIB_CFLAGS@ 1218 Index: gtk+-2.12.11/gtk/Makefile.in 1219 =================================================================== 1220 --- gtk+-2.12.11.orig/gtk/Makefile.in 2008-07-19 12:11:05.525819273 +0200 1221 +++ gtk+-2.12.11/gtk/Makefile.in 2008-07-19 12:23:59.705823714 +0200 1222 @@ -116,6 +116,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1223 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1224 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1225 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1226 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1227 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1228 EXEEXT = @EXEEXT@ 1229 F77 = @F77@ 1230 FFLAGS = @FFLAGS@ 1231 @@ -139,6 +141,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1232 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1233 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1234 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1235 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1236 GDK_WLIBS = @GDK_WLIBS@ 1237 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1238 GLIB_CFLAGS = @GLIB_CFLAGS@ 1239 @@ -384,6 +387,8 @@ INCLUDES = \ 1209 1240 -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ 1210 1241 -DGDK_PIXBUF_DISABLE_DEPRECATED \ … … 1215 1246 -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ 1216 1247 $(GTK_DEBUG_FLAGS) \ 1217 @@ -639,13 +644,16 @@ 1248 @@ -639,13 +644,16 @@ gtk_public_h_sources = \ 1218 1249 # that are not included in gtk/gtk.h 1219 1250 gtk_semi_private_h_sources = \ … … 1235 1266 gtkdndcursors.h \ 1236 1267 gtkentryprivate.h \ 1237 @@ -653,10 +661,7 @@ 1268 @@ -653,10 +661,7 @@ gtk_private_h_sources = \ 1238 1269 gtkfilechooserdefault.h \ 1239 1270 gtkfilechooserembed.h \ … … 1246 1277 gtkhsv.h \ 1247 1278 gtkiconcache.h \ 1248 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/theme-bits/Makefile.in gtk+2.0-2.12.11/gtk/theme-bits/Makefile.in 1249 --- gtk+2.0-2.12.11.old/gtk/theme-bits/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1250 +++ gtk+2.0-2.12.11/gtk/theme-bits/Makefile.in 2008-07-02 07:22:33.000000000 +0200 1251 @@ -90,6 +90,8 @@ 1252 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1253 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1254 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1255 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1256 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1257 EXEEXT = @EXEEXT@ 1258 F77 = @F77@ 1259 FFLAGS = @FFLAGS@ 1260 @@ -113,6 +115,7 @@ 1261 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1262 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1263 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1264 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1265 GDK_WLIBS = @GDK_WLIBS@ 1266 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1267 GLIB_CFLAGS = @GLIB_CFLAGS@ 1268 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/gtk/xdgmime/Makefile.in gtk+2.0-2.12.11/gtk/xdgmime/Makefile.in 1269 --- gtk+2.0-2.12.11.old/gtk/xdgmime/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1270 +++ gtk+2.0-2.12.11/gtk/xdgmime/Makefile.in 2008-07-02 07:22:33.000000000 +0200 1271 @@ -90,6 +90,8 @@ 1272 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1273 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1274 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1275 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1276 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1277 EXEEXT = @EXEEXT@ 1278 F77 = @F77@ 1279 FFLAGS = @FFLAGS@ 1280 @@ -113,6 +115,7 @@ 1281 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1282 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1283 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1284 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1285 GDK_WLIBS = @GDK_WLIBS@ 1286 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1287 GLIB_CFLAGS = @GLIB_CFLAGS@ 1288 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/ltmain.sh gtk+2.0-2.12.11/ltmain.sh 1289 --- gtk+2.0-2.12.11.old/ltmain.sh 2008-06-09 21:51:13.000000000 +0200 1290 +++ gtk+2.0-2.12.11/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 1291 @@ -43,7 +43,7 @@ 1279 Index: gtk+-2.12.11/gtk/theme-bits/Makefile.in 1280 =================================================================== 1281 --- gtk+-2.12.11.orig/gtk/theme-bits/Makefile.in 2008-07-19 12:11:05.505823714 +0200 1282 +++ gtk+-2.12.11/gtk/theme-bits/Makefile.in 2008-07-19 12:23:59.705823714 +0200 1283 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1284 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1285 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1286 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1287 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1288 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1289 EXEEXT = @EXEEXT@ 1290 F77 = @F77@ 1291 FFLAGS = @FFLAGS@ 1292 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1293 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1294 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1295 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1296 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1297 GDK_WLIBS = @GDK_WLIBS@ 1298 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1299 GLIB_CFLAGS = @GLIB_CFLAGS@ 1300 Index: gtk+-2.12.11/gtk/xdgmime/Makefile.in 1301 =================================================================== 1302 --- gtk+-2.12.11.orig/gtk/xdgmime/Makefile.in 2008-07-19 12:11:05.477823089 +0200 1303 +++ gtk+-2.12.11/gtk/xdgmime/Makefile.in 2008-07-19 12:23:59.705823714 +0200 1304 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1305 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1306 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1307 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1308 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1309 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1310 EXEEXT = @EXEEXT@ 1311 F77 = @F77@ 1312 FFLAGS = @FFLAGS@ 1313 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1314 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1315 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1316 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1317 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1318 GDK_WLIBS = @GDK_WLIBS@ 1319 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1320 GLIB_CFLAGS = @GLIB_CFLAGS@ 1321 Index: gtk+-2.12.11/ltmain.sh 1322 =================================================================== 1323 --- gtk+-2.12.11.orig/ltmain.sh 2008-07-19 12:11:05.453865086 +0200 1324 +++ gtk+-2.12.11/ltmain.sh 2008-07-19 12:23:59.709823315 +0200 1325 @@ -43,7 +43,7 @@ EXIT_FAILURE=1 1292 1326 1293 1327 PROGRAM=ltmain.sh … … 1298 1332 1299 1333 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). 1300 @@ -2135,7 +2135,10 @@ 1334 @@ -2135,7 +2135,10 @@ EOF 1301 1335 case $pass in 1302 1336 dlopen) libs="$dlfiles" ;; … … 1310 1344 fi 1311 1345 if test "$pass" = dlopen; then 1312 @@ -3269,6 +3272,11 @@ 1346 @@ -3269,6 +3272,11 @@ EOF 1313 1347 revision="$number_minor" 1314 1348 lt_irix_increment=no … … 1322 1356 ;; 1323 1357 no) 1324 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/m4macros/Makefile.in gtk+2.0-2.12.11/m4macros/Makefile.in 1325 --- gtk+2.0-2.12.11.old/m4macros/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1326 +++ gtk+2.0-2.12.11/m4macros/Makefile.in 2008-07-02 07:22:33.000000000 +0200 1327 @@ -90,6 +90,8 @@ 1328 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1329 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1330 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1331 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1332 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1333 EXEEXT = @EXEEXT@ 1334 F77 = @F77@ 1335 FFLAGS = @FFLAGS@ 1336 @@ -113,6 +115,7 @@ 1337 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1338 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1339 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1340 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1341 GDK_WLIBS = @GDK_WLIBS@ 1342 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1343 GLIB_CFLAGS = @GLIB_CFLAGS@ 1344 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/Makefile.in gtk+2.0-2.12.11/Makefile.in 1345 --- gtk+2.0-2.12.11.old/Makefile.in 2008-07-01 15:44:00.000000000 +0200 1346 +++ gtk+2.0-2.12.11/Makefile.in 2008-07-02 07:22:29.000000000 +0200 1347 @@ -91,6 +91,8 @@ 1348 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1349 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1350 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1351 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1352 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1353 EXEEXT = @EXEEXT@ 1354 F77 = @F77@ 1355 FFLAGS = @FFLAGS@ 1356 @@ -114,6 +116,7 @@ 1357 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1358 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1359 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1360 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1361 GDK_WLIBS = @GDK_WLIBS@ 1362 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1363 GLIB_CFLAGS = @GLIB_CFLAGS@ 1364 @@ -332,7 +335,10 @@ 1358 Index: gtk+-2.12.11/m4macros/Makefile.in 1359 =================================================================== 1360 --- gtk+-2.12.11.orig/m4macros/Makefile.in 2008-07-19 12:11:05.429825438 +0200 1361 +++ gtk+-2.12.11/m4macros/Makefile.in 2008-07-19 12:23:59.709823315 +0200 1362 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1363 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1364 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1365 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1366 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1367 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1368 EXEEXT = @EXEEXT@ 1369 F77 = @F77@ 1370 FFLAGS = @FFLAGS@ 1371 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1372 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1373 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1374 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1375 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1376 GDK_WLIBS = @GDK_WLIBS@ 1377 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1378 GLIB_CFLAGS = @GLIB_CFLAGS@ 1379 Index: gtk+-2.12.11/Makefile.in 1380 =================================================================== 1381 --- gtk+-2.12.11.orig/Makefile.in 2008-07-19 12:11:05.405820502 +0200 1382 +++ gtk+-2.12.11/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1383 @@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1384 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1385 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1386 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1387 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1388 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1389 EXEEXT = @EXEEXT@ 1390 F77 = @F77@ 1391 FFLAGS = @FFLAGS@ 1392 @@ -114,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1393 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1394 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1395 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1396 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1397 GDK_WLIBS = @GDK_WLIBS@ 1398 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1399 GLIB_CFLAGS = @GLIB_CFLAGS@ 1400 @@ -332,7 +335,10 @@ sharedstatedir = @sharedstatedir@ 1365 1401 sysconfdir = @sysconfdir@ 1366 1402 target_alias = @target_alias@ … … 1374 1410 1375 1411 # require automake 1.4 1376 @@ -484,13 +490,14 @@ 1412 @@ -484,13 +490,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r 1377 1413 DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ 1378 1414 COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \ … … 1391 1427 $(MAKE) $(AM_MAKEFLAGS) all-recursive 1392 1428 1393 @@ -742,7 +749,7 @@ 1429 @@ -742,7 +749,7 @@ distdir: $(DISTFILES) 1394 1430 || exit 1; \ 1395 1431 fi; \ … … 1400 1436 test -d $(distdir)/$$subdir \ 1401 1437 || mkdir $(distdir)/$$subdir \ 1402 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/Makefile.in gtk+2.0-2.12.11/modules/engines/Makefile.in 1403 --- gtk+2.0-2.12.11.old/modules/engines/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1404 +++ gtk+2.0-2.12.11/modules/engines/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1405 @@ -90,6 +90,8 @@ 1406 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1407 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1408 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1409 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1410 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1411 EXEEXT = @EXEEXT@ 1412 F77 = @F77@ 1413 FFLAGS = @FFLAGS@ 1414 @@ -113,6 +115,7 @@ 1415 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1416 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1417 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1418 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1419 GDK_WLIBS = @GDK_WLIBS@ 1420 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1421 GLIB_CFLAGS = @GLIB_CFLAGS@ 1422 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Makefile.in 1423 --- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1424 +++ gtk+2.0-2.12.11/modules/engines/ms-windows/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1425 @@ -90,6 +90,8 @@ 1426 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1427 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1428 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1429 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1430 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1431 EXEEXT = @EXEEXT@ 1432 F77 = @F77@ 1433 FFLAGS = @FFLAGS@ 1434 @@ -113,6 +115,7 @@ 1435 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1436 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1437 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1438 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1439 GDK_WLIBS = @GDK_WLIBS@ 1440 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1441 GLIB_CFLAGS = @GLIB_CFLAGS@ 1442 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 1443 --- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1444 +++ gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1445 @@ -90,6 +90,8 @@ 1446 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1447 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1448 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1449 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1450 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1451 EXEEXT = @EXEEXT@ 1452 F77 = @F77@ 1453 FFLAGS = @FFLAGS@ 1454 @@ -113,6 +115,7 @@ 1455 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1456 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1457 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1458 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1459 GDK_WLIBS = @GDK_WLIBS@ 1460 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1461 GLIB_CFLAGS = @GLIB_CFLAGS@ 1462 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/Makefile.in 1463 --- gtk+2.0-2.12.11.old/modules/engines/ms-windows/Theme/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1464 +++ gtk+2.0-2.12.11/modules/engines/ms-windows/Theme/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1465 @@ -90,6 +90,8 @@ 1466 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1467 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1468 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1469 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1470 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1471 EXEEXT = @EXEEXT@ 1472 F77 = @F77@ 1473 FFLAGS = @FFLAGS@ 1474 @@ -113,6 +115,7 @@ 1475 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1476 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1477 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1478 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1479 GDK_WLIBS = @GDK_WLIBS@ 1480 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1481 GLIB_CFLAGS = @GLIB_CFLAGS@ 1482 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.12.11/modules/engines/pixbuf/Makefile.in 1483 --- gtk+2.0-2.12.11.old/modules/engines/pixbuf/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1484 +++ gtk+2.0-2.12.11/modules/engines/pixbuf/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1485 @@ -90,6 +90,8 @@ 1486 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1487 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1488 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1489 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1490 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1491 EXEEXT = @EXEEXT@ 1492 F77 = @F77@ 1493 FFLAGS = @FFLAGS@ 1494 @@ -113,6 +115,7 @@ 1495 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1496 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1497 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1498 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1499 GDK_WLIBS = @GDK_WLIBS@ 1500 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1501 GLIB_CFLAGS = @GLIB_CFLAGS@ 1502 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/input/Makefile.in gtk+2.0-2.12.11/modules/input/Makefile.in 1503 --- gtk+2.0-2.12.11.old/modules/input/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1504 +++ gtk+2.0-2.12.11/modules/input/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1505 @@ -90,6 +90,8 @@ 1506 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1507 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1508 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1509 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1510 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1511 EXEEXT = @EXEEXT@ 1512 F77 = @F77@ 1513 FFLAGS = @FFLAGS@ 1514 @@ -113,6 +115,7 @@ 1515 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1516 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1517 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1518 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1519 GDK_WLIBS = @GDK_WLIBS@ 1520 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1521 GLIB_CFLAGS = @GLIB_CFLAGS@ 1522 @@ -433,9 +436,10 @@ 1438 Index: gtk+-2.12.11/modules/engines/Makefile.in 1439 =================================================================== 1440 --- gtk+-2.12.11.orig/modules/engines/Makefile.in 2008-07-19 12:11:05.381821432 +0200 1441 +++ gtk+-2.12.11/modules/engines/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1442 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1443 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1444 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1445 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1446 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1447 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1448 EXEEXT = @EXEEXT@ 1449 F77 = @F77@ 1450 FFLAGS = @FFLAGS@ 1451 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1452 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1453 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1454 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1455 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1456 GDK_WLIBS = @GDK_WLIBS@ 1457 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1458 GLIB_CFLAGS = @GLIB_CFLAGS@ 1459 Index: gtk+-2.12.11/modules/engines/ms-windows/Makefile.in 1460 =================================================================== 1461 --- gtk+-2.12.11.orig/modules/engines/ms-windows/Makefile.in 2008-07-19 12:11:05.353828140 +0200 1462 +++ gtk+-2.12.11/modules/engines/ms-windows/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1463 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1464 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1465 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1466 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1467 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1468 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1469 EXEEXT = @EXEEXT@ 1470 F77 = @F77@ 1471 FFLAGS = @FFLAGS@ 1472 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1473 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1474 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1475 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1476 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1477 GDK_WLIBS = @GDK_WLIBS@ 1478 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1479 GLIB_CFLAGS = @GLIB_CFLAGS@ 1480 Index: gtk+-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 1481 =================================================================== 1482 --- gtk+-2.12.11.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-07-19 12:11:05.325817736 +0200 1483 +++ gtk+-2.12.11/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1484 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1485 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1486 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1487 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1488 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1489 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1490 EXEEXT = @EXEEXT@ 1491 F77 = @F77@ 1492 FFLAGS = @FFLAGS@ 1493 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1494 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1495 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1496 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1497 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1498 GDK_WLIBS = @GDK_WLIBS@ 1499 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1500 GLIB_CFLAGS = @GLIB_CFLAGS@ 1501 Index: gtk+-2.12.11/modules/engines/ms-windows/Theme/Makefile.in 1502 =================================================================== 1503 --- gtk+-2.12.11.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-07-19 12:11:05.285826131 +0200 1504 +++ gtk+-2.12.11/modules/engines/ms-windows/Theme/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1505 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1506 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1507 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1508 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1509 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1510 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1511 EXEEXT = @EXEEXT@ 1512 F77 = @F77@ 1513 FFLAGS = @FFLAGS@ 1514 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1515 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1516 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1517 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1518 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1519 GDK_WLIBS = @GDK_WLIBS@ 1520 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1521 GLIB_CFLAGS = @GLIB_CFLAGS@ 1522 Index: gtk+-2.12.11/modules/engines/pixbuf/Makefile.in 1523 =================================================================== 1524 --- gtk+-2.12.11.orig/modules/engines/pixbuf/Makefile.in 2008-07-19 12:11:05.257822572 +0200 1525 +++ gtk+-2.12.11/modules/engines/pixbuf/Makefile.in 2008-07-19 12:23:59.713820471 +0200 1526 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1527 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1528 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1529 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1530 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1531 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1532 EXEEXT = @EXEEXT@ 1533 F77 = @F77@ 1534 FFLAGS = @FFLAGS@ 1535 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1536 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1537 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1538 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1539 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1540 GDK_WLIBS = @GDK_WLIBS@ 1541 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1542 GLIB_CFLAGS = @GLIB_CFLAGS@ 1543 Index: gtk+-2.12.11/modules/input/Makefile.in 1544 =================================================================== 1545 --- gtk+-2.12.11.orig/modules/input/Makefile.in 2008-07-19 12:11:05.233822525 +0200 1546 +++ gtk+-2.12.11/modules/input/Makefile.in 2008-07-19 12:23:59.717823983 +0200 1547 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1548 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1549 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1550 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1551 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1552 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1553 EXEEXT = @EXEEXT@ 1554 F77 = @F77@ 1555 FFLAGS = @FFLAGS@ 1556 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1557 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1558 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1559 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1560 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1561 GDK_WLIBS = @GDK_WLIBS@ 1562 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1563 GLIB_CFLAGS = @GLIB_CFLAGS@ 1564 @@ -433,9 +436,10 @@ im_multipress_la_LIBADD = $(LDADDS) 1523 1565 1524 1566 imconffiledir = $(sysconfdir)/gtk-2.0 … … 1532 1574 module_LTLIBRARIES = \ 1533 1575 $(IM_XIM_MODULE) \ 1534 @@ -988,7 +992,18 @@ 1576 @@ -988,7 +992,18 @@ uninstall-local: 1535 1577 rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules 1536 1578 … … 1552 1594 @CROSS_COMPILING_FALSE@all-local: gtk.immodules 1553 1595 # Tell versions [3.59,3.63) of GNU make to not export all variables. 1554 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/Makefile.in gtk+2.0-2.12.11/modules/Makefile.in 1555 --- gtk+2.0-2.12.11.old/modules/Makefile.in 2008-07-01 15:44:04.000000000 +0200 1556 +++ gtk+2.0-2.12.11/modules/Makefile.in 2008-07-02 07:22:34.000000000 +0200 1557 @@ -90,6 +90,8 @@ 1558 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1559 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1560 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1561 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1562 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1563 EXEEXT = @EXEEXT@ 1564 F77 = @F77@ 1565 FFLAGS = @FFLAGS@ 1566 @@ -113,6 +115,7 @@ 1567 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1568 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1569 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1570 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1571 GDK_WLIBS = @GDK_WLIBS@ 1572 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1573 GLIB_CFLAGS = @GLIB_CFLAGS@ 1574 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.12.11/modules/printbackends/cups/Makefile.in 1575 --- gtk+2.0-2.12.11.old/modules/printbackends/cups/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1576 +++ gtk+2.0-2.12.11/modules/printbackends/cups/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1577 @@ -90,6 +90,8 @@ 1578 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1579 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1580 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1581 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1582 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1583 EXEEXT = @EXEEXT@ 1584 F77 = @F77@ 1585 FFLAGS = @FFLAGS@ 1586 @@ -113,6 +115,7 @@ 1587 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1588 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1589 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1590 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1591 GDK_WLIBS = @GDK_WLIBS@ 1592 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1593 GLIB_CFLAGS = @GLIB_CFLAGS@ 1594 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/file/Makefile.in gtk+2.0-2.12.11/modules/printbackends/file/Makefile.in 1595 --- gtk+2.0-2.12.11.old/modules/printbackends/file/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1596 +++ gtk+2.0-2.12.11/modules/printbackends/file/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1597 @@ -90,6 +90,8 @@ 1598 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1599 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1600 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1601 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1602 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1603 EXEEXT = @EXEEXT@ 1604 F77 = @F77@ 1605 FFLAGS = @FFLAGS@ 1606 @@ -113,6 +115,7 @@ 1607 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1608 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1609 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1610 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1611 GDK_WLIBS = @GDK_WLIBS@ 1612 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1613 GLIB_CFLAGS = @GLIB_CFLAGS@ 1614 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.12.11/modules/printbackends/lpr/Makefile.in 1615 --- gtk+2.0-2.12.11.old/modules/printbackends/lpr/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1616 +++ gtk+2.0-2.12.11/modules/printbackends/lpr/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1617 @@ -90,6 +90,8 @@ 1618 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1619 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1620 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1621 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1622 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1623 EXEEXT = @EXEEXT@ 1624 F77 = @F77@ 1625 FFLAGS = @FFLAGS@ 1626 @@ -113,6 +115,7 @@ 1627 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1628 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1629 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1630 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1631 GDK_WLIBS = @GDK_WLIBS@ 1632 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1633 GLIB_CFLAGS = @GLIB_CFLAGS@ 1634 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/Makefile.in gtk+2.0-2.12.11/modules/printbackends/Makefile.in 1635 --- gtk+2.0-2.12.11.old/modules/printbackends/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1636 +++ gtk+2.0-2.12.11/modules/printbackends/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1637 @@ -92,6 +92,8 @@ 1638 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1639 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1640 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1641 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1642 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1643 EXEEXT = @EXEEXT@ 1644 F77 = @F77@ 1645 FFLAGS = @FFLAGS@ 1646 @@ -115,6 +117,7 @@ 1647 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1648 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1649 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1650 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1651 GDK_WLIBS = @GDK_WLIBS@ 1652 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1653 GLIB_CFLAGS = @GLIB_CFLAGS@ 1654 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/modules/printbackends/test/Makefile.in gtk+2.0-2.12.11/modules/printbackends/test/Makefile.in 1655 --- gtk+2.0-2.12.11.old/modules/printbackends/test/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1656 +++ gtk+2.0-2.12.11/modules/printbackends/test/Makefile.in 2008-07-02 07:22:35.000000000 +0200 1657 @@ -90,6 +90,8 @@ 1658 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1659 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1660 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1661 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1662 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1663 EXEEXT = @EXEEXT@ 1664 F77 = @F77@ 1665 FFLAGS = @FFLAGS@ 1666 @@ -113,6 +115,7 @@ 1667 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1668 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1669 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1670 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1671 GDK_WLIBS = @GDK_WLIBS@ 1672 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1673 GLIB_CFLAGS = @GLIB_CFLAGS@ 1674 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/perf/Makefile.in gtk+2.0-2.12.11/perf/Makefile.in 1675 --- gtk+2.0-2.12.11.old/perf/Makefile.in 2008-07-01 15:44:05.000000000 +0200 1676 +++ gtk+2.0-2.12.11/perf/Makefile.in 2008-07-02 07:22:36.000000000 +0200 1677 @@ -90,6 +90,8 @@ 1678 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1679 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1680 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1681 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1682 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1683 EXEEXT = @EXEEXT@ 1684 F77 = @F77@ 1685 FFLAGS = @FFLAGS@ 1686 @@ -113,6 +115,7 @@ 1687 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1688 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1689 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1690 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1691 GDK_WLIBS = @GDK_WLIBS@ 1692 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1693 GLIB_CFLAGS = @GLIB_CFLAGS@ 1694 diff -x'*config.sub' -x'*config.guess' -Naur gtk+2.0-2.12.11.old/tests/Makefile.in gtk+2.0-2.12.11/tests/Makefile.in 1695 --- gtk+2.0-2.12.11.old/tests/Makefile.in 2008-07-01 15:44:06.000000000 +0200 1696 +++ gtk+2.0-2.12.11/tests/Makefile.in 2008-07-02 07:22:36.000000000 +0200 1697 @@ -93,6 +93,8 @@ 1698 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1699 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1700 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1701 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1702 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1703 EXEEXT = @EXEEXT@ 1704 F77 = @F77@ 1705 FFLAGS = @FFLAGS@ 1706 @@ -116,6 +118,7 @@ 1707 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1708 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1709 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1710 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1711 GDK_WLIBS = @GDK_WLIBS@ 1712 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1713 GLIB_CFLAGS = @GLIB_CFLAGS@ 1596 Index: gtk+-2.12.11/modules/Makefile.in 1597 =================================================================== 1598 --- gtk+-2.12.11.orig/modules/Makefile.in 2008-07-19 12:11:05.205821410 +0200 1599 +++ gtk+-2.12.11/modules/Makefile.in 2008-07-19 12:23:59.717823983 +0200 1600 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1601 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1602 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1603 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1604 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1605 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1606 EXEEXT = @EXEEXT@ 1607 F77 = @F77@ 1608 FFLAGS = @FFLAGS@ 1609 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1610 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1611 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1612 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1613 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1614 GDK_WLIBS = @GDK_WLIBS@ 1615 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1616 GLIB_CFLAGS = @GLIB_CFLAGS@ 1617 Index: gtk+-2.12.11/modules/printbackends/cups/Makefile.in 1618 =================================================================== 1619 --- gtk+-2.12.11.orig/modules/printbackends/cups/Makefile.in 2008-07-19 12:11:05.177826162 +0200 1620 +++ gtk+-2.12.11/modules/printbackends/cups/Makefile.in 2008-07-19 12:23:59.717823983 +0200 1621 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1622 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1623 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1624 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1625 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1626 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1627 EXEEXT = @EXEEXT@ 1628 F77 = @F77@ 1629 FFLAGS = @FFLAGS@ 1630 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1631 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1632 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1633 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1634 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1635 GDK_WLIBS = @GDK_WLIBS@ 1636 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1637 GLIB_CFLAGS = @GLIB_CFLAGS@ 1638 Index: gtk+-2.12.11/modules/printbackends/file/Makefile.in 1639 =================================================================== 1640 --- gtk+-2.12.11.orig/modules/printbackends/file/Makefile.in 2008-07-19 12:11:05.121819044 +0200 1641 +++ gtk+-2.12.11/modules/printbackends/file/Makefile.in 2008-07-19 12:23:59.717823983 +0200 1642 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1643 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1644 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1645 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1646 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1647 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1648 EXEEXT = @EXEEXT@ 1649 F77 = @F77@ 1650 FFLAGS = @FFLAGS@ 1651 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1652 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1653 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1654 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1655 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1656 GDK_WLIBS = @GDK_WLIBS@ 1657 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1658 GLIB_CFLAGS = @GLIB_CFLAGS@ 1659 Index: gtk+-2.12.11/modules/printbackends/lpr/Makefile.in 1660 =================================================================== 1661 --- gtk+-2.12.11.orig/modules/printbackends/lpr/Makefile.in 2008-07-19 12:11:05.081824017 +0200 1662 +++ gtk+-2.12.11/modules/printbackends/lpr/Makefile.in 2008-07-19 12:23:59.717823983 +0200 1663 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1664 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1665 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1666 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1667 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1668 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1669 EXEEXT = @EXEEXT@ 1670 F77 = @F77@ 1671 FFLAGS = @FFLAGS@ 1672 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1673 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1674 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1675 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1676 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1677 GDK_WLIBS = @GDK_WLIBS@ 1678 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1679 GLIB_CFLAGS = @GLIB_CFLAGS@ 1680 Index: gtk+-2.12.11/modules/printbackends/Makefile.in 1681 =================================================================== 1682 --- gtk+-2.12.11.orig/modules/printbackends/Makefile.in 2008-07-19 12:11:05.053828280 +0200 1683 +++ gtk+-2.12.11/modules/printbackends/Makefile.in 2008-07-19 12:23:59.721820161 +0200 1684 @@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1685 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1686 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1687 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1688 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1689 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1690 EXEEXT = @EXEEXT@ 1691 F77 = @F77@ 1692 FFLAGS = @FFLAGS@ 1693 @@ -115,6 +117,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1694 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1695 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1696 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1697 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1698 GDK_WLIBS = @GDK_WLIBS@ 1699 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1700 GLIB_CFLAGS = @GLIB_CFLAGS@ 1701 Index: gtk+-2.12.11/modules/printbackends/test/Makefile.in 1702 =================================================================== 1703 --- gtk+-2.12.11.orig/modules/printbackends/test/Makefile.in 2008-07-19 12:11:05.033823433 +0200 1704 +++ gtk+-2.12.11/modules/printbackends/test/Makefile.in 2008-07-19 12:23:59.721820161 +0200 1705 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1706 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1707 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1708 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1709 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1710 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1711 EXEEXT = @EXEEXT@ 1712 F77 = @F77@ 1713 FFLAGS = @FFLAGS@ 1714 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1715 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1716 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1717 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1718 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1719 GDK_WLIBS = @GDK_WLIBS@ 1720 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1721 GLIB_CFLAGS = @GLIB_CFLAGS@ 1722 Index: gtk+-2.12.11/perf/Makefile.in 1723 =================================================================== 1724 --- gtk+-2.12.11.orig/perf/Makefile.in 2008-07-19 12:11:05.001825651 +0200 1725 +++ gtk+-2.12.11/perf/Makefile.in 2008-07-19 12:23:59.721820161 +0200 1726 @@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1727 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1728 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1729 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1730 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1731 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1732 EXEEXT = @EXEEXT@ 1733 F77 = @F77@ 1734 FFLAGS = @FFLAGS@ 1735 @@ -113,6 +115,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1736 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1737 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1738 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1739 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1740 GDK_WLIBS = @GDK_WLIBS@ 1741 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1742 GLIB_CFLAGS = @GLIB_CFLAGS@ 1743 Index: gtk+-2.12.11/tests/Makefile.in 1744 =================================================================== 1745 --- gtk+-2.12.11.orig/tests/Makefile.in 2008-07-19 12:11:04.977822181 +0200 1746 +++ gtk+-2.12.11/tests/Makefile.in 2008-07-19 12:23:59.721820161 +0200 1747 @@ -93,6 +93,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F 1748 ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ 1749 ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ 1750 ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ 1751 +ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ 1752 +ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ 1753 EXEEXT = @EXEEXT@ 1754 F77 = @F77@ 1755 FFLAGS = @FFLAGS@ 1756 @@ -116,6 +118,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X 1757 GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ 1758 GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ 1759 GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ 1760 +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ 1761 GDK_WLIBS = @GDK_WLIBS@ 1762 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ 1763 GLIB_CFLAGS = @GLIB_CFLAGS@ -
pkg/viola/main/gtk+2.0/trunk/debian/patches/series
r4096 r4111 14 14 022_module-files-append-compat-module-files-d.patch 15 15 030_gtkentry_password-char-circle.patch 16 031_directfb_dead-keys.patch 16 17 033_treeview_resizing.patch 17 18 041_ia32-libs.patch
Note: See TracChangeset
for help on using the changeset viewer.


