--- gtk+2.0-2.12.1.orig/debian/patches/000_gtk+-2.0.6-exportsymbols.patch +++ gtk+2.0-2.12.1/debian/patches/000_gtk+-2.0.6-exportsymbols.patch @@ -0,0 +1,14 @@ +Index: gtk+2.0-2.10.10/configure.in +=================================================================== +--- gtk+2.0-2.10.10.orig/configure.in 2007-03-12 15:07:22.000000000 +0100 ++++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:00.000000000 +0100 +@@ -351,7 +351,8 @@ + if test "$os_win32" != yes; then + # libtool option to control which symbols are exported + # right now, symbols starting with _ are not exported +- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' ++ # Disabled until -export-symbols-regex works (RH patch) ++ LIBTOOL_EXPORT_OPTIONS= + else + # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) + LIBTOOL_EXPORT_OPTIONS= --- gtk+2.0-2.12.1.orig/debian/patches/060_ignore-random-icons.patch +++ gtk+2.0-2.12.1/debian/patches/060_ignore-random-icons.patch @@ -0,0 +1,11 @@ +--- gtk+2.0-2.12.1.orig/gtk/updateiconcache.c 2007-10-21 22:04:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gtk/updateiconcache.c 2007-10-21 22:04:23.000000000 +0200 +@@ -654,7 +654,7 @@ + directories = g_list_append (directories, g_strdup (subdir)); + } + else +- dir_index = 0xffff; ++ continue; + } + + image = g_new0 (Image, 1); --- gtk+2.0-2.12.1.orig/debian/patches/031_gtksearchenginetracker_fixes.patch +++ gtk+2.0-2.12.1/debian/patches/031_gtksearchenginetracker_fixes.patch @@ -0,0 +1,47 @@ +Index: gtk+-2.12.1/gtk/gtksearchenginetracker.c +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtksearchenginetracker.c 2007-10-16 15:20:38.000000000 +0200 ++++ gtk+-2.12.1/gtk/gtksearchenginetracker.c 2007-10-31 19:38:20.770226213 +0100 +@@ -35,6 +35,7 @@ + + static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL; + static void (*tracker_disconnect) (TrackerClient *client) = NULL; ++static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL; + static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL; + + static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, +@@ -56,6 +57,7 @@ + #define MAP(a) { #a, (gpointer *)&a } + MAP (tracker_connect), + MAP (tracker_disconnect), ++ MAP (tracker_get_version), + MAP (tracker_cancel_last_call), + MAP (tracker_search_metadata_by_text_async), + MAP (tracker_search_metadata_by_text_and_location_async), +@@ -285,6 +287,7 @@ + { + GtkSearchEngineTracker *engine; + TrackerClient *tracker_client; ++ GError *err = NULL; + + open_libtracker (); + +@@ -296,6 +299,18 @@ + if (!tracker_client) + return NULL; + ++ if (!tracker_get_version) ++ return NULL; ++ ++ tracker_get_version (tracker_client, &err); ++ ++ if (err != NULL) ++ { ++ g_error_free (err); ++ tracker_disconnect (tracker_client); ++ return NULL; ++ } ++ + engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_TRACKER, NULL); + + engine->priv->client = tracker_client; --- gtk+2.0-2.12.1.orig/debian/patches/070_mandatory-relibtoolize.patch +++ gtk+2.0-2.12.1/debian/patches/070_mandatory-relibtoolize.patch @@ -0,0 +1,1756 @@ +Classical relibtoolizing patch generated with: + libtoolize --force --copy && + aclocal-1.7 -I m4macros && + autoconf && + automake-1.7 && + rm -rf autom4te.cache && +exclude config.guess and sub with diff -urN -x config.guess -x config.sub + +This is required because of patches touching autotools files, but also because +of upstream using an older libtool; see GNOME #484426; Debian #445001. + +--- gtk+2.0-2.12.1.orig/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -90,6 +90,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -124,6 +126,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -329,7 +332,10 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++# don't build perf measurement tools in static builds ++@ENABLE_STATIC_FALSE@MAYBE_PERF = perf ++ ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 +@@ -487,7 +493,8 @@ + gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ + gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \ + missing mkinstalldirs +-DIST_SUBDIRS = $(SUBDIRS) ++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ ++ perf contrib docs m4macros + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -739,7 +746,7 @@ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ +--- gtk+2.0-2.12.1.orig/aclocal.m4 2007-10-17 06:00:05.000000000 +0200 ++++ gtk+2.0-2.12.1/aclocal.m4 2007-10-18 16:36:53.000000000 +0200 +@@ -941,7 +941,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 AC_PROG_LIBTOOL ++# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -1493,7 +1493,6 @@ + esac + ;; + *64-bit*) +- libsuff=64 + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -2552,13 +2551,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -2570,6 +2567,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -3344,7 +3353,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -4378,7 +4387,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -6059,7 +6068,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6434,6 +6443,9 @@ + cygwin* | mingw*) + _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' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -6639,12 +6651,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -7076,7 +7089,7 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -8498,46 +8511,32 @@ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory +- AC_ARG_WITH(html-dir, +- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ AC_ARG_WITH([html-dir], ++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" +- AC_SUBST(HTML_DIR) ++ AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building +- AC_ARG_ENABLE(gtk-doc, +- AC_HELP_STRING([--enable-gtk-doc], +- [use gtk-doc to build documentation [default=no]]),, +- enable_gtk_doc=no) ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) + +- have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- fi +- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then +- have_gtk_doc=yes +- fi +- +- dnl do we want to do a version check? +-ifelse([$1],[],, +- [gtk_doc_min_version=$1 +- if test "$have_gtk_doc" = yes; then +- AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) +- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- have_gtk_doc=no +- fi +- fi +-]) +- if test "$have_gtk_doc" != yes; then +- enable_gtk_doc=no +- fi ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + +- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) ++ ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + ]) + +--- gtk+2.0-2.12.1.orig/configure 2007-10-17 06:00:15.000000000 +0200 ++++ gtk+2.0-2.12.1/configure 2007-10-18 16:36:53.000000000 +0200 +@@ -863,6 +863,8 @@ + CCDEPMODE + am__fastdepCC_TRUE + am__fastdepCC_FALSE ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + CXX + CXXFLAGS + ac_ct_CXX +@@ -1047,6 +1049,7 @@ + TEST_PRINT_BACKEND_TRUE + TEST_PRINT_BACKEND_FALSE + HTML_DIR ++GTKDOC_CHECK + ENABLE_GTK_DOC_TRUE + ENABLE_GTK_DOC_FALSE + GTK_DOC_USE_LIBTOOL_TRUE +@@ -1689,7 +1692,7 @@ + --disable-modules disable dynamic module loading + --enable-test-print-backend + build test print backend +- --enable-gtk-doc use gtk-doc to build documentation default=no ++ --enable-gtk-doc use gtk-doc to build documentation [default=no] + --enable-man regenerate man pages from Docbook [default=no] + + Optional Packages: +@@ -3871,6 +3874,16 @@ + + + ++ ++if test "$enable_static" = yes; then ++ ENABLE_STATIC_TRUE= ++ ENABLE_STATIC_FALSE='#' ++else ++ ENABLE_STATIC_TRUE='#' ++ ENABLE_STATIC_FALSE= ++fi ++ ++ + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -5097,7 +5110,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5218,7 +5231,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5221 "configure"' > conftest.$ac_ext ++ echo '#line 5234 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5283,7 +5296,6 @@ + esac + ;; + *64-bit*) +- libsuff=64 + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -7778,11 +7790,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7781: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7793: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7785: \$? = $ac_status" >&5 ++ echo "$as_me:7797: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8068,11 +8080,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8071: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8083: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8075: \$? = $ac_status" >&5 ++ echo "$as_me:8087: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8172,11 +8184,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8175: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8187: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8179: \$? = $ac_status" >&5 ++ echo "$as_me:8191: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8436,12 +8448,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8985,7 +8998,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9680,13 +9693,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -9698,6 +9709,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -10523,7 +10546,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -12934,7 +12957,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -13043,11 +13066,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13046: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13069: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13050: \$? = $ac_status" >&5 ++ echo "$as_me:13073: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13147,11 +13170,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13150: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13173: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13154: \$? = $ac_status" >&5 ++ echo "$as_me:13177: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13219,6 +13242,9 @@ + cygwin* | mingw*) + 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' + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -13648,13 +13674,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -13666,6 +13690,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -14711,11 +14747,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14714: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14750: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14718: \$? = $ac_status" >&5 ++ echo "$as_me:14754: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14815,11 +14851,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14818: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14854: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14822: \$? = $ac_status" >&5 ++ echo "$as_me:14858: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -15079,12 +15115,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -15608,7 +15645,7 @@ + link_all_deplibs_F77=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -16251,13 +16288,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -16269,6 +16304,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -17004,11 +17051,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17007: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17054: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17011: \$? = $ac_status" >&5 ++ echo "$as_me:17058: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17294,11 +17341,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17297: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17344: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17301: \$? = $ac_status" >&5 ++ echo "$as_me:17348: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17398,11 +17445,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17401: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17448: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17405: \$? = $ac_status" >&5 ++ echo "$as_me:17452: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17662,12 +17709,13 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi ++ link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -18211,7 +18259,7 @@ + link_all_deplibs_GCJ=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -18854,13 +18902,11 @@ + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -18872,6 +18918,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -32440,8 +32498,18 @@ + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then + { echo "$as_me:$LINENO: result: found" >&5 + echo "${ECHO_T}found" >&6; } +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else + { { echo "$as_me:$LINENO: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +@@ -32577,7 +32645,7 @@ + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" + +-GDK_PACKAGES="$PANGO_PACKAGES" ++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES" + if test "x$gdktarget" = "xx11"; then + GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + fi +@@ -33456,19 +33524,38 @@ + fi + + +- have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ fi ++ ++ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++echo "${ECHO_T}$enable_gtk_doc" >&6; } ++ ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $PKG_CONFIG in ++ case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -33478,7 +33565,7 @@ + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -33486,43 +33573,22 @@ + done + IFS=$as_save_IFS + +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++echo "${ECHO_T}$GTKDOC_CHECK" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- fi +- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then +- have_gtk_doc=yes +- fi +- +- gtk_doc_min_version=1.6 +- if test "$have_gtk_doc" = yes; then +- { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 +-echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } +- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- have_gtk_doc=no +- fi +- fi ++ test -n "$GTKDOC_CHECK" && break ++done + +- if test "$have_gtk_doc" != yes; then +- enable_gtk_doc=no +- fi +- fi + + + +@@ -33892,6 +33958,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -34962,9 +35035,9 @@ + CCDEPMODE!$CCDEPMODE$ac_delim + am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim + am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim ++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim + CXX!$CXX$ac_delim +-CXXFLAGS!$CXXFLAGS$ac_delim +-ac_ct_CXX!$ac_ct_CXX$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -35006,6 +35079,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++CXXFLAGS!$CXXFLAGS$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim + CXXDEPMODE!$CXXDEPMODE$ac_delim + am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim + am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +@@ -35101,8 +35176,6 @@ + INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim + INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim + INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim +-INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim +-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -35144,6 +35217,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim ++INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim + INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim + INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim + INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim +@@ -35228,6 +35303,7 @@ + TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim + TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim + HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim + ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim + ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim + GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim +@@ -35238,9 +35314,6 @@ + XSLTPROC!$XSLTPROC$ac_delim + XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim + XMLCATALOG!$XMLCATALOG$ac_delim +-ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim +-ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim +-LIBOBJS!$LIBOBJS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -35282,10 +35355,13 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim ++ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +--- gtk+2.0-2.12.1.orig/contrib/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/contrib/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -90,6 +90,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -124,6 +126,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/contrib/gdk-pixbuf-xlib/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/demos/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/demos/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -90,6 +90,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -124,6 +126,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/demos/gtk-demo/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/demos/gtk-demo/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/faq/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/faq/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/reference/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/reference/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/reference/gdk/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/reference/gdk/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -129,6 +131,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/reference/gdk-pixbuf/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -129,6 +131,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/reference/gtk/Makefile.in 2007-10-17 06:00:10.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/reference/gtk/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -95,6 +95,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -129,6 +131,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/tools/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/tools/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/docs/tutorial/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/docs/tutorial/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/directfb/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/directfb/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/quartz/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/quartz/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/win32/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/win32/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/win32/rc/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/win32/rc/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk/x11/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk/x11/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -91,6 +91,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -125,6 +127,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk-pixbuf/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk-pixbuf/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gdk-pixbuf/pixops/Makefile.in 2007-10-17 06:00:11.000000000 +0200 ++++ gtk+2.0-2.12.1/gdk-pixbuf/pixops/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gtk/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/gtk/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -113,6 +113,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -147,6 +149,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -378,6 +381,8 @@ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ ++ -DMAEMO_CHANGES \ ++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ +@@ -633,13 +638,16 @@ + # that are not included in gtk/gtk.h + gtk_semi_private_h_sources = \ + gtktextlayout.h \ +- gtkfilesystem.h ++ gtkfilesystem.h \ ++ gtkfilesystemmodel.h \ ++ gtkfilechooserprivate.h \ ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h + + + # GTK+ header files that don't get installed + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginebeagle.h \ + gtksearchenginetracker.h\ + gtksearchenginesimple.h \ +@@ -649,10 +657,7 @@ + gtkfilechooserdefault.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ + gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystemmodel.h \ + gtkfilesystemunix.h \ + gtkhsv.h \ + gtkiconcache.h \ +--- gtk+2.0-2.12.1.orig/gtk/theme-bits/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/gtk/theme-bits/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/gtk/xdgmime/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/gtk/xdgmime/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/ltmain.sh 2007-08-29 13:52:51.000000000 +0200 ++++ gtk+2.0-2.12.1/ltmain.sh 2007-10-18 16:36:53.000000000 +0200 +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.24 ++VERSION="1.5.24 Debian 1.5.24-1" + TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +@@ -2122,7 +2122,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$pass" = dlopen; then +@@ -3244,6 +3247,11 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ $echo "$modename: unknown library version type \`$version_type'" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac + ;; + no) +--- gtk+2.0-2.12.1.orig/m4macros/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/m4macros/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/engines/Makefile.in 2007-10-17 06:00:12.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/engines/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/engines/ms-windows/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/engines/ms-windows/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/engines/ms-windows/Theme/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/engines/pixbuf/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/engines/pixbuf/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/input/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/input/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +@@ -430,9 +433,10 @@ + + imconffiledir = $(sysconfdir)/gtk-2.0 + dist_imconffile_DATA = im-multipress.conf ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" + + @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false +-@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false + + module_LTLIBRARIES = \ + $(IM_XIM_MODULE) \ +@@ -985,7 +989,18 @@ + rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules + + gtk.immodules: Makefile.am $(module_LTLIBRARIES) +- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ ++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ ++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ ++ else \ ++ echo "***" ; \ ++ echo "*** Warning: gtk.immodules not built" ; \ ++ echo "***" ; \ ++ echo "*** Generate this file manually on host" ; \ ++ echo "*** system using gtk-query-immodules-2.0" ; \ ++ echo "***" ; \ ++ touch gtk.immodules; \ ++ fi + + @CROSS_COMPILING_FALSE@all-local: gtk.immodules + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- gtk+2.0-2.12.1.orig/modules/printbackends/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/printbackends/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -91,6 +91,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -125,6 +127,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/printbackends/cups/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/printbackends/cups/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/printbackends/file/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/printbackends/file/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/printbackends/lpr/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/printbackends/lpr/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/modules/printbackends/test/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/modules/printbackends/test/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/perf/Makefile.in 2007-10-17 06:00:13.000000000 +0200 ++++ gtk+2.0-2.12.1/perf/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -89,6 +89,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -123,6 +125,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +--- gtk+2.0-2.12.1.orig/tests/Makefile.in 2007-10-17 06:00:14.000000000 +0200 ++++ gtk+2.0-2.12.1/tests/Makefile.in 2007-10-18 16:36:53.000000000 +0200 +@@ -92,6 +92,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +128,7 @@ + GMSGFMT = @GMSGFMT@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTK_API_VERSION = @GTK_API_VERSION@ + GTK_BINARY_AGE = @GTK_BINARY_AGE@ + GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ --- gtk+2.0-2.12.1.orig/debian/patches/001_static-linking-dont-query-immodules.patch +++ gtk+2.0-2.12.1/debian/patches/001_static-linking-dont-query-immodules.patch @@ -0,0 +1,49 @@ +Index: gtk+2.0-2.11.5/configure.in +=================================================================== +--- gtk+2.0-2.11.5.orig/configure.in 2007-07-02 17:04:27.000000000 +0200 ++++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:03.000000000 +0200 +@@ -134,6 +134,7 @@ + dnl Initialize libtool + AC_PROG_CC + AM_DISABLE_STATIC ++AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) + + dnl + dnl Check for a working C++ compiler, but do not bail out, if none is found. +Index: gtk+2.0-2.11.5/modules/input/Makefile.am +=================================================================== +--- gtk+2.0-2.11.5.orig/modules/input/Makefile.am 2007-07-02 17:04:10.000000000 +0200 ++++ gtk+2.0-2.11.5/modules/input/Makefile.am 2007-07-03 11:34:03.000000000 +0200 +@@ -106,8 +106,12 @@ + if CROSS_COMPILING + RUN_QUERY_IMMODULES_TEST=false + else ++if ENABLE_STATIC ++RUN_QUERY_IMMODULES_TEST=false ++else + RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)" + endif ++endif + + # Running this if cross compiling or if DESTDIR is set is going to + # not work at all, so skip it. +@@ -148,7 +152,18 @@ + $(IM_IME_MODULE) + + gtk.immodules: Makefile.am $(module_LTLIBRARIES) +- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules ++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \ ++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \ ++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \ ++ else \ ++ echo "***" ; \ ++ echo "*** Warning: gtk.immodules not built" ; \ ++ echo "***" ; \ ++ echo "*** Generate this file manually on host" ; \ ++ echo "*** system using gtk-query-immodules-2.0" ; \ ++ echo "***" ; \ ++ touch gtk.immodules; \ ++ fi + + CLEANFILES = gtk.immodules + --- gtk+2.0-2.12.1.orig/debian/patches/034_gtkcupsutils_type_fix.patch +++ gtk+2.0-2.12.1/debian/patches/034_gtkcupsutils_type_fix.patch @@ -0,0 +1,11 @@ +--- gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c.orig 2007-09-13 22:35:49.000000000 +0200 ++++ gtk+2.0-2.12.0/modules/printbackends/cups/gtkcupsutils.c 2007-10-19 12:46:28.000000000 +0200 +@@ -622,7 +622,7 @@ _post_send (GtkCupsRequest *request) + if (request->data_io != NULL) + { + fstat (g_io_channel_unix_get_fd (request->data_io), &data_info); +- sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request) + data_info.st_size); ++ sprintf (length, "%lu", (unsigned long) (ippLength (request->ipp_request) + data_info.st_size)); + } + else + sprintf (length, "%lu", (unsigned long) ippLength (request->ipp_request)); --- gtk+2.0-2.12.1.orig/debian/patches/002_static-linking-dont-build-perf.patch +++ gtk+2.0-2.12.1/debian/patches/002_static-linking-dont-build-perf.patch @@ -0,0 +1,17 @@ +Index: gtk+2.0-2.10.10/Makefile.am +=================================================================== +--- gtk+2.0-2.10.10.orig/Makefile.am 2007-03-12 15:12:11.000000000 +0100 ++++ gtk+2.0-2.10.10/Makefile.am 2007-03-13 14:10:07.000000000 +0100 +@@ -1,6 +1,11 @@ + ## Makefile.am for GTK+ + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib ++# don't build perf measurement tools in static builds ++if !ENABLE_STATIC ++MAYBE_PERF = perf ++endif ++ ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib + SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros + + # require automake 1.4 --- gtk+2.0-2.12.1.orig/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch +++ gtk+2.0-2.12.1/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch @@ -0,0 +1,14 @@ +Debian #381081; GNOME #447118 + +Index: gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c +=================================================================== +--- gtk+2.0-2.10.10.orig/gdk/directfb/gdkdrawable-directfb.c 2007-03-12 15:06:54.000000000 +0100 ++++ gtk+2.0-2.10.10/gdk/directfb/gdkdrawable-directfb.c 2007-03-13 14:10:23.000000000 +0100 +@@ -45,6 +45,7 @@ + #include "gdkregion-generic.h" + #include "gdkalias.h" + ++#include + #include "cairo-directfb.h" + + #define WARN_UNIMPLEMENTED(func)\ --- gtk+2.0-2.12.1.orig/debian/patches/033_treeview_resizing.patch +++ gtk+2.0-2.12.1/debian/patches/033_treeview_resizing.patch @@ -0,0 +1,234 @@ +Index: gtk+-2.12.1/gtk/gtktreeview.c +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtktreeview.c 2007-11-01 12:04:42.371958388 +0100 ++++ gtk+-2.12.1/gtk/gtktreeview.c 2007-11-01 13:42:24.766037188 +0100 +@@ -2159,18 +2159,20 @@ gtk_tree_view_get_real_requested_width_f + + /* GtkWidget::size_allocate helper */ + static void +-gtk_tree_view_size_allocate_columns (GtkWidget *widget) ++gtk_tree_view_size_allocate_columns (GtkWidget *widget, ++ gboolean *width_changed) + { + GtkTreeView *tree_view; + GList *list, *first_column, *last_column; + GtkTreeViewColumn *column; + GtkAllocation allocation; + gint width = 0; +- gint extra, extra_per_column; ++ gint extra, extra_per_column, extra_for_last; + gint full_requested_width = 0; + gint number_of_expand_columns = 0; + gboolean column_changed = FALSE; + gboolean rtl; ++ gboolean update_expand; + + tree_view = GTK_TREE_VIEW (widget); + +@@ -2205,12 +2207,38 @@ gtk_tree_view_size_allocate_columns (Gtk + number_of_expand_columns++; + } + +- extra = MAX (widget->allocation.width - full_requested_width, 0); ++ /* Only update the expand value if the width of the widget changed, ++ * the number of expand columns are if there are no expand ++ * columns. ++ */ ++ update_expand = *width_changed || ++ number_of_expand_columns != tree_view->priv->last_number_of_expand_columns || ++ number_of_expand_columns == 0; ++ ++ if (!update_expand) ++ { ++ extra = tree_view->priv->last_extra_space; ++ extra_for_last = MAX (widget->allocation.width - full_requested_width - extra, 0); ++ } ++ else ++ { ++ extra = MAX (widget->allocation.width - full_requested_width, 0); ++ extra_for_last = 0; ++ ++ tree_view->priv->last_extra_space = extra; ++ } ++ + if (number_of_expand_columns > 0) + extra_per_column = extra/number_of_expand_columns; + else + extra_per_column = 0; + ++ if (update_expand) ++ { ++ tree_view->priv->last_extra_space_per_column = extra_per_column; ++ tree_view->priv->last_number_of_expand_columns = number_of_expand_columns; ++ } ++ + for (list = (rtl ? last_column : first_column); + list != (rtl ? first_column->prev : last_column->next); + list = (rtl ? list->prev : list->next)) +@@ -2266,6 +2294,12 @@ gtk_tree_view_size_allocate_columns (Gtk + column->width += extra; + } + ++ /* In addition to expand, the last column can get even more ++ * extra space so all available space is filled up. ++ */ ++ if (extra_for_last > 0 && list == last_column) ++ column->width += extra_for_last; ++ + g_object_notify (G_OBJECT (column), "width"); + + allocation.width = column->width; +@@ -2283,6 +2317,14 @@ gtk_tree_view_size_allocate_columns (Gtk + TREE_VIEW_DRAG_WIDTH, allocation.height); + } + ++ /* We change the width here. The user has been dragging columns, ++ * and we do need more width than allocated to properly display. ++ * The scrolled window should handle this, if the application ++ * doesn't have one, the tree view can't fit. ++ */ ++ tree_view->priv->width = width; ++ *width_changed = TRUE; ++ + if (column_changed) + gtk_widget_queue_draw (GTK_WIDGET (tree_view)); + } +@@ -2299,13 +2341,13 @@ gtk_tree_view_size_allocate (GtkWidget + + g_return_if_fail (GTK_IS_TREE_VIEW (widget)); + +- if (allocation->width != widget->allocation.width) +- width_changed = TRUE; +- + widget->allocation = *allocation; + + tree_view = GTK_TREE_VIEW (widget); + ++ if (allocation->width != old_width || tree_view->priv->width != tree_view->priv->prev_width) ++ width_changed = TRUE; ++ + tmp_list = tree_view->priv->children; + + while (tmp_list) +@@ -2323,6 +2365,7 @@ gtk_tree_view_size_allocate (GtkWidget + gtk_widget_size_allocate (child->widget, &allocation); + } + ++ gtk_tree_view_size_allocate_columns (widget, &width_changed); + + tree_view->priv->hadjustment->page_size = allocation->width; + tree_view->priv->hadjustment->page_increment = allocation->width * 0.9; +@@ -2331,28 +2374,30 @@ gtk_tree_view_size_allocate (GtkWidget + tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width); + + if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL) +- { ++ { + if (allocation->width < tree_view->priv->width) +- { +- if (tree_view->priv->init_hadjust_value) +- { +- tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); +- tree_view->priv->init_hadjust_value = FALSE; +- } +- else if(allocation->width != old_width) +- tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width); +- else +- tree_view->priv->hadjustment->value = CLAMP(tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width); +- } +- else +- { +- tree_view->priv->hadjustment->value = 0; +- tree_view->priv->init_hadjust_value = TRUE; +- } +- } ++ { ++ if (tree_view->priv->init_hadjust_value) ++ { ++ tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); ++ tree_view->priv->init_hadjust_value = FALSE; ++ } ++ else if (allocation->width != old_width) ++ { ++ tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->hadjustment->value - allocation->width + old_width, 0, tree_view->priv->width - allocation->width); ++ } ++ else ++ tree_view->priv->hadjustment->value = CLAMP (tree_view->priv->width - (tree_view->priv->prev_width - tree_view->priv->hadjustment->value), 0, tree_view->priv->width - allocation->width); ++ } ++ else ++ { ++ tree_view->priv->hadjustment->value = 0; ++ tree_view->priv->init_hadjust_value = TRUE; ++ } ++ } + else +- if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width) +- tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); ++ if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width) ++ tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); + + gtk_adjustment_changed (tree_view->priv->hadjustment); + +@@ -2392,8 +2437,6 @@ gtk_tree_view_size_allocate (GtkWidget + allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view)); + } + +- gtk_tree_view_size_allocate_columns (widget); +- + if (tree_view->priv->tree == NULL) + invalidate_empty_focus (tree_view); + +@@ -2837,7 +2880,7 @@ gtk_tree_view_button_press (GtkWidget + + gtk_grab_add (widget); + GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE); +- column->resized_width = column->width; ++ column->resized_width = column->width - tree_view->priv->last_extra_space_per_column; + + /* block attached dnd signal handler */ + drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data"); +@@ -3546,6 +3589,8 @@ gtk_tree_view_motion_resize_column (GtkW + { + column->use_resized_width = TRUE; + column->resized_width = new_width; ++ if (column->expand) ++ column->resized_width -= tree_view->priv->last_extra_space_per_column; + gtk_widget_queue_resize (widget); + } + +@@ -11479,7 +11524,7 @@ gtk_tree_view_move_column_after (GtkTree + if (GTK_WIDGET_REALIZED (tree_view)) + { + gtk_widget_queue_resize (GTK_WIDGET (tree_view)); +- gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view)); ++ gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), FALSE); + } + + g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0); +Index: gtk+-2.12.1/gtk/gtktreeviewcolumn.c +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtktreeviewcolumn.c 2007-11-01 12:04:42.319955425 +0100 ++++ gtk+-2.12.1/gtk/gtktreeviewcolumn.c 2007-11-01 12:04:45.400130954 +0100 +@@ -2142,6 +2142,7 @@ gtk_tree_view_column_set_expand (GtkTree + tree_column->tree_view != NULL && + GTK_WIDGET_REALIZED (tree_column->tree_view)) + { ++ tree_column->use_resized_width = FALSE; + gtk_widget_queue_resize (tree_column->tree_view); + } + +Index: gtk+-2.12.1/gtk/gtktreeprivate.h +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtktreeprivate.h 2007-11-01 12:04:42.303954513 +0100 ++++ gtk+-2.12.1/gtk/gtktreeprivate.h 2007-11-01 13:41:34.211156229 +0100 +@@ -266,6 +266,10 @@ struct _GtkTreeViewPrivate + GdkGC *tree_line_gc; + + gint tooltip_column; ++ ++ gint last_extra_space; ++ gint last_extra_space_per_column; ++ gint last_number_of_expand_columns; + }; + + #ifdef __GNUC__ --- gtk+2.0-2.12.1.orig/debian/patches/071_fix_gdk_window_null_crasher.patch +++ gtk+2.0-2.12.1/debian/patches/071_fix_gdk_window_null_crasher.patch @@ -0,0 +1,68 @@ +--- gdk/gdkwindow.c.orig 2007-10-02 11:22:11.000000000 +0200 ++++ gtk+2.0-2.12.0/gdk/gdkwindow.c 2007-10-02 11:22:20.000000000 +0200 +@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window + GdkWindow* + gdk_window_get_toplevel (GdkWindow *window) + { + GdkWindowObject *obj; + + g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); + + obj = (GdkWindowObject *)window; +- while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) ++ while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) { + obj = (GdkWindowObject *)obj->parent; ++ } ++ ++ g_return_val_if_fail (obj != NULL, NULL); + + return GDK_WINDOW (obj); + } + + /** + * gdk_window_get_children: + * @window: a #GdkWindow + * +@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data) + return FALSE; + } + + static gboolean + gdk_window_is_toplevel_frozen (GdkWindow *window) + { + GdkWindowObject *toplevel; + ++ g_return_val_if_fail (window != NULL, FALSE); ++ + toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window); + +- return toplevel->update_and_descendants_freeze_count > 0; ++ return toplevel ? toplevel->update_and_descendants_freeze_count > 0 : FALSE; + } + + static void + gdk_window_schedule_update (GdkWindow *window) + { + if (window && + (GDK_WINDOW_OBJECT (window)->update_freeze_count || + gdk_window_is_toplevel_frozen (window))) +@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void) + + update_windows = NULL; + update_idle = 0; + + g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL); + + while (tmp_list) + { ++ if(!tmp_list->data) ++ continue; ++ + GdkWindowObject *private = (GdkWindowObject *)tmp_list->data; + + if (private->update_freeze_count || + gdk_window_is_toplevel_frozen (tmp_list->data)) + update_windows = g_slist_prepend (update_windows, private); + else + gdk_window_process_updates_internal (tmp_list->data); + --- gtk+2.0-2.12.1.orig/debian/patches/015_default-fallback-icon-theme.patch +++ gtk+2.0-2.12.1/debian/patches/015_default-fallback-icon-theme.patch @@ -0,0 +1,11 @@ +--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200 +@@ -290,7 +290,7 @@ + g_param_spec_string ("gtk-fallback-icon-theme", + P_("Fallback Icon Theme Name"), + P_("Name of a icon theme to fall back to"), +- NULL, ++ "gnome", + GTK_PARAM_READWRITE), + NULL); + g_assert (result == PROP_FALLBACK_ICON_THEME); --- gtk+2.0-2.12.1.orig/debian/patches/006_proper-directfb-modules.patch +++ gtk+2.0-2.12.1/debian/patches/006_proper-directfb-modules.patch @@ -0,0 +1,34 @@ +GNOME #447118; related to Debian #381081 + +--- gtk+2.0-2.11.6.orig/configure.in 2007-07-23 21:59:10.000000000 +0200 ++++ gtk+2.0-2.11.6/configure.in 2007-07-23 21:59:13.000000000 +0200 +@@ -1404,8 +1404,18 @@ + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then + AC_MSG_RESULT(found) +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" ++ # prepend cairo-directfb so that cairo-directfb's CFLAGS appear before ++ # cairo's if both are available (cairo is required by pango); this is ++ # enough to build gdk/ ++ GDK_PACKAGES="cairo-directfb directfb $GDK_PACKAGES" ++ # you'd think this isn't needed, but as soon as cairo-directfb or ++ # directfb requires a "rpath" and you want to build binaries (for ++ # example gtk-query-immodules), you need the CFLAGS and LDFLAGS ++ # everywhere; this trick abuses the fact that GTK_DEP_LIBS and ++ # GTK_DEP_CFLAGS include the GDK_EXTRA_LIBS and _FLAGS to pull the ++ # necessary rpath flags ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb directfb`" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb directfb` $GDK_EXTRA_LIBS" + else + AC_MSG_ERROR([ + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +@@ -1457,7 +1467,7 @@ + CFLAGS="$saved_cflags" + LDFLAGS="$saved_ldflags" + +-GDK_PACKAGES="$PANGO_PACKAGES" ++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES" + if test "x$gdktarget" = "xx11"; then + GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + fi --- gtk+2.0-2.12.1.orig/debian/patches/021_loader-files-d.patch +++ gtk+2.0-2.12.1/debian/patches/021_loader-files-d.patch @@ -0,0 +1,323 @@ +Index: gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c +=================================================================== +--- gtk+-2.12.1.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:35:24.378152677 +0100 ++++ gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:38:15.659913468 +0100 +@@ -45,6 +45,9 @@ + #undef STRICT + #endif + ++#define LOADERFILEEXT ".loaders" ++#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT)) ++ + static gint + format_check (GdkPixbufModule *module, guchar *buffer, int size) + { +@@ -284,87 +287,95 @@ gdk_pixbuf_get_module_file (void) + + #endif /* USE_GMODULE */ + +-static void +-gdk_pixbuf_io_init (void) ++/* FIXME this is a static copy of a public pango function which should really ++ * livein glib */ ++static char * ++_ugly_copy_of_pango_trim_string (const char *str) ++{ ++ int len; ++ ++ g_return_val_if_fail (str != NULL, NULL); ++ ++ while (*str && g_ascii_isspace (*str)) ++ str++; ++ ++ len = strlen (str); ++ while (len > 0 && g_ascii_isspace (str[len-1])) ++ len--; ++ ++ return g_strndup (str, len); ++} ++ ++/* FIXME this is a static copy of a public pango function which should really ++ * livein glib */ ++char ** ++_ugly_copy_of_pango_split_file_list (const char *str) + { ++ int i = 0; ++ int j; ++ char **files; ++ ++ files = g_strsplit (str, G_SEARCHPATH_SEPARATOR_S, -1); ++ ++ while (files[i]) ++ { ++ char *file = _ugly_copy_of_pango_trim_string (files[i]); ++ ++ /* If the resulting file is empty, skip it */ ++ if (file[0] == '\0') ++ { ++ g_free(file); ++ g_free (files[i]); ++ ++ for (j = i + 1; files[j]; j++) ++ files[j - 1] = files[j]; ++ ++ files[j - 1] = NULL; ++ ++ continue; ++ } ++#ifndef G_OS_WIN32 ++ /* '~' is a quite normal and common character in file names on ++ * Windows, especially in the 8.3 versions of long file names, which ++ * still occur now and then. Also, few Windows user are aware of the ++ * Unix shell convention that '~' stands for the home directory, ++ * even if they happen to have a home directory. ++ */ ++ if (file[0] == '~' && file[1] == G_DIR_SEPARATOR) ++ { ++ char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL); ++ g_free (file); ++ file = tmp; ++ } ++ else if (file[0] == '~' && file[1] == '\0') ++ { ++ g_free (file); ++ file = g_strdup (g_get_home_dir()); ++ } ++#endif ++ g_free (files[i]); ++ files[i] = file; ++ ++ i++; ++ } ++ ++ return files; ++} ++ + #ifdef USE_GMODULE +- GIOChannel *channel; ++ ++static void ++process_module_file (const gchar *filename, GIOChannel *channel) ++{ + gchar *line_buf; + gsize term; + GString *tmp_buf = g_string_new (NULL); + gboolean have_error = FALSE; + GdkPixbufModule *module = NULL; +- gchar *filename = gdk_pixbuf_get_module_file (); + int flags; + int n_patterns = 0; + GdkPixbufModulePattern *pattern; +- GError *error = NULL; +-#endif +- GdkPixbufModule *builtin_module = NULL; +- +-#define load_one_builtin_module(format) \ +- builtin_module = g_new0 (GdkPixbufModule, 1); \ +- builtin_module->module_name = #format; \ +- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ +- file_formats = g_slist_prepend (file_formats, builtin_module);\ +- else \ +- g_free (builtin_module) + +-#ifdef INCLUDE_ani +- load_one_builtin_module (ani); +-#endif +-#ifdef INCLUDE_png +- load_one_builtin_module (png); +-#endif +-#ifdef INCLUDE_bmp +- load_one_builtin_module (bmp); +-#endif +-#ifdef INCLUDE_wbmp +- load_one_builtin_module (wbmp); +-#endif +-#ifdef INCLUDE_gif +- load_one_builtin_module (gif); +-#endif +-#ifdef INCLUDE_ico +- load_one_builtin_module (ico); +-#endif +-#ifdef INCLUDE_jpeg +- load_one_builtin_module (jpeg); +-#endif +-#ifdef INCLUDE_pnm +- load_one_builtin_module (pnm); +-#endif +-#ifdef INCLUDE_ras +- load_one_builtin_module (ras); +-#endif +-#ifdef INCLUDE_tiff +- load_one_builtin_module (tiff); +-#endif +-#ifdef INCLUDE_xpm +- load_one_builtin_module (xpm); +-#endif +-#ifdef INCLUDE_xbm +- load_one_builtin_module (xbm); +-#endif +-#ifdef INCLUDE_tga +- load_one_builtin_module (tga); +-#endif +-#ifdef INCLUDE_pcx +- load_one_builtin_module (pcx); +-#endif +- +-#undef load_one_builtin_module +- +-#ifdef USE_GMODULE +- channel = g_io_channel_new_file (filename, "r", &error); +- if (!channel) { +- /* Don't bother warning if we have some built-in loaders */ +- if (file_formats == NULL) +- g_warning ("Cannot open pixbuf loader module file '%s': %s", +- filename, error->message); +- return; +- } +- + while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { + const char *p; + +@@ -497,8 +508,140 @@ gdk_pixbuf_io_init (void) + g_free (line_buf); + } + g_string_free (tmp_buf, TRUE); +- g_io_channel_unref (channel); +- g_free (filename); ++} ++ ++#endif /* USE_GMODULE */ ++ ++static void ++gdk_pixbuf_io_init (void) ++{ ++#ifdef USE_GMODULE ++ GIOChannel *channel; ++ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file (); ++ /* FIXME: using an absolute path requires patching Makefile.am */ ++ gchar *gdkpixbuf_module_files_d_str = g_build_filename (PIXBUF_LIBDIR, ++ "..", ++ "loader-files.d", ++ NULL); ++ gchar *list_str; ++ char **files; ++ GError *error = NULL; ++ int n; ++#endif ++ GdkPixbufModule *builtin_module = NULL; ++ ++#define load_one_builtin_module(format) \ ++ builtin_module = g_new0 (GdkPixbufModule, 1); \ ++ builtin_module->module_name = #format; \ ++ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ ++ file_formats = g_slist_prepend (file_formats, builtin_module);\ ++ else \ ++ g_free (builtin_module) ++ ++#ifdef INCLUDE_ani ++ load_one_builtin_module (ani); ++#endif ++#ifdef INCLUDE_png ++ load_one_builtin_module (png); ++#endif ++#ifdef INCLUDE_bmp ++ load_one_builtin_module (bmp); ++#endif ++#ifdef INCLUDE_wbmp ++ load_one_builtin_module (wbmp); ++#endif ++#ifdef INCLUDE_gif ++ load_one_builtin_module (gif); ++#endif ++#ifdef INCLUDE_ico ++ load_one_builtin_module (ico); ++#endif ++#ifdef INCLUDE_jpeg ++ load_one_builtin_module (jpeg); ++#endif ++#ifdef INCLUDE_pnm ++ load_one_builtin_module (pnm); ++#endif ++#ifdef INCLUDE_ras ++ load_one_builtin_module (ras); ++#endif ++#ifdef INCLUDE_tiff ++ load_one_builtin_module (tiff); ++#endif ++#ifdef INCLUDE_xpm ++ load_one_builtin_module (xpm); ++#endif ++#ifdef INCLUDE_xbm ++ load_one_builtin_module (xbm); ++#endif ++#ifdef INCLUDE_tga ++ load_one_builtin_module (tga); ++#endif ++#ifdef INCLUDE_pcx ++ load_one_builtin_module (pcx); ++#endif ++ ++#undef load_one_builtin_module ++ ++#ifdef USE_GMODULE ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ gdkpixbuf_module_files_d_str, ++ gdkpixbuf_module_file_str, ++ NULL); ++ ++ files = _ugly_copy_of_pango_split_file_list (list_str); ++ ++ n = 0; ++ while (files[n]) ++ n++; ++ ++ while (n-- > 0) { ++ GDir *dir = g_dir_open (files[n], 0, NULL); ++ if (dir) { ++ const char *dent; ++ ++ while ((dent = g_dir_read_name (dir))) { ++ int len = strlen (dent); ++ if (len > LOADERFILEEXT_LEN && strcmp (dent + len - LOADERFILEEXT_LEN, LOADERFILEEXT) == 0) { ++ gchar *pathname = g_build_filename (files[n], dent, NULL); ++ channel = g_io_channel_new_file (pathname, "r", &error); ++ if (!channel) { ++ /* we don't care about issuing a warning ++ * g_warning ("Cannot open pixbuf loader module file '%s': %s", ++ * pathname, ++ * error->message); ++ */ ++ g_error_free (error); ++ error = NULL; ++ } else { ++ process_module_file (pathname, channel); ++ g_io_channel_unref (channel); ++ } ++ g_free (pathname); ++ } ++ } ++ g_dir_close (dir); ++ } else { ++ channel = g_io_channel_new_file (files[n], "r", &error); ++ if (!channel) { ++ /* we don't care about issuing a warning ++ * g_warning ("Cannot open pixbuf loader module file '%s': %s", ++ * files[n], ++ * error->message); ++ */ ++ g_error_free (error); ++ error = NULL; ++ } else { ++ process_module_file (files[n], channel); ++ g_io_channel_unref (channel); ++ } ++ } ++ } ++ ++ g_strfreev (files); ++ g_free (list_str); ++ g_free (gdkpixbuf_module_files_d_str); ++ g_free (gdkpixbuf_module_file_str); + #endif + } + --- gtk+2.0-2.12.1.orig/debian/patches/041_ia32-libs.patch +++ gtk+2.0-2.12.1/debian/patches/041_ia32-libs.patch @@ -0,0 +1,99 @@ +Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200 +@@ -280,8 +280,20 @@ + gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); + + if (!result) +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); +- ++ { ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL); ++# else ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.64", NULL); ++#endif ++ /* Prefer compat gdk-pixbuf.loaders file if it's usable. */ ++ if (g_file_test(result, G_FILE_TEST_EXISTS)) ++ return result; ++ g_free (result); ++#endif ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); ++ } + return result; + } + +Index: gtk+2.0-2.11.3/gtk/gtkrc.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200 ++++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200 +@@ -450,7 +450,20 @@ + if (im_module_file) + result = g_strdup (im_module_file); + else +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ { ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL); ++# else ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.64", NULL); ++# endif ++ /* Prefer compat gtk.immodules file if it's usable. */ ++ if (g_file_test(result, G_FILE_TEST_EXISTS)) ++ return result; ++ g_free (result); ++#endif ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ } + } + + return result; +@@ -522,7 +535,21 @@ + else + { + const gchar *home; +- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL); ++# else ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL); ++# endif ++ /* Prefer compat gtkrc if it's usable. */ ++ if (!g_file_test(str, G_FILE_TEST_EXISTS)) ++ { ++ g_free (str), /* continue in next line */ ++#endif ++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ } ++#endif + + gtk_rc_add_default_file (str); + g_free (str); +@@ -530,7 +557,21 @@ + home = g_get_home_dir (); + if (home) + { +- str = g_build_filename (home, ".gtkrc-2.0", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++# if defined (__i386__) ++ str = g_build_filename (home, ".gtkrc-2.0.32", NULL); ++# else ++ str = g_build_filename (home, ".gtkrc-2.0.64", NULL); ++# endif ++ /* Prefer compat .gtkrc-2.0 if it's usable. */ ++ if (!g_file_test(str, G_FILE_TEST_EXISTS)) ++ { ++ g_free (str), /* continue in next line */ ++#endif ++ str = g_build_filename (home, ".gtkrc-2.0", NULL); ++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) ) ++ } ++#endif + gtk_rc_add_default_file (str); + g_free (str); + } --- gtk+2.0-2.12.1.orig/debian/patches/042_treeview_single-focus.patch +++ gtk+2.0-2.12.1/debian/patches/042_treeview_single-focus.patch @@ -0,0 +1,14 @@ +Index: gtk+-2.12.1/gtk/gtktreeview.c +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtktreeview.c 2007-11-01 13:42:24.766037188 +0100 ++++ gtk+-2.12.1/gtk/gtktreeview.c 2007-11-01 13:45:13.083629061 +0100 +@@ -9660,7 +9660,8 @@ gtk_tree_view_focus_to_cursor (GtkTreeVi + + if (cursor_path) + { +- if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE) ++ if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE || ++ tree_view->priv->selection->type == GTK_SELECTION_SINGLE) + gtk_tree_view_real_set_cursor (tree_view, cursor_path, FALSE, FALSE); + else + gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE); --- gtk+2.0-2.12.1.orig/debian/patches/series +++ gtk+2.0-2.12.1/debian/patches/series @@ -0,0 +1,22 @@ +001_static-linking-dont-query-immodules.patch +002_static-linking-dont-build-perf.patch +004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +005_xpmico.patch +006_proper-directfb-modules.patch +007_implicit_pointer_conversion_gdkdrawable_directfb.patch +008_implicit_pointer_conversion_gdkgc_directfb.patch +009_gtk-export-filechooser.patch +015_default-fallback-icon-theme.patch +020_immodules-files-d.patch +021_loader-files-d.patch +030_gtkentry_password-char-circle.patch +031_gtksearchenginetracker_fixes.patch +033_treeview_resizing.patch +034_gtkcupsutils_type_fix.patch +040_filechooser_single-click.patch +041_ia32-libs.patch +042_treeview_single-focus.patch +060_ignore-random-icons.patch +070_mandatory-relibtoolize.patch +071_fix_gdk_window_null_crasher.patch +091_workaround_no_gtk_init_incorrect_display.patch --- gtk+2.0-2.12.1.orig/debian/patches/040_filechooser_single-click.patch +++ gtk+2.0-2.12.1/debian/patches/040_filechooser_single-click.patch @@ -0,0 +1,149 @@ +Debian #405296; GNOME #148828; permit single click in filechooser instead of +requiring double-click. + +Index: gtk+-2.12.1/gtk/gtkfilechooserdefault.c +=================================================================== +--- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c 2007-11-04 15:14:51.503352071 +0100 ++++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c 2007-11-04 16:08:51.972015856 +0100 +@@ -390,10 +390,6 @@ static void check_preview_change (GtkFil + + static void filter_combo_changed (GtkComboBox *combo_box, + GtkFileChooserDefault *impl); +-static void shortcuts_row_activated_cb (GtkTreeView *tree_view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- GtkFileChooserDefault *impl); + + static gboolean shortcuts_key_press_event_cb (GtkWidget *widget, + GdkEventKey *event, +@@ -2002,9 +1998,7 @@ shortcuts_append_paths (GtkFileChooserDe + + profile_start ("start", NULL); + +- /* As there is no separator now, we want to start there. +- */ +- start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); ++ start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR) + 1; + num_inserted = 0; + + for (; paths; paths = paths->next) +@@ -2016,6 +2010,8 @@ shortcuts_append_paths (GtkFileChooserDe + if (impl->local_only && + !gtk_file_system_path_is_local (impl->file_system, path)) + continue; ++ if (shortcut_find_position (impl, path) != -1) ++ continue; + + label = gtk_file_system_get_bookmark_label (impl->file_system, path); + +@@ -2245,13 +2241,14 @@ shortcuts_add_bookmarks (GtkFileChooserD + impl->num_bookmarks + 1); + + impl->num_bookmarks = 0; ++ shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); + + bookmarks = gtk_file_system_list_bookmarks (impl->file_system); + shortcuts_append_paths (impl, bookmarks); + gtk_file_paths_free (bookmarks); + +- if (impl->num_bookmarks > 0) +- shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR); ++ if (impl->num_bookmarks == 0) ++ shortcuts_remove_rows (impl, shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR), 1); + + if (impl->shortcuts_pane_filter_model) + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model)); +@@ -3657,8 +3654,22 @@ static void + shortcuts_selection_changed_cb (GtkTreeSelection *selection, + GtkFileChooserDefault *impl) + { ++ GtkTreeIter iter; ++ GtkTreeIter child_iter; ++ + bookmarks_check_remove_sensitivity (impl); + shortcuts_check_popup_sensitivity (impl); ++ ++ if (impl->changing_folder) ++ return; ++ ++ if (gtk_tree_selection_get_selected(selection, NULL, &iter)) ++ { ++ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), ++ &child_iter, ++ &iter); ++ shortcuts_activate_iter (impl, &child_iter); ++ } + } + + static gboolean +@@ -3930,7 +3941,7 @@ shortcuts_list_create (GtkFileChooserDef + GDK_ACTION_COPY | GDK_ACTION_MOVE); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view)); +- gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); ++ gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); + gtk_tree_selection_set_select_function (selection, + shortcuts_select_func, + impl, NULL); +@@ -3938,9 +3949,6 @@ shortcuts_list_create (GtkFileChooserDef + g_signal_connect (selection, "changed", + G_CALLBACK (shortcuts_selection_changed_cb), impl); + +- g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated", +- G_CALLBACK (shortcuts_row_activated_cb), impl); +- + g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event", + G_CALLBACK (shortcuts_key_press_event_cb), impl); + +@@ -8604,25 +8612,6 @@ gtk_file_chooser_default_should_respond + gtk_file_path_free (path); + return retval; + } +- else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view) +- { +- /* The focus is on a dialog's action area button, *and* the widget that +- * was focused immediately before it is the shortcuts list. Switch to the +- * selected shortcut and tell the caller not to respond. +- */ +- GtkTreeIter iter; +- +- if (shortcuts_get_selected (impl, &iter)) +- { +- shortcuts_activate_iter (impl, &iter); +- +- focus_browse_tree_view_if_possible (impl); +- } +- else +- goto file_list; +- +- return FALSE; +- } + else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view) + { + /* The focus is on a dialog's action area button, *and* the widget that +@@ -10482,25 +10471,6 @@ shortcuts_activate_iter (GtkFileChooserD + } + } + +-/* Callback used when a row in the shortcuts list is activated */ +-static void +-shortcuts_row_activated_cb (GtkTreeView *tree_view, +- GtkTreePath *path, +- GtkTreeViewColumn *column, +- GtkFileChooserDefault *impl) +-{ +- GtkTreeIter iter; +- GtkTreeIter child_iter; +- +- if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path)) +- return; +- +- gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model), +- &child_iter, +- &iter); +- shortcuts_activate_iter (impl, &child_iter); +-} +- + /* Handler for GtkWidget::key-press-event on the shortcuts list */ + static gboolean + shortcuts_key_press_event_cb (GtkWidget *widget, --- gtk+2.0-2.12.1.orig/debian/patches/020_immodules-files-d.patch +++ gtk+2.0-2.12.1/debian/patches/020_immodules-files-d.patch @@ -0,0 +1,126 @@ +Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c +=================================================================== +--- gtk+2.0-2.10.10.orig/gtk/gtkimmodule.c 2007-03-12 14:51:28.000000000 +0100 ++++ gtk+2.0-2.10.10/gtk/gtkimmodule.c 2007-03-13 14:10:33.000000000 +0100 +@@ -59,6 +59,9 @@ + #define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule)) + #define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE)) + ++#define IMMODULEFILEEXT ".immodules" ++#define IMMODULEFILEEXT_LEN ((int) strlen (IMMODULEFILEEXT)) ++ + struct _GtkIMModule + { + GTypeModule parent_instance; +@@ -261,31 +264,15 @@ + + + static void +-gtk_im_module_initialize (void) ++process_module_file (const gchar *filename, FILE *file) + { + GString *line_buf = g_string_new (NULL); + GString *tmp_buf = g_string_new (NULL); +- gchar *filename = gtk_rc_get_im_module_file(); +- FILE *file; + gboolean have_error = FALSE; + + GtkIMModule *module = NULL; + GSList *infos = NULL; + +- contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); +- +- file = g_fopen (filename, "r"); +- if (!file) +- { +- /* In case someone wants only the default input method, +- * we allow no file at all. +- */ +- g_string_free (line_buf, TRUE); +- g_string_free (tmp_buf, TRUE); +- g_free (filename); +- return; +- } +- + while (!have_error && pango_read_line (file, line_buf)) + { + const char *p; +@@ -383,10 +370,76 @@ + else if (module) + add_module (module, infos); + +- fclose (file); + g_string_free (line_buf, TRUE); + g_string_free (tmp_buf, TRUE); +- g_free (filename); ++} ++ ++static void ++gtk_im_module_initialize (void) ++{ ++ gchar *im_module_file_str = gtk_rc_get_im_module_file(); ++ gchar *im_module_files_d_str = g_build_filename (GTK_LIBDIR, ++ "gtk-2.0", ++ GTK_BINARY_VERSION, ++ "immodule-files.d", ++ NULL); ++ FILE *file; ++ gchar *list_str; ++ char **files; ++ int n; ++ ++ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S, ++ im_module_files_d_str, ++ im_module_file_str, ++ NULL); ++ ++ files = pango_split_file_list (list_str); ++ ++ contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); ++ ++ n = 0; ++ while (files[n]) ++ n++; ++ ++ while (n-- > 0) ++ { ++ GDir *dir = g_dir_open (files[n], 0, NULL); ++ if (dir) ++ { ++ const char *dent; ++ ++ while ((dent = g_dir_read_name (dir))) ++ { ++ int len = strlen (dent); ++ if (len > IMMODULEFILEEXT_LEN && strcmp (dent + len - IMMODULEFILEEXT_LEN, IMMODULEFILEEXT) == 0) ++ { ++ gchar *pathname = g_build_filename (files[n], dent, NULL); ++ file = g_fopen (pathname, "r"); ++ if (file) ++ { ++ process_module_file(pathname, file); ++ fclose(file); ++ } ++ g_free (pathname); ++ } ++ } ++ g_dir_close (dir); ++ } ++ else ++ { ++ file = g_fopen (files[n], "r"); ++ if (file) ++ { ++ process_module_file(files[n], file); ++ fclose (file); ++ } ++ } ++ } ++ ++ g_strfreev (files); ++ g_free (list_str); ++ g_free (im_module_files_d_str); ++ g_free (im_module_file_str); + } + + static gint --- gtk+2.0-2.12.1.orig/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch +++ gtk+2.0-2.12.1/debian/patches/091_workaround_no_gtk_init_incorrect_display.patch @@ -0,0 +1,12 @@ +Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c +=================================================================== +--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200 +@@ -287,6 +287,7 @@ + gtk_clipboard_get_for_display (GdkDisplay *display, + GdkAtom selection) + { ++ g_return_val_if_fail (display != NULL, NULL); + g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); + g_return_val_if_fail (!display->closed, NULL); + --- gtk+2.0-2.12.1.orig/debian/patches/009_gtk-export-filechooser.patch +++ gtk+2.0-2.12.1/debian/patches/009_gtk-export-filechooser.patch @@ -0,0 +1,225 @@ +2007-06-24 Loic Minier + + * gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private + * gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard + * gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard + +2007-02-07 Kristian Rietveld + + * gtk/gtkfilechooserutils.[ch] + (hildon_gtk_file_chooser_install_properties): conditionalize with + MAEMO_CHANGES, port over doc comment. + +2006-12-04 Tommi Komulainen + + Export enough symbols for implementing GtkFileChooser interface + outside gtk. + + * gtk/gtk.symbols: add hildon_gtk_file_chooser_install_properties + * gtk/Makefile.am (INCLUDES): add -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + (gtk_private_h_sources, gtk_semi_private_h_sources): export + gtkfilesystemmodel.h, gtkfilechooserprivate.h, and + gtkfilechooserutils.h as semi-private + * gtk/gtkfilechooserutils.c + (hildon_gtk_file_chooser_install_properties): add exported version of + _gtk_file_chooser_install_properties + * gtk/gtkfilesystemmodel.h: add GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED + #ifdef guard + * gtk/gtkfilechooserprivate.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #ifdef guard + * gtk/gtkfilechooserutils.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #ifdef guard, declare hildon_gtk_file_chooser_install_properties + + * tests/autotestfilechooser.c: build with + GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED +--- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-24 10:31:52.000000000 +0200 +@@ -33,6 +33,8 @@ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ ++ -DMAEMO_CHANGES \ ++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ +@@ -335,12 +337,15 @@ + # that are not included in gtk/gtk.h + gtk_semi_private_h_sources = \ + gtktextlayout.h \ +- gtkfilesystem.h ++ gtkfilesystem.h \ ++ gtkfilesystemmodel.h \ ++ gtkfilechooserprivate.h \ ++ gtkfilechooserutils.h \ ++ gtkquery.h \ ++ gtksearchengine.h + + # GTK+ header files that don't get installed + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginebeagle.h \ + gtksearchenginetracker.h\ + gtksearchenginesimple.h \ +@@ -350,10 +355,7 @@ + gtkfilechooserdefault.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ + gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystemmodel.h \ + gtkfilesystemunix.h \ + gtkhsv.h \ + gtkiconcache.h \ +--- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-24 09:09:13.000000000 +0200 +@@ -1416,6 +1416,12 @@ + #endif + #endif + ++#if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__) ++#if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__) ++hildon_gtk_file_chooser_install_properties ++#endif ++#endif ++ + #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) + #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) + gtk_file_chooser_widget_get_type G_GNUC_CONST +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-24 09:09:14.000000000 +0200 +@@ -21,6 +21,14 @@ + #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ + #define __GTK_FILE_CHOOSER_PRIVATE_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include "gtkfilechooser.h" + #include "gtkfilesystem.h" + #include "gtkfilesystemmodel.h" +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-24 09:09:14.000000000 +0200 +@@ -119,6 +119,22 @@ + "do-overwrite-confirmation"); + } + ++#ifdef MAEMO_CHANGES ++/** ++ * hildon_gtk_file_chooser_install_properties: ++ * ++ * Exactly the same as the private _gtk_file_chooser_install_properties() ++ * but exported for hildon-fm. ++ * ++ * Since: maemo 2.0 ++ */ ++void ++hildon_gtk_file_chooser_install_properties (GObjectClass *klass) ++{ ++ _gtk_file_chooser_install_properties (klass); ++} ++#endif /* MAEMO_CHANGES */ ++ + /** + * _gtk_file_chooser_delegate_iface_init: + * @iface: a #GtkFileChoserIface structure +@@ -360,3 +376,6 @@ + g_signal_emit_by_name (data, "confirm-overwrite", &conf); + return conf; + } ++ ++#define __GTK_FILE_CHOOSER_UTILS_C__ ++#include "gtkaliasdef.c" +--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-24 09:09:14.000000000 +0200 +@@ -22,6 +22,14 @@ + #ifndef __GTK_FILE_CHOOSER_UTILS_H__ + #define __GTK_FILE_CHOOSER_UTILS_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserutils.h is not supported API for general use" ++#endif ++ + #include "gtkfilechooserprivate.h" + + G_BEGIN_DECLS +@@ -45,6 +53,9 @@ + } GtkFileChooserProp; + + void _gtk_file_chooser_install_properties (GObjectClass *klass); ++#ifdef MAEMO_CHANGES ++void hildon_gtk_file_chooser_install_properties (GObjectClass *klass); ++#endif /* MAEMO_CHANGES */ + + void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); + void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, +--- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-24 09:09:14.000000000 +0200 +@@ -21,6 +21,10 @@ + #ifndef __GTK_FILE_SYSTEM_MODEL_H__ + #define __GTK_FILE_SYSTEM_MODEL_H__ + ++#ifndef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED ++#error "GtkFileSystemModel is not supported API for general use" ++#endif ++ + #include + #include "gtkfilesystem.h" + #include +--- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200 ++++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-24 09:09:14.000000000 +0200 +@@ -30,6 +30,7 @@ + */ + + #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED ++#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED + #undef GTK_DISABLE_DEPRECATED + + #include +--- gtk+2.0-2.11.6.orig/gtk/gtkquery.h 2007-07-24 10:31:23.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtkquery.h 2007-07-24 10:31:26.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_QUERY_H__ + #define __GTK_QUERY_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + + G_BEGIN_DECLS +--- gtk+2.0-2.11.6.orig/gtk/gtksearchengine.h 2007-07-24 10:30:25.000000000 +0200 ++++ gtk+2.0-2.11.6/gtk/gtksearchengine.h 2007-07-24 10:30:55.000000000 +0200 +@@ -23,6 +23,14 @@ + #ifndef __GTK_SEARCH_ENGINE_H__ + #define __GTK_SEARCH_ENGINE_H__ + ++/* This is a "semi-private" header; it is meant only for ++ * alternate GtkFileChooser implementations; no stability guarantees ++ * are made at this point ++ */ ++#ifndef GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ++#error "gtkfilechooserprivate.h is not supported API for general use" ++#endif ++ + #include + #include "gtkquery.h" + --- gtk+2.0-2.12.1.orig/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch +++ gtk+2.0-2.12.1/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch @@ -0,0 +1,14 @@ +GNOME #447163; Debian 381082 + +Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c 2007-06-15 20:08:17.000000000 +0200 ++++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c 2007-06-16 14:25:00.000000000 +0200 +@@ -33,6 +33,7 @@ + #undef GDK_DISABLE_DEPRECATED + + #include ++#undef GDK_DISABLE_DEPRECATED + #include "gdk.h" + + #include --- gtk+2.0-2.12.1.orig/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +++ gtk+2.0-2.12.1/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch @@ -0,0 +1,1220 @@ +Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c +=================================================================== +--- gtk+2.0-2.10.10.orig/gtk/gtkfilesel.c 2007-03-12 14:51:01.000000000 +0100 ++++ gtk+2.0-2.10.10/gtk/gtkfilesel.c 2007-03-13 14:10:10.000000000 +0100 +@@ -79,9 +79,13 @@ + #undef GTK_DISABLE_DEPRECATED + #include "gtkoptionmenu.h" + ++#include "gtkimage.h" ++ + #define WANT_HPANED 1 + #include "gtkhpaned.h" + ++#include "stock-icons/ximian-icons.h" ++ + #include "gtkalias.h" + + #ifdef G_OS_WIN32 +@@ -317,6 +321,9 @@ + */ + static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state); + ++static void home_clicked (GtkWidget *widget, gpointer data); ++static void desktop_clicked (GtkWidget *widget, gpointer data); ++static void documents_clicked (GtkWidget *widget, gpointer data); + + /* Directory operations. */ + static CompletionDir* open_ref_dir (gchar* text_to_complete, +@@ -626,6 +633,10 @@ + GtkWidget *spacer; + GtkDialog *dialog; + ++ GdkPixbuf *ipixbuf; ++ GtkWidget *bbox, *home_button, *desk_button, *docs_button, *xbox; ++ GtkWidget *lbox; ++ + GtkListStore *model; + GtkTreeViewColumn *column; + +@@ -639,18 +650,9 @@ + filesel->main_vbox = dialog->vbox; + gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); + +- /* The horizontal box containing create, rename etc. buttons */ +- filesel->button_area = gtk_hbutton_box_new (); +- gtk_button_box_set_layout (GTK_BUTTON_BOX (filesel->button_area), GTK_BUTTONBOX_START); +- gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, +- FALSE, FALSE, 0); +- gtk_widget_show (filesel->button_area); +- +- gtk_file_selection_show_fileop_buttons (filesel); +- + /* hbox for pulldown menu */ + pulldown_hbox = gtk_hbox_new (TRUE, 5); ++ gtk_container_set_border_width (GTK_CONTAINER (pulldown_hbox), 4); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); + gtk_widget_show (pulldown_hbox); + +@@ -662,14 +664,27 @@ + + /* The horizontal box containing the directory and file listboxes */ + ++ xbox = gtk_hbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (filesel->main_vbox), xbox, TRUE, TRUE, 0); ++ gtk_widget_show (xbox); ++ ++ bbox = gtk_vbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (xbox), bbox, FALSE, FALSE, 5); ++ gtk_widget_show (bbox); ++ ++ lbox = gtk_vbox_new (FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (xbox), lbox, TRUE, TRUE, 5); ++ gtk_widget_show (lbox); ++ + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + + list_hbox = gtk_hbox_new (FALSE, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), list_hbox, TRUE, TRUE, 0); + gtk_widget_show (list_hbox); ++ + if (WANT_HPANED) + list_container = g_object_new (GTK_TYPE_HPANED, + "visible", TRUE, +@@ -681,9 +696,78 @@ + + spacer = gtk_hbox_new (FALSE, 0); + gtk_widget_set_size_request (spacer, -1, 5); +- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), spacer, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (lbox), spacer, FALSE, FALSE, 0); + gtk_widget_show (spacer); + ++ ++ /* The Pretty Icons */ ++ ++ home_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (home_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), home_button, FALSE, FALSE, 0); ++ gtk_widget_show (home_button); ++ ++ g_signal_connect (G_OBJECT (home_button), "clicked", ++ G_CALLBACK (home_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (home_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_home_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("_Home"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), home_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ desk_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (desk_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), desk_button, FALSE, FALSE, 0); ++ gtk_widget_show (desk_button); ++ ++ g_signal_connect (G_OBJECT (desk_button), "clicked", ++ G_CALLBACK (desktop_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (desk_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_desktop_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("D_esktop"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), desk_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ docs_button = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (docs_button), 4); ++ gtk_box_pack_start (GTK_BOX (bbox), docs_button, FALSE, FALSE, 0); ++ gtk_widget_show (docs_button); ++ ++ g_signal_connect (G_OBJECT (docs_button), "clicked", ++ G_CALLBACK (documents_clicked), filesel); ++ ++ xbox = gtk_vbox_new (FALSE, 0); ++ gtk_container_add (GTK_CONTAINER (docs_button), xbox); ++ gtk_widget_show (xbox); ++ ++ ipixbuf = gdk_pixbuf_new_from_inline (-1, stock_documents_48, FALSE, NULL); ++ label = gtk_image_new_from_pixbuf (ipixbuf); ++ gtk_box_pack_start (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic ("Docu_ments"); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), docs_button); ++ gtk_box_pack_end (GTK_BOX (xbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ + /* The directories list */ + + model = gtk_list_store_new (1, G_TYPE_STRING); +@@ -756,6 +840,15 @@ + gtk_widget_show (filesel->file_list); + gtk_widget_show (scrolled_win); + ++ /* The horizontal box containing create, rename etc. buttons */ ++ filesel->button_area = gtk_hbox_new (FALSE, 0); ++ gtk_box_set_spacing (GTK_BOX (filesel->button_area), 0); ++ gtk_box_pack_start (GTK_BOX (lbox), filesel->button_area, ++ FALSE, FALSE, 0); ++ gtk_widget_show (filesel->button_area); ++ ++ gtk_file_selection_show_fileop_buttons (filesel); ++ + /* action area for packing buttons into. */ + filesel->action_area = gtk_hbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, +@@ -1071,39 +1164,94 @@ + void + gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel) + { ++ GtkWidget *label; ++ GtkWidget *bbox; ++ + g_return_if_fail (GTK_IS_FILE_SELECTION (filesel)); + + /* delete, create directory, and rename */ + if (!filesel->fileop_c_dir) + { +- filesel->fileop_c_dir = gtk_button_new_with_mnemonic (_("_New Folder")); ++ filesel->fileop_c_dir = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_c_dir), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_c_dir), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new_with_mnemonic (_("_New Folder")); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_c_dir); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_c_dir, "clicked", +- G_CALLBACK (gtk_file_selection_create_dir), +- filesel); ++ G_CALLBACK (gtk_file_selection_create_dir), ++ (gpointer) filesel); + gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_c_dir, TRUE, TRUE, 0); ++ filesel->fileop_c_dir, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_c_dir); + } +- ++ + if (!filesel->fileop_del_file) + { +- filesel->fileop_del_file = gtk_button_new_with_mnemonic (_("De_lete File")); ++ filesel->fileop_del_file = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_del_file), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_del_file), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_DELETE, ++ GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new (_("De_lete File")); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_del_file); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_del_file, "clicked", + G_CALLBACK (gtk_file_selection_delete_file), +- filesel); +- gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_del_file, TRUE, TRUE, 0); ++ (gpointer) filesel); ++ gtk_box_pack_end (GTK_BOX (filesel->button_area), ++ filesel->fileop_del_file, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_del_file); + } +- ++ + if (!filesel->fileop_ren_file) + { +- filesel->fileop_ren_file = gtk_button_new_with_mnemonic (_("_Rename File")); ++ filesel->fileop_ren_file = gtk_button_new (); ++ gtk_container_set_border_width (GTK_CONTAINER (filesel->fileop_ren_file), 4); ++ ++ bbox = gtk_hbox_new (FALSE, 2); ++ gtk_container_add (GTK_CONTAINER (filesel->fileop_ren_file), bbox); ++ ++ label = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, ++ GTK_ICON_SIZE_BUTTON); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ label = gtk_label_new (_("_Rename File")); ++ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), filesel->fileop_ren_file); ++ gtk_box_pack_start (GTK_BOX (bbox), label, FALSE, FALSE, 0); ++ gtk_widget_show (label); ++ ++ gtk_widget_show (bbox); ++ + g_signal_connect (filesel->fileop_ren_file, "clicked", + G_CALLBACK (gtk_file_selection_rename_file), +- filesel); +- gtk_box_pack_start (GTK_BOX (filesel->button_area), +- filesel->fileop_ren_file, TRUE, TRUE, 0); ++ (gpointer) filesel); ++ gtk_box_pack_end (GTK_BOX (filesel->button_area), ++ filesel->fileop_ren_file, FALSE, FALSE, 0); + gtk_widget_show (filesel->fileop_ren_file); + } + +@@ -1805,6 +1953,95 @@ + gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive); + } + ++static void ++home_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ ++ dir = g_strdup_printf ("%s/", g_get_home_dir()); ++ ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ ++static char * ++get_desktop_directory (void) ++{ ++ char *filename; ++ struct stat buf; ++ ++ filename = g_build_filename (g_get_home_dir (), "Desktop", NULL); ++ if (lstat (filename, &buf) == 0) ++ { ++ if (S_ISLNK (buf.st_mode)) ++ { ++ char link_target[MAXPATHLEN + 1]; ++ int len; ++ ++ len = readlink (filename, link_target, MAXPATHLEN); ++ if (len > 0) ++ { ++ char *desktop_filename; ++ /* Add a trailing / if there isn't already one */ ++ link_target[len] = '\0'; ++ if (link_target[len - 1] == G_DIR_SEPARATOR) ++ { ++ link_target[len - 1] = '\0'; ++ } ++ ++ if (!strcmp (link_target, "Desktop")) ++ { ++ g_free (filename); ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++ } ++ ++ desktop_filename = g_build_filename (g_get_home_dir (), "Desktop", NULL); ++ if (!strcmp (link_target, desktop_filename)) ++ { ++ g_free (desktop_filename); ++ g_free (filename); ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++ } ++ g_free (desktop_filename); ++ } ++ } ++ } ++ g_free (filename); ++ ++ return g_build_filename (g_get_home_dir (), "Desktop", G_DIR_SEPARATOR_S, NULL); ++} ++ ++ ++static void ++desktop_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ ++ dir = get_desktop_directory (); ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ ++static void ++documents_clicked (GtkWidget *widget, gpointer data) ++{ ++ char *dir; ++ dir = g_strdup_printf ("%s/Documents/", g_get_home_dir ()); ++ ++ gtk_file_selection_populate (GTK_FILE_SELECTION (data), ++ dir, FALSE, FALSE); ++ ++ g_free (dir); ++ ++ gtk_widget_grab_focus (GTK_FILE_SELECTION (data)->selection_entry); ++} ++ + static gint + gtk_file_selection_key_press (GtkWidget *widget, + GdkEventKey *event, +Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h 2007-03-13 14:10:10.000000000 +0100 +@@ -0,0 +1,825 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_desktop_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (6692) */ ++ "\0\0\32<" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (276) */ ++ "\0\0\1\24" ++ /* width (69) */ ++ "\0\0\0E" ++ /* height (45) */ ++ "\0\0\0-" ++ /* pixel_data: */ ++ "\377\0\0\0\0\332\0\0\0\0\204\0\0\0\1\252\0\0\0\0\204\0\0\0\1\221\0\0" ++ "\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\11\3\0\0\0\10\0\0\0\5\0\0\0" ++ "\3\245\0\0\0\1\4\0\0\0\2\0\0\0\3\0\0\0\6\0\0\0\10\202\0\0\0\11\3\0\0" ++ "\0\10\0\0\0\5\0\0\0\2\216\0\0\0\0\2\0\0\0\2\0\0\0_\204\0\0\0\377\4\0" ++ "\0\0m\0\0\0\26\0\0\0\17\0\0\0\13\244\0\0\0\12\2\0\0\0\14\0\0\0\202\204" ++ "\0\0\0\377\4\0\0\0l\0\0\0\23\0\0\0\10\0\0\0\2\215\0\0\0\0\3\0\0\0\5\0" ++ "\0\0\377\266\276\312\377\202\245\257\276\377\1s}\214\377\252\0\0\0\377" ++ "\1\266\276\312\377\202\220\234\257\377\5s}\214\377\0\0\0\377\0\0\0)\0" ++ "\0\0\23\0\0\0\5\214\0\0\0\0\11\0\0\0\1\0\0\0\10\0\0\0\377\220\234\257" ++ "\377Ug\204\377DRj\377MNA\377\310\311\274\377\333\334\314\377\231\323" ++ "\324\300\377\4\322\323\300\377\321\323\277\377\321\323\276\377\321\322" ++ "\276\377\203\320\321\275\377\4\317\320\274\377\316\320\274\377\315\320" ++ "\273\377\315\317\272\377\202\315\316\271\377\13\315\315\271\377\314\315" ++ "\271\377qr^\377\245\257\276\377Ug\204\377DRj\377\0\0\0\377\0\0\0<\0\0" ++ "\0\35\0\0\0\10\0\0\0\1\213\0\0\0\0\7\0\0\0\1\0\0\0\11\0\0\0\377\220\234" ++ "\257\377DRj\377abR\377\227\230\177\377\231\274\276\237\377\32\273\275" ++ "\236\377\273\275\235\377\272\274\235\377\271\273\234\377\270\273\233" ++ "\377\270\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377" ++ "\265\267\227\377\264\266\226\377\263\266\225\377\263\265\225\377\262" ++ "\264\224\377\261\264\223\377\260\263\222\377\260\262\221\377\257\262" ++ "\221\377or\\\377\220\234\257\377DRj\377\0\0\0\377\0\0\0E\0\0\0\"\0\0" ++ "\0\12\0\0\0\1\213\0\0\0\0\6\0\0\0\1\0\0\0\12\0\0\0\377s}\214\377abR\377" ++ "\227\230\177\377\231\274\276\237\377\33\273\275\236\377\272\274\235\377" ++ "\271\274\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267" ++ "\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377\264\266" ++ "\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261\263\223" ++ "\377\260\263\222\377\257\262\221\377\257\261\220\377\256\260\217\377" ++ "\255\260\217\377np[\377\220\234\257\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0" ++ "\12\0\0\0\1\213\0\0\0\0\5\0\0\0\1\0\0\0\10\0\0\0m\0\0\0\377\273\274\254" ++ "\377\230\274\276\237\377\35\273\275\236\377\272\275\235\377\272\274\235" ++ "\377\271\273\234\377\270\272\233\377\270\272\232\377\267\271\231\377" ++ "\266\270\231\377\265\270\230\377\265\267\227\377\264\266\226\377\263" ++ "\266\225\377\262\265\225\377\262\264\224\377\261\264\223\377\260\263" ++ "\222\377\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217" ++ "\377\255\257\216\377\254\257\215\377\226\231|\377\0\0\0\377\0\0\0\253" ++ "\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\214\0\0\0\0\4\0\0\0\6\0\0\0\26\0\0" ++ "\0\377\323\324\300\377\227\274\276\237\377\36\273\275\236\377\272\274" ++ "\235\377\271\273\234\377\271\273\233\377\270\272\233\377\267\271\232" ++ "\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267\227\377" ++ "\264\266\226\377\263\265\225\377\262\265\224\377\261\264\223\377\261" ++ "\263\223\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260" ++ "\217\377\255\260\217\377\254\257\216\377\254\256\215\377\253\256\214" ++ "\377\226\230z\377\0\0\0\377\0\0\0V\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1" ++ "\214\0\0\0\0\4\0\0\0\3\0\0\0\17\0\0\0\377\323\324\300\377\211\274\276" ++ "\237\377\1z{g\377\214\0\0\0\377\36[\\L\377\267\271\232\377\271\273\234" ++ "\377\270\272\233\377\267\272\232\377\267\271\231\377\266\270\230\377" ++ "\265\270\230\377\265\267\227\377\264\266\226\377\263\266\225\377\262" ++ "\265\224\377\262\264\224\377\261\263\223\377\260\263\222\377\257\262" ++ "\221\377\257\261\220\377\256\261\220\377\255\260\217\377\255\257\216" ++ "\377\254\257\215\377\253\256\214\377\252\255\214\377\252\255\213\377" ++ "\225\227y\377\0\0\0\377\0\0\0O\0\0\0,\0\0\0\20\0\0\0\3\215\0\0\0\0\4" ++ "\0\0\0\2\0\0\0\14\0\0\0\377\323\324\300\377\211\274\276\237\377\3\0\0" ++ "\0\377\323\323\323\377\366\366\366\377\210\377\377\377\377\40\371\371" ++ "\371\377\332\332\332\377XXX\377,-%\377\263\265\226\377\266\270\231\377" ++ "\266\271\231\377\266\270\230\377\265\267\227\377\264\267\226\377\263" ++ "\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377\261\263" ++ "\222\377\260\262\222\377\257\262\221\377\256\261\220\377\256\260\217" ++ "\377\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377" ++ "\252\255\213\377\251\254\212\377\251\253\212\377\224\226x\377\0\0\0\377" ++ "\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0" ++ "\377\323\324\300\377\211\274\276\237\377\2\0\0\0\377\366\366\366\377" ++ "\212\377\377\377\377\5\307\307\307\377\321\321\321\377\326\326\326\377" ++ "\0\0\0\377\260\262\223\377\202\264\267\227\377\30\264\266\226\377\263" ++ "\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377\260\263" ++ "\222\377\257\262\221\377\257\261\220\377\256\261\220\377\255\260\217" ++ "\377\254\257\216\377\254\257\215\377\253\256\214\377\252\255\214\377" ++ "\252\254\213\377\251\254\212\377\250\253\211\377\247\252\210\377\223" ++ "\226x\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0" ++ "\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0\0\377" ++ "\207\377\377\377\377#\376\376\376\377\377\377\377\377\376\376\376\377" ++ "\375\375\375\377\300\300\300\377\341\341\341\377\360\360\360\377\233" ++ "\233\233\377\0\0\0\377\255\257\220\377\262\265\225\377\263\265\225\377" ++ "\262\264\224\377\261\264\223\377\260\263\222\377\260\262\222\377\257" ++ "\262\221\377\256\261\220\377\256\260\217\377\255\260\216\377\254\257" ++ "\216\377\253\256\215\377\253\255\214\377\252\255\213\377\251\254\212" ++ "\377\250\253\212\377\250\253\211\377\247\252\210\377\246\251\207\377" ++ "\222\225v\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4" ++ "\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237\377\1\0\0" ++ "\0\377\205\377\377\377\377%\376\376\376\377\375\375\375\377\374\374\373" ++ "\377\375\375\375\377\374\374\373\377\373\373\373\377\257\257\256\377" ++ "\351\351\351\377\377\377\377\377\337\337\337\377\217\217\217\377\0\0" ++ "\0\377\253\256\216\377\260\263\222\377\261\263\223\377\260\263\222\377" ++ "\257\262\221\377\257\261\220\377\256\261\217\377\255\260\217\377\254" ++ "\257\216\377\254\256\215\377\253\256\214\377\252\255\213\377\251\254" ++ "\213\377\251\254\212\377\250\253\211\377\247\252\210\377\247\252\207" ++ "\377\246\251\207\377\245\250\206\377\220\224u\377\0\0\0\377\0\0\0I\0" ++ "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324" ++ "\300\377\211\274\276\237\377\1\0\0\0\377\203\377\377\377\377\32\376\376" ++ "\376\377\375\375\375\377\374\374\373\377\373\373\373\377\372\372\371" ++ "\377\373\373\373\377\372\372\371\377\371\371\370\377\244\244\243\377" ++ "\360\360\360\377\377\377\377\377\364\364\364\377\317\317\317\377\242" ++ "\242\242\37744+\377\252\255\215\377\257\261\220\377\257\262\221\377\256" ++ "\261\220\377\255\260\217\377\255\257\216\377\254\257\215\377\253\256" ++ "\215\377\253\255\214\377\252\255\213\377\251\254\212\377\202\250\253" ++ "\211\377\13\247\252\210\377\246\251\207\377\245\251\206\377\245\250\205" ++ "\377\244\247\205\377\220\222t\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0" ++ "\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274" ++ "\276\237\377\15\0\0\0\377\377\377\377\377\376\376\376\377\375\375\375" ++ "\377\374\374\373\377\373\373\373\377\372\372\371\377\371\371\370\377" ++ "\370\370\367\377\371\371\370\377\370\370\367\377\370\367\366\377\236" ++ "\236\236\377\206\0\0\0\377\30VWG\377\252\255\215\377\256\260\217\377" ++ "\255\260\217\377oq\\\377\15\15\13\3779.'\377\214\214p\377\245\247\207" ++ "\377\251\254\212\377\250\253\211\377\247\252\210\377\246\252\207\377" ++ "\246\251\207\377\245\250\206\377\244\247\205\377\244\247\204\377\243" ++ "\246\203\377\217\221s\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215" ++ "\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\211\274\276\237" ++ "\377+\0\0\0\377\377\377\377\377\374\374\373\377\373\373\373\377\372\372" ++ "\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367\366\365" ++ "\377\370\367\366\377\367\366\365\377\366\366\364\377\364\363\362\377" ++ "\336\335\334\377\323\322\320\377\267\267\265\377\237\236\235\377poo\377" ++ "ebZ\377\0\0\0\377\242\244\206\377op[\377\24\24\21\377E\77\77\377\347" ++ "\254\243\377\302[K\377,\30\23\377\201\204i\377\250\253\211\377\247\252" ++ "\210\377\246\251\207\377\245\250\206\377\245\250\205\377\244\247\205" ++ "\377\243\246\204\377\242\246\203\377\242\245\202\377\216\220q\377\0\0" ++ "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\323\324\300\377\210\274\276\237\377,\273\275\236\377\0\0\0" ++ "\377\377\377\377\377\372\372\371\377\371\371\370\377\370\370\367\377" ++ "\370\367\366\377\367\366\365\377\366\366\364\377\365\364\363\377\366" ++ "\366\364\377\365\364\363\377\364\363\362\377\362\362\360\377\344\344" ++ "\342\377\332\331\327\377\330\330\326\377\315\314\312\377\257\256\254" ++ "\377\210\204{\377\0\0\0\377\21\21\14\377D@5\377\350\332\260\377\240\231" ++ "\223\377\235NB\377n#\26\377\40\17\12\377or[\377\246\251\207\377\246\251" ++ "\206\377\245\250\206\377\244\247\205\377\243\247\204\377\243\246\203" ++ "\377\242\245\202\377\241\245\202\377\241\244\201\377\215\220p\377\0\0" ++ "\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\323\324\300\377\207\274\276\237\377-\273\275\236\377\272\274" ++ "\235\377\0\0\0\377\377\377\377\377\370\370\367\377\370\367\366\377\367" ++ "\366\365\377\366\366\364\377\365\364\363\377\364\363\362\377\363\363" ++ "\361\377\364\363\362\377\363\363\361\377\362\362\360\377\357\357\355" ++ "\377\356\355\353\377\355\354\352\377\351\350\346\377\325\324\323\377" ++ "\275\274\273\377\21\17\15\377,*#\377\360\337\253\377\320\264f\377\272" ++ "\214,\377x_2\3774\30\23\377\31\26\22\377\202\205j\377\242\245\203\377" ++ "\245\250\206\377\245\250\205\377\244\247\204\377\243\246\204\377\242" ++ "\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377\237\243" ++ "\200\377\214\217p\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0" ++ "\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377\205\274\276\237\377" ++ "\202\273\275\236\377\6\272\274\235\377\271\273\234\377\0\0\0\377\377" ++ "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377%\363" ++ "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361" ++ "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\352\351\347" ++ "\377\332\326\315\377\26\25\21\377-,&\377\362\342\262\377\320\264e\377" ++ "\270\211+\377\244q\24\377O4\6\377\33\27\15\377su]\377\234\237\177\377" ++ "\244\247\204\377\243\246\204\377\244\247\205\377\243\247\204\377\243" ++ "\246\203\377\242\245\202\377\241\245\202\377\240\244\201\377\240\243" ++ "\200\377\237\242\177\377\236\242~\377\213\216o\377\0\0\0\377\0\0\0I\0" ++ "\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324" ++ "\300\377\204\274\276\237\3770\273\275\236\377\272\274\235\377\272\274" ++ "\234\377\271\273\234\377\270\272\233\377\0\0\0\377\377\377\377\377\364" ++ "\363\362\377\363\362\361\377\362\362\360\377\360\360\356\377\357\357" ++ "\355\377\361\360\356\377\360\357\355\377\361\360\356\377\360\357\355" ++ "\377\357\356\354\377\354\353\351\377\305\303\274\377\25\24\16\377-,&" ++ "\377\362\343\263\377\320\265g\377\271\215/\377\247r\26\377Z=\11\377\33" ++ "\25\7\377[]J\377\233\236~\377\242\245\203\377\243\246\204\377\242\246" ++ "\203\377\244\247\204\377\243\246\204\377\242\246\203\377\242\245\202" ++ "\377\241\244\201\377\240\243\200\377\237\243\200\377\237\242\177\377" ++ "\236\241~\377\235\241}\377\211\215m\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0" ++ "\13\0\0\0\2\215\0\0\0\0\4\0\0\0\1\0\0\0\12\0\0\0\377\323\324\300\377" ++ "\202\274\276\237\3772\273\275\236\377\273\275\235\377\272\274\235\377" ++ "\271\273\234\377\270\273\233\377\270\272\232\377\267\271\231\377\0\0" ++ "\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377" ++ "\360\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361" ++ "\360\356\377\360\357\355\377\351\350\346\377<8/\377+(\36\377\360\337" ++ "\247\377\320\264h\377\276\2202\377\260|\33\377`A\13\377\30\20\1\377=" ++ ">1\377\225\230z\377\242\245\203\377\243\247\204\377\243\246\203\377\244" ++ "\247\205\377\243\247\204\377\243\246\203\377\242\245\202\377\241\244" ++ "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377" ++ "\235\241}\377\235\240}\377\234\240|\377\210\214l\377\0\0\0\377\0\0\0" ++ "I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\323" ++ "\324\300\377\274\276\237\377\273\275\236\377\272\274\235\377\271\274" ++ "\234\377\271\273\233\377\270\272\233\377\267\271\232\377\267\271\231" ++ "\377\266\270\230\377\0\0\0\377\377\377\377\377\360\360\356\377\202\357" ++ "\357\355\377\2\357\356\354\377\356\355\353\377\203\355\354\352\377!\347" ++ "\346\344\377NJB\377\256\247\240\377\315\265\221\377\305\236@\377\267" ++ "\202\36\377bD\16\377\36\27\7\377:84\377\0\0\0\377\214\216q\377\244\247" ++ "\205\377\243\246\204\377\242\246\203\377\244\247\204\377\243\246\203" ++ "\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243\200\377" ++ "\237\243\177\377\237\242\177\377\236\241~\377\235\241}\377\234\240|\377" ++ "\234\237{\377\233\237{\377\207\213k\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0" ++ "\13\0\0\0\2\215\0\0\0\0\21\0\0\0\1\0\0\0\12\0\0\0\377\322\323\300\377" ++ "\272\275\235\377\272\274\235\377\271\273\234\377\270\272\233\377\270" ++ "\272\232\377\267\271\231\377\266\270\231\377\265\270\230\377\265\267" ++ "\227\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352\377\203" ++ "\354\353\351\377$\353\352\350\377\351\350\345\377\353\352\350\377\37" ++ "\37\37\377&$\40\377\220~i\377\232zU\377{`3\377\26\20\7\377DDC\377\270" ++ "\267\264\377\233\225\212\377\0\0\0\377\216\220s\377\243\246\203\377\244" ++ "\247\205\377\243\246\204\377\242\246\203\377\242\245\202\377\241\244" ++ "\201\377\240\244\201\377\240\243\200\377\237\242\177\377\236\242~\377" ++ "\235\241}\377\235\240}\377\234\240|\377\233\237{\377\232\236z\377\232" ++ "\235y\377\207\212j\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0" ++ "\0\0\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\323\277\377\271\273\234\377" ++ "\271\273\233\377\270\272\233\377\267\271\232\377\266\271\231\377\266" ++ "\270\230\377\265\267\227\377\264\267\227\377\264\266\226\377\0\0\0\377" ++ "\377\377\377\377\353\352\350\377\202\351\350\346\377\1\350\347\345\377" ++ "\202\350\347\344\377\2\347\346\343\377\36\35\35\377\202\24\24\24\377" ++ "\37\26\26\23\377\"!\37\377LLJ\377\261\260\255\377\322\321\315\377\331" ++ "\330\324\377\237\231\216\377\0\0\0\377\217\222t\377\244\247\204\377\243" ++ "\246\203\377\242\245\203\377\241\245\202\377\241\244\201\377\240\243" ++ "\200\377\237\243\177\377\236\242\177\377\236\241~\377\235\241}\377\234" ++ "\240|\377\234\237{\377\233\236{\377\232\236z\377\231\235y\377\231\234" ++ "x\377\206\211i\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0" ++ "\0\20\0\0\0\1\0\0\0\12\0\0\0\377\321\322\276\377\270\272\233\377\267" ++ "\272\232\377\267\271\231\377\266\270\230\377\265\270\230\377\265\267" ++ "\227\377\264\266\226\377\263\266\225\377\262\265\224\377\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\203\346\345\342\377%\345\344\341\377\346" ++ "\344\341\377\345\344\340\377\340\336\333\377\320\317\313\377\302\302" ++ "\276\377\303\303\277\377\320\317\313\377\330\327\323\377\331\330\324" ++ "\377\330\326\322\377\331\327\323\377\237\231\215\377\0\0\0\377\216\221" ++ "s\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\200\377" ++ "\237\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240|\377" ++ "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235x\377\230" ++ "\234x\377\227\233w\377\205\210h\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13" ++ "\0\0\0\2\215\0\0\0\0\30\0\0\0\1\0\0\0\12\0\0\0\377\320\321\275\377\267" ++ "\271\232\377\266\271\231\377\266\270\230\377\265\267\227\377\264\267" ++ "\226\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223" ++ "\377\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343\342" ++ "\336\377\344\342\337\377\344\343\337\377\342\341\335\377\343\342\336" ++ "\377\342\341\335\377\340\337\333\377\203\333\332\326\377\35\332\330\324" ++ "\377\334\332\326\377\331\327\323\377\330\326\322\377\236\230\215\377" ++ "\0\0\0\377\215\220q\377\241\245\202\377\241\244\201\377\240\243\200\377" ++ "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377" ++ "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\231\234x\377\230" ++ "\234w\377\227\233v\377\226\232v\377\204\207g\377\0\0\0\377\0\0\0I\0\0" ++ "\0%\0\0\0\13\0\0\0\2\215\0\0\0\0""8\0\0\0\1\0\0\0\12\0\0\0\377\320\321" ++ "\275\377\266\270\230\377\265\270\230\377\264\267\227\377\264\266\226" ++ "\377\263\265\225\377\262\265\224\377\262\264\224\377\261\263\223\377" ++ "\260\263\222\377\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334" ++ "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377" ++ "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340" ++ "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326" ++ "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\214\217p\377\240\243" ++ "\200\377\237\243\200\377\237\242\177\377\236\241~\377\235\241}\377\234" ++ "\240|\377\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235" ++ "x\377\230\234x\377\227\233w\377\227\233v\377\226\232u\377\225\231t\377" ++ "\202\206f\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\30" ++ "\0\0\0\1\0\0\0\12\0\0\0\377\317\320\274\377\265\267\227\377\264\266\226" ++ "\377\263\266\226\377\263\265\225\377\262\264\224\377\261\264\223\377" ++ "\260\263\222\377\260\262\222\377\257\262\221\377\0\0\0\377\321\321\321" ++ "\377\341\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377" ++ "\340\337\333\377\336\335\331\377\340\336\332\377\336\335\331\377\340" ++ "\336\332\377\202\336\334\330\377\202\334\332\326\377\34\330\326\322\377" ++ "\327\326\321\377\325\323\316\377\233\225\212\377\0\0\0\377\213\216o\377" ++ "\237\242\177\377\236\242~\377\236\241~\377\235\240}\377\234\240|\377" ++ "\233\237{\377\233\236z\377\232\236z\377\231\235y\377\230\234x\377\230" ++ "\234w\377\227\233v\377\226\232v\377\226\231u\377\225\231t\377\224\230" ++ "s\377\202\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0" ++ "\0\32\0\0\0\1\0\0\0\12\0\0\0\377\315\320\273\377\264\266\226\377\263" ++ "\265\225\377\262\265\224\377\261\264\223\377\261\263\223\377\260\263" ++ "\222\377\257\262\221\377\257\261\220\377\256\261\217\377\0\0\0\377\231" ++ "\230\221\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235" ++ "\221\377\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220" ++ "\377\242\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215" ++ "\377\202\235\227\214\377\21\233\226\212\377gcY\377\0\0\0\377\213\215" ++ "o\377\236\241~\377\235\241}\377\234\240|\377\234\237{\377\233\237{\377" ++ "\232\236z\377\231\235y\377\231\235x\377\230\234w\377\227\233w\377\227" ++ "\232v\377\226\232u\377\225\231t\377\202\224\230s\377\7\224\227s\377\202" ++ "\205e\377\0\0\0\377\0\0\0I\0\0\0%\0\0\0\13\0\0\0\2\215\0\0\0\0\16\0\0" ++ "\0\2\0\0\0\14\0\0\0\377\315\317\271\377\263\265\225\377\262\264\224\377" ++ "\261\264\223\377\260\263\222\377\260\262\221\377\257\262\221\377\256" ++ "\261\220\377\255\260\217\377\255\257\216\377moY\377\222\0\0\0\377\17" ++ "WZF\377\216\221q\377\235\240}\377\234\240|\377\233\237{\377\233\236z" ++ "\377\232\235y\377\231\235y\377\230\234x\377\230\233w\377\227\233v\377" ++ "\226\232u\377\225\231u\377\225\231t\377\224\230s\377\203\224\227s\377" ++ "\6\202\205e\377\0\0\0\377\0\0\0K\0\0\0&\0\0\0\14\0\0\0\2\215\0\0\0\0" ++ "\34\0\0\0\3\0\0\0\202\0\0\0\377\326\327\306\377\261\264\223\377\261\263" ++ "\223\377\260\263\222\377\257\262\221\377\256\261\220\377\256\260\217" ++ "\377\255\260\217\377\254\257\216\377\254\256\215\377\251\254\212\377" ++ "\240\242\202\377\225\230{\377\224\227y\377\222\225w\377\222\224v\377" ++ "\221\224v\377\221\223v\377\220\222u\377\217\222t\377\217\222s\377\216" ++ "\221r\377\215\220r\377\214\220q\377\214\217p\377\202\213\216o\377\16" ++ "\212\215o\377\212\214n\377\216\221q\377\227\232x\377\234\237{\377\233" ++ "\236{\377\232\236z\377\231\235y\377\231\234x\377\230\234w\377\227\233" ++ "w\377\226\232v\377\226\232u\377\225\231t\377\202\224\230s\377\204\224" ++ "\227s\377\6\202\205e\377\0\0\0\377\0\0\0\243\0\0\0,\0\0\0\20\0\0\0\3" ++ "\215\0\0\0\0\17\0\0\0\6\0\0\0\377v\204\234\377rr^\377\260\263\222\377" ++ "\260\262\221\377\257\261\221\377\256\261\220\377\255\260\217\377\255" ++ "\257\216\377\254\257\215\377\253\256\215\377\252\255\214\377\252\255" ++ "\213\377\251\254\212\377\202\250\253\211\377\33\247\252\210\377\246\251" ++ "\207\377\245\250\206\377\245\250\205\377\244\247\205\377\243\246\204" ++ "\377\242\246\203\377\242\245\202\377\241\244\201\377\240\244\201\377" ++ "\240\243\200\377\237\242\177\377\236\242~\377\235\241}\377\235\240}\377" ++ "\234\237|\377\233\237{\377\232\236z\377\232\235y\377\231\235y\377\230" ++ "\234x\377\230\233w\377\227\233v\377\226\232u\377\225\231u\377\225\231" ++ "t\377\224\230s\377\206\224\227s\377\7z}_\377\222\230\242\377\0\0\0\377" ++ "\0\0\0""6\0\0\0\27\0\0\0\6\0\0\0\1\213\0\0\0\0\15\0\0\0\1\0\0\0\10\0" ++ "\0\0\377Ug\204\377v\204\234\377pr]\377\256\261\220\377\256\260\217\377" ++ "\255\260\216\377\254\257\216\377\253\256\215\377\253\256\214\377\252" ++ "\255\213\377\202\251\254\212\377\34\250\253\211\377\247\252\210\377\246" ++ "\251\207\377\246\251\206\377\245\250\206\377\244\247\205\377\243\247" ++ "\204\377\243\246\203\377\242\245\202\377\241\245\202\377\241\244\201" ++ "\377\240\243\200\377\237\243\177\377\236\242~\377\236\241~\377\235\240" ++ "}\377\234\240|\377\233\237{\377\233\236z\377\232\236z\377\231\235y\377" ++ "\231\234x\377\230\234w\377\227\233v\377\226\232v\377\226\232u\377\225" ++ "\231t\377\224\230s\377\210\224\227s\377\7\266\276\312\377DRj\377\0\0" ++ "\0\377\0\0\0A\0\0\0\37\0\0\0\11\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0\12" ++ "\0\0\0\377\202Ug\204\377\11v\204\234\377\213\215r\377\217\220u\377\227" ++ "\232|\377\226\231{\377\226\230{\377\226\230z\377\225\227y\377\224\226" ++ "x\377\202\223\226x\377\32\222\225w\377\221\224v\377\221\224u\377\220" ++ "\223t\377\220\222t\377\217\222s\377\217\221r\377\216\220q\377\215\220" ++ "p\377\214\220p\377\214\217p\377\213\216o\377\212\216n\377\212\215m\377" ++ "\211\214m\377\210\214l\377\207\213k\377\207\212j\377\207\212i\377\206" ++ "\211i\377\205\210i\377\205\210h\377\204\207g\377\203\207f\377\203\206" ++ "f\377\202\206e\377\210\202\205e\377\10\245\257\276\377Ug\204\377DRj\377" ++ "\0\0\0\377\0\0\0G\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0\3\0\0\0\1\0\0\0" ++ "\12\0\0\0\377\2036AU\377\1KUd\377\252\0\0\0\377\1\204\214\230\377\202" ++ "6AU\377\6+4D\377\0\0\0\377\0\0\0F\0\0\0#\0\0\0\12\0\0\0\1\213\0\0\0\0" ++ "\3\0\0\0\1\0\0\0\10\0\0\0\211\204\0\0\0\377\4\0\0\0\253\0\0\0V\0\0\0" ++ "O\0\0\0K\244\0\0\0I\2\0\0\0K\0\0\0\243\204\0\0\0\377\5\0\0\0\247\0\0" ++ "\0=\0\0\0\36\0\0\0\10\0\0\0\1\214\0\0\0\0\12\0\0\0\5\0\0\0\23\0\0\0*" ++ "\0\0\0=\0\0\0F\0\0\0G\0\0\0A\0\0\0""6\0\0\0,\0\0\0&\244\0\0\0%\13\0\0" ++ "\0&\0\0\0,\0\0\0""6\0\0\0A\0\0\0G\0\0\0F\0\0\0=\0\0\0*\0\0\0\24\0\0\0" ++ "\5\0\0\0\1\214\0\0\0\0\4\0\0\0\2\0\0\0\11\0\0\0\23\0\0\0\36\202\0\0\0" ++ "#\4\0\0\0\37\0\0\0\27\0\0\0\20\0\0\0\14\244\0\0\0\13\4\0\0\0\14\0\0\0" ++ "\20\0\0\0\27\0\0\0\37\202\0\0\0#\4\0\0\0\36\0\0\0\24\0\0\0\11\0\0\0\2" ++ "\216\0\0\0\0\3\0\0\0\2\0\0\0\5\0\0\0\10\202\0\0\0\12\3\0\0\0\11\0\0\0" ++ "\6\0\0\0\3\246\0\0\0\2\3\0\0\0\3\0\0\0\6\0\0\0\11\202\0\0\0\12\3\0\0" ++ "\0\10\0\0\0\6\0\0\0\2\221\0\0\0\0\205\0\0\0\1\251\0\0\0\0\205\0\0\0\1" ++ "\315\0\0\0\0"}; ++ ++ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_home_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (6699) */ ++ "\0\0\32C" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (280) */ ++ "\0\0\1\30" ++ /* width (70) */ ++ "\0\0\0F" ++ /* height (45) */ ++ "\0\0\0-" ++ /* pixel_data: */ ++ "\217\0\0\0\0\17\27\30\24A\40!\35|&&#\377$%!\377\"#\37\377!\"\36\377\37" ++ "\40\34\377\35\36\32\377\34\35\32\377\33\34\30\377\31\32\26\377\30\31" ++ "\25\377\27\30\24\374\27\30\24\255\27\30\24$\267\0\0\0\0\2\27\30\24\341" ++ "\330\331\323\377\212\365\365\360\377\3\361\362\354\377{|u\377\27\30\24" ++ "\227\267\0\0\0\0\3\27\30\24\345\353\353\345\377\361\362\353\377\211\345" ++ "\346\330\377\4\356\357\346\377\347\347\341\377\32\33\27\352\27\30\24" ++ "\4\266\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\212\336" ++ "\337\316\377\3\354\355\343\377qql\377\27\30\24N\266\0\0\0\0\3\27\30\24" ++ "\345\353\353\345\377\354\354\342\377\212\336\337\316\377\3\340\341\321" ++ "\377\324\325\317\377/0+\377\230\27\30\24\377\2\27\30\24\376\27\30\24" ++ "k\234\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354\342\377\213\336" ++ "\337\316\377\2\346\347\332\377\364\364\357\377\227\365\365\360\377\4" ++ "\364\364\357\377\325\326\310\377\40!\34\377\27\30\24\25\233\0\0\0\0\3" ++ "\27\30\24\345\353\353\345\377\354\354\342\377\214\336\337\316\377\1\343" ++ "\344\325\377\227\347\350\333\377\4\343\344\325\377\336\337\316\377+," ++ "'\377\27\30\24\32\233\0\0\0\0\3\27\30\24\345\353\353\345\377\354\354" ++ "\342\377\246\336\337\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\6\27\30" ++ "\24\345\353\353\345\377\354\354\342\377\335\336\315\377\331\332\312\377" ++ "\324\325\305\377\212\323\324\305\377\212\323\324\304\377\1\322\323\303" ++ "\377\212\321\322\302\377\2\322\323\303\377\331\332\312\377\202\336\337" ++ "\316\377\2+,'\377\27\30\24\32\233\0\0\0\0\13\27\30\24\345\353\353\345" ++ "\377\354\354\342\377\333\334\313\377\310\311\272\377\233\234\220\377" ++ "\213\214\206\377\214\214\210\377\215\215\210\377\215\216\210\377\216" ++ "\216\211\377\202\216\216\212\377\11\216\216\213\377\216\217\213\377\217" ++ "\220\213\377\220\220\214\377\220\221\214\377\221\221\214\377\221\221" ++ "\215\377\221\222\216\377\222\222\216\377\202\223\223\217\377\202\224" ++ "\224\220\377\2\224\224\221\377\224\225\221\377\202\224\224\221\377\1" ++ "\224\224\220\377\202\223\224\220\377\202\223\223\220\377\10\222\222\217" ++ "\377\221\221\216\377\202\202z\377\303\304\265\377\335\336\315\377\336" ++ "\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345" ++ "\377\354\354\342\377\332\333\312\377\266\267\251\377\234\234\231\377" ++ "\225\377\377\377\377\20\375\375\375\377\373\373\373\377\371\371\371\377" ++ "\367\367\367\377\366\366\366\377\364\364\364\377\362\362\362\377\360" ++ "\360\360\377\356\356\356\377\354\354\354\377\307\307\307\377\233\234" ++ "\221\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0" ++ "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260" ++ "\261\244\377\273\273\272\377\224\377\377\377\377\21\376\376\376\377\374" ++ "\374\374\377\372\372\372\377\370\370\370\377\366\366\366\377\364\364" ++ "\364\377\363\363\363\377\361\361\361\377\357\357\357\377\355\355\355" ++ "\377\353\353\353\377\343\343\343\377\210\210\177\377\333\334\313\377" ++ "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353" ++ "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272" ++ "\377\223\377\377\377\377\22\376\376\376\377\374\374\374\377\372\372\372" ++ "\377\370\370\370\377\366\366\366\377\364\364\364\377\363\363\363\377" ++ "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351" ++ "\351\351\377\341\341\341\377\210\210\177\377\333\334\313\377\336\337" ++ "\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353\345\377" ++ "\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\222" ++ "\377\377\377\377\23\376\376\376\377\374\374\374\377\372\372\372\377\370" ++ "\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377\361\361" ++ "\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351\351\351" ++ "\377\350\350\350\377\340\340\340\377\210\210\177\377\333\334\313\377" ++ "\336\337\316\377+,'\377\27\30\24\32\233\0\0\0\0\6\27\30\24\345\353\353" ++ "\345\377\354\354\342\377\332\333\312\377\260\261\244\377\273\273\272" ++ "\377\221\377\377\377\377\24\376\376\376\377\374\374\374\377\372\372\372" ++ "\377\370\370\370\377\367\367\367\377\365\365\365\377\363\363\363\377" ++ "\361\361\361\377\357\357\357\377\355\355\355\377\353\353\353\377\351" ++ "\351\351\377\350\350\350\377\346\346\346\377\336\336\336\377\210\210" ++ "\177\377\333\334\313\377\336\337\316\377+,'\377\27\30\24\32\233\0\0\0" ++ "\0\6\27\30\24\345\353\353\345\377\354\354\342\377\332\333\312\377\260" ++ "\261\244\377\273\273\272\377\221\377\377\377\377\24\375\375\375\377\373" ++ "\373\373\377\371\371\371\377\367\367\367\377\365\365\365\377\363\363" ++ "\363\377\362\362\362\377\360\360\360\377\356\356\356\377\354\354\354" ++ "\377\352\352\352\377\350\350\350\377\346\346\346\377\344\344\344\377" ++ "\334\334\334\377\207\207~\377\332\333\312\377\334\335\314\377+,&\377" ++ "\27\30\24\32\226\0\0\0\0\205\0\0\0\1\6\27\30\24\346\353\353\345\377\354" ++ "\354\342\377\332\333\312\377\260\261\244\377\273\273\272\377\220\377" ++ "\377\377\377\26\375\375\375\377\373\373\373\377\371\371\371\377\367\367" ++ "\367\377\365\365\365\377\363\363\363\377\362\362\362\377\360\360\360" ++ "\377\356\356\356\377\354\354\354\377\352\352\352\377\350\350\350\377" ++ "\346\346\346\377\344\344\344\377\342\342\342\377\332\332\332\377\205" ++ "\206~\377\330\331\311\377\333\334\313\377+,&\377\26\27\23\32\0\0\0\1" ++ "\223\0\0\0\0\202\0\0\0\1\2\25\26\22\12\26\27\23\32\203\25\26\23\33\6" ++ "\27\30\24\351\326\326\320\377\327\327\315\377\306\307\270\377\241\242" ++ "\226\377\253\253\251\377\217\350\350\347\377\26\346\346\346\377\344\344" ++ "\344\377\342\342\342\377\341\341\340\377\340\340\337\377\336\336\336" ++ "\377\334\334\334\377\332\332\332\377\330\331\330\377\327\327\326\377" ++ "\325\325\325\377\323\323\323\377\322\322\322\377\320\320\320\377\317" ++ "\317\316\377\315\315\314\377\306\306\305\377zzs\377\304\305\266\377\306" ++ "\307\270\377()$\377\26\27\23""2\203\26\27\23\32\1\0\0\0\1\217\0\0\0\0" ++ "\202\0\0\0\1\2\25\26\22\30\27\30\24\324\227-.(\377\203-.'\377\204,.'" ++ "\377\210,-'\377\204+-&\377\207+,&\377\3$&\40\377\27\30\24\371\26\27\23" ++ "#\215\0\0\0\0\202\0\0\0\1\3\0\0\0\3\26\27\24h]_R\377\221\305\307\264" ++ "\377\10\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377" ++ "\302\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202" ++ "\300\302\260\377\12\277\302\257\377\276\301\257\377\276\300\256\377\275" ++ "\300\256\377\275\277\256\377\275\277\255\377\274\276\255\377\273\276" ++ "\254\377\273\275\254\377\272\275\253\377\202\271\274\253\377\16\271\273" ++ "\252\377\270\273\251\377\267\272\251\377\267\271\251\377\266\271\250" ++ "\377\266\271\247\377\265\270\247\377\265\267\247\377\264\267\246\377" ++ "\263\266\246\377\217\223|\377()\"\377\27\27\24F\0\0\0\1\213\0\0\0\0\202" ++ "\0\0\0\1\4\0\0\0\3\0\0\0\4\25\26\22""4DF;\377\217\305\307\264\377\10" ++ "\304\307\264\377\304\306\264\377\303\305\263\377\303\305\262\377\302" ++ "\305\262\377\302\304\262\377\301\304\261\377\300\303\260\377\202\300" ++ "\302\260\377\5\277\302\257\377\276\301\257\377\276\300\256\377\275\300" ++ "\256\377\275\277\256\377\202\274\276\255\377\12\273\276\255\377\272\275" ++ "\253\377\272\274\253\377\270\273\252\377\267\272\251\377\267\272\250" ++ "\377\266\271\247\377\266\270\247\377\264\267\246\377\263\266\245\377" ++ "\202\262\265\244\377\12\261\264\242\377\260\263\242\377\257\262\241\377" ++ "\255\260\236\377\223\227\201\377\201\205n\376\31\33\27\377\24\25\22\35" ++ "\0\0\0\2\0\0\0\1\212\0\0\0\0\12\0\0\0\1\0\0\0\3\0\0\0\4\0\0\0\7\7\7\6" ++ "\15\37!\33\366\301\303\257\377\305\307\264\377\304\307\263\377\255\260" ++ "\225\377\202\252\256\222\377\202\252\255\221\377\1\251\255\221\377\202" ++ "\251\255\220\377\202\251\254\220\377*\247\253\217\377\246\252\216\377" ++ "\245\251\215\377\245\251\214\377\244\250\213\377\242\246\212\377\241" ++ "\245\211\377\240\244\207\377\237\243\207\377\235\241\206\377\235\241" ++ "\204\377\234\240\204\377\233\237\203\377\232\236\202\377\230\234\201" ++ "\377\227\233\200\377\227\233\177\377\225\231~\377\224\230~\377\223\227" ++ "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377" ++ "\216\222x\377\215\221w\377\214\220v\377\213\217v\377\212\216u\377\212" ++ "\216t\377\211\215t\377\210\214s\377\207\213r\377\206\212q\377\205\211" ++ "q\377ejY\377\27\30\24\346\0\0\0\6\0\0\0\4\0\0\0\2\0\0\0\1\210\0\0\0\0" ++ "\12\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\11\0\0\0\14\27\27\24\306\251" ++ "\253\230\377\305\307\264\377\303\305\261\377\207\244\250\212\377,\243" ++ "\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240\244" ++ "\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204" ++ "\377\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377" ++ "\230\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231" ++ "~\377\224\230}\377\223\227|\377\222\226|\377\222\226{\377\221\225z\377" ++ "\220\224z\377\217\223y\377\216\222x\377\216\222w\377\215\221w\377\214" ++ "\220v\377\213\217u\377\212\216u\377\211\215t\377\211\215s\377\210\214" ++ "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377" ++ "MSH\377\27\30\24\266\0\0\0\11\0\0\0\6\0\0\0\4\202\0\0\0\1\206\0\0\0\0" ++ "\202\0\0\0\1\11\0\0\0\4\0\0\0\6\0\0\0\11\0\0\0\15\0\0\0\21\26\27\23\223" ++ "\207\211x\377\305\307\264\377\304\307\264\377\205\244\250\212\377\10" ++ "\243\247\211\377\242\246\210\377\241\245\210\377\241\245\207\377\240" ++ "\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\202\234" ++ "\240\203\377\4\233\237\202\377\232\236\201\377\231\235\201\377\230\234" ++ "\200\377\202\227\233\177\377\17\226\232~\377\225\231}\377\224\230|\377" ++ "\223\227|\377\222\226{\377\222\226z\377\221\225z\377\220\224y\377\217" ++ "\223x\377\216\222x\377\216\222w\377\215\221v\377\214\220v\377\213\217" ++ "u\377\212\216t\377\202\211\215s\377\4\210\214r\377\207\213q\377\206\212" ++ "q\377\205\211p\377\202\204\210o\377\11\203\207n\377\200\205l\3778\77" ++ "7\377\26\26\23\210\0\0\0\16\0\0\0\11\0\0\0\5\0\0\0\3\0\0\0\1\206\0\0" ++ "\0\0\11\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\14\0\0\0\21\0\0\0\25\23" ++ "\24\20f`cU\377\202\305\307\264\377\1\246\252\215\377\202\244\250\212" ++ "\3773\243\247\211\377\242\246\211\377\241\245\210\377\241\245\207\377" ++ "\240\244\206\377\237\243\206\377\236\242\205\377\235\241\204\377\234" ++ "\240\204\377\233\237\203\377\233\237\202\377\232\236\202\377\231\235" ++ "\201\377\232\236\202\377\234\240\205\377\232\236\204\377\226\232~\377" ++ "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220" ++ "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220" ++ "v\377\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377" ++ "\207\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203" ++ "\207o\377\202\206n\377\201\205m\377\200\204m\377ryf\377(,(\377\23\24" ++ "\20]\0\0\0\22\0\0\0\15\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\205\0\0\0\0A" ++ "\0\0\0\1\0\0\0\4\0\0\0\6\0\0\0\12\0\0\0\21\0\0\0\25\0\0\0\33\14\15\13" ++ "868/\377\304\307\264\377\305\307\264\377\251\254\220\377\243\247\211" ++ "\377\242\246\211\377\241\245\210\377\241\245\207\377\240\244\206\377" ++ "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233" ++ "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234" ++ "\200\377\227\233\177\377\247\253\224\377\311\313\275\377\301\303\263" ++ "\377\224\230}\377\223\227|\377\222\226|\377\244\247\222\377\223\227}" ++ "\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377" ++ "\213\217v\377\212\216u\377\212\216t\377\211\215t\377\210\214s\377\207" ++ "\213r\377\206\212q\377\205\211q\377\205\211p\377\204\210o\377\203\207" ++ "o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203k\377" ++ "aj]\376\31\33\27\377\14\14\12""3\0\0\0\32\0\0\0\22\0\0\0\13\0\0\0\7\0" ++ "\0\0\4\0\0\0\1\204\0\0\0\0\202\0\0\0\1A\0\0\0\4\0\0\0\10\0\0\0\15\0\0" ++ "\0\22\0\0\0\33\0\0\0\40\0\0\0(\32\32\26\352\274\276\251\377\304\307\264" ++ "\377\251\255\222\377\241\245\210\377\241\245\207\377\240\244\206\377" ++ "\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377\233" ++ "\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230\234" ++ "\200\377\227\233\177\377\226\232\177\377\226\232~\377\241\245\214\377" ++ "\310\312\274\377\305\307\270\377\230\234\202\377\254\257\234\377\300" ++ "\303\264\377\306\310\272\377\305\307\271\377\262\265\243\377\232\235" ++ "\206\377\214\220v\377\213\217v\377\212\216u\377\212\216t\377\211\215" ++ "t\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\205\211p\377" ++ "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202j\377{\200i\377LWO\377\27\30\24\352\0\0\0" ++ "(\0\0\0\37\0\0\0\31\0\0\0\17\0\0\0\11\0\0\0\4\0\0\0\2\0\0\0\1\203\0\0" ++ "\0\0\37\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\11\0\0\0\17\0\0\0\25\0\0\0\34\0" ++ "\0\0(\0\0\0/\25\26\22\301\234\237\215\377\303\305\262\377\251\255\222" ++ "\377\237\243\206\377\236\242\205\377\235\241\204\377\234\240\204\377" ++ "\234\240\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230" ++ "\234\200\377\227\233\200\377\227\233\177\377\226\232~\377\225\231~\377" ++ "\224\230}\377\223\227|\377\232\236\206\377\307\311\273\377\306\311\273" ++ "\377\202\305\310\272\377\2\305\307\272\377\305\307\271\377\202\304\306" ++ "\271\377\21\303\305\270\377\267\271\252\377\235\241\214\377\212\216u" ++ "\377\210\214s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377" ++ "\204\210o\377\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202k\377\202|\200i\377\13ovd\377BKD\377\25\26" ++ "\22\304\0\0\0""1\0\0\0(\0\0\0\34\0\0\0\24\0\0\0\12\0\0\0\6\0\0\0\3\0" ++ "\0\0\1\203\0\0\0\0\16\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\11\0\0\0\21\0\0\0" ++ "\30\0\0\0\37\0\0\0,\0\0\0:\22\23\20\232y{l\377\302\304\262\377\252\255" ++ "\224\377\235\241\204\377\202\234\240\203\377\4\233\237\202\377\232\236" ++ "\201\377\231\235\201\377\230\234\200\377\202\227\233\177\377\13\226\232" ++ "~\377\225\231}\377\224\230|\377\223\227|\377\225\231\177\377\253\256" ++ "\231\377\301\303\264\377\306\310\272\377\305\310\272\377\305\307\272" ++ "\377\305\307\271\377\202\304\306\271\377\202\303\305\270\377\203\302" ++ "\304\267\377\3\274\276\257\377\243\246\223\377\212\216v\377\202\204\210" ++ "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k" ++ "\377\177\203j\377~\202j\377\204|\200i\377\13bl^\3776>7\377\22\23\20\242" ++ "\0\0\0;\0\0\0""0\0\0\0\40\0\0\0\30\0\0\0\14\0\0\0\7\0\0\0\3\0\0\0\1\203" ++ "\0\0\0\0\36\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\12\0\0\0\21\0\0\0\30\0\0\0" ++ "!\0\0\0""1\0\0\0\77\14\15\13{PRG\377\300\303\260\377\252\256\226\377" ++ "\233\237\203\377\233\237\202\377\232\236\202\377\231\235\201\377\230" ++ "\234\200\377\227\233\177\377\226\232\177\377\226\232~\377\225\231}\377" ++ "\224\230}\377\223\227|\377\231\235\204\377\260\263\240\377\304\306\270" ++ "\377\306\310\272\377\305\310\272\377\305\307\272\377\202\304\306\271" ++ "\377\1\303\305\271\377\202\303\305\270\377\4\302\304\270\377\302\304" ++ "\267\377\301\303\267\377\301\303\266\377\202\300\302\266\377\11\276\300" ++ "\263\377\270\272\254\377\241\244\222\377\207\213t\377\200\204m\377\177" ++ "\203l\377\177\203k\377~\202j\377}\201j\377\205|\200i\377\14z\177h\377" ++ "WcZ\377','\377\15\16\14\204\0\0\0K\0\0\0""6\0\0\0#\0\0\0\31\0\0\0\16" ++ "\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\33\0\0\0\2\0\0\0\5\0\0\0\12\0\0" ++ "\0\21\0\0\0\31\0\0\0$\0\0\0""1\0\0\0F\3\3\3^()#\376\276\300\256\377\254" ++ "\257\227\377\232\236\202\377\231\235\201\377\230\234\200\377\227\233" ++ "\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223\227" ++ "|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223x\377" ++ "\274\276\257\377\202\304\306\271\377\1\303\305\271\377\202\303\305\270" ++ "\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303\266\377" ++ "\202\300\302\266\377\11\300\302\265\377\277\301\265\377\256\261\241\377" ++ "\201\205m\377\200\204m\377\177\203l\377\177\203k\377~\202j\377}\201j" ++ "\377\207|\200i\377\14ovd\377S`X\377\31\33\27\377\5\5\4s\0\0\0R\0\0\0" ++ ">\0\0\0'\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\0\0\0\1\204\0\0\0\0\34\0" ++ "\0\0\1\0\0\0\4\0\0\0\11\0\0\0\21\0\0\0\30\0\0\0$\0\0\0""3\0\0\0E\0\0" ++ "\0_\25\26\22\345\255\257\235\377\255\260\232\377\230\234\200\377\227" ++ "\233\177\377\226\232\177\377\226\232~\377\225\231}\377\224\230}\377\223" ++ "\227|\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217\223" ++ "x\377\216\222x\377\215\221w\377\263\265\244\377\303\305\271\377\202\303" ++ "\305\270\377\4\302\304\270\377\302\304\267\377\301\303\267\377\301\303" ++ "\266\377\202\300\302\266\377\1\300\302\265\377\202\277\301\265\377\6" ++ "\276\300\264\377\245\250\230\377\177\203l\377\177\203k\377~\202j\377" ++ "}\201j\377\211|\200i\377\13bl^\377JVO\377\26\27\23\360\0\0\0d\0\0\0\\" ++ "\0\0\0A\0\0\0)\0\0\0\33\0\0\0\17\0\0\0\10\0\0\0\3\205\0\0\0\0!\0\0\0" ++ "\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\27\0\0\0\"\0\0\0""2\0\0\0D\0\0\0\\" ++ "\22\23\20\304\214\216~\377\256\261\233\377\226\232\177\377\225\231~\377" ++ "\225\231}\377\224\230}\377\223\227|\377\222\226{\377\221\225{\377\220" ++ "\224z\377\220\224y\377\217\223x\377\216\222x\377\215\221w\377\214\220" ++ "v\377\213\217v\377\252\255\232\377\303\305\270\377\302\304\270\377\220" ++ "\224|\377\207\213r\377\206\212r\377\220\224~\377\202\300\302\266\377" ++ "\202\277\301\265\377\202\276\300\264\377\3\276\300\263\377\235\240\216" ++ "\377~\202k\377\213|\200i\377\14z\177h\377WcZ\377BKD\377\23\24\21\327" ++ "\0\0\0i\0\0\0Z\0\0\0A\0\0\0*\0\0\0\33\0\0\0\16\0\0\0\7\0\0\0\2\206\0" ++ "\0\0\0\21\0\0\0\2\0\0\0\6\0\0\0\16\0\0\0\25\0\0\0\37\0\0\0/\0\0\0A\0" ++ "\0\0Z\16\17\14\246ik]\377\257\262\235\377\224\230}\377\224\230|\377\223" ++ "\227{\377\222\226z\377\221\225z\377\220\224y\377\202\217\223x\377\17" ++ "\216\222w\377\215\221v\377\214\220v\377\213\217u\377\212\216t\377\212" ++ "\216s\377\241\244\220\377\302\304\267\377\301\303\266\377\224\227\201" ++ "\377\205\211p\377\205\211o\377\216\221z\377\277\301\265\377\277\301\264" ++ "\377\203\276\300\263\377\202\275\277\262\377\1\223\226\203\377\214|\200" ++ "i\377\14nuc\377VbY\3776>7\377\20\20\15\275\0\0\0r\0\0\0V\0\0\0\77\0\0" ++ "\0&\0\0\0\32\0\0\0\15\0\0\0\6\0\0\0\1\206\0\0\0\0\32\0\0\0\1\0\0\0\5" ++ "\0\0\0\13\0\0\0\23\0\0\0\36\0\0\0,\0\0\0=\0\0\0U\10\10\7\207AB9\377\260" ++ "\263\237\377\222\226{\377\221\225{\377\220\224z\377\220\224y\377\217" ++ "\223y\377\216\222x\377\215\221w\377\214\220v\377\213\217v\377\213\217" ++ "u\377\212\216t\377\211\215t\377\210\214s\377\207\213r\377\227\233\205" ++ "\377\202\300\302\266\377\5\227\232\205\377\203\207o\377\202\206n\377" ++ "\211\215w\377\276\300\264\377\202\275\277\263\377\1\275\277\262\377\203" ++ "\274\276\262\377\1\213\217{\377\214|\200i\377\14bk^\377VbY\377','\377" ++ "\13\13\11\243\0\0\0s\0\0\0S\0\0\0:\0\0\0$\0\0\0\30\0\0\0\13\0\0\0\3\0" ++ "\0\0\1\206\0\0\0\0\"\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\20\0\0\0\32\0\0\0" ++ "(\0\0\0""9\0\0\0N\1\1\1j\35\36\32\371\255\260\234\377\220\224z\377\217" ++ "\223y\377\217\223x\377\216\222x\377\215\221w\377\214\220v\377\213\217" ++ "u\377\212\216u\377\212\216t\377\211\215s\377\210\214s\377\207\213r\377" ++ "\206\212q\377\205\211q\377\215\220z\377\300\302\265\377\277\301\265\377" ++ "\233\236\212\377\201\205m\377\200\204l\377\207\212u\377\275\277\263\377" ++ "\275\277\262\377\205\274\276\262\377\1\204\207r\377\213|\200i\377\14" ++ "z~h\377WcZ\377S`X\377\31\34\30\377\4\4\4\210\0\0\0p\0\0\0O\0\0\0""5\0" ++ "\0\0\"\0\0\0\25\0\0\0\10\0\0\0\2\210\0\0\0\0\12\0\0\0\2\0\0\0\6\0\0\0" ++ "\16\0\0\0\27\0\0\0#\0\0\0""5\0\0\0H\0\0\0`\24\25\21\335\226\232\207\377" ++ "\202\216\222x\377\4\215\221w\377\214\220v\377\213\217v\377\212\216u\377" ++ "\202\211\215t\377\16\210\214s\377\207\213r\377\206\212q\377\205\211q" ++ "\377\204\210p\377\204\210o\377\203\207p\377\246\251\230\377\246\250\227" ++ "\377\221\225\201\377\177\203l\377\177\203k\377\201\205n\377\235\240\216" ++ "\377\206\234\237\215\377\1}\200j\377\213|\200i\377\14nuc\377VbY\377J" ++ "UN\377\26\27\23\362\0\0\0{\0\0\0e\0\0\0J\0\0\0""1\0\0\0\37\0\0\0\17\0" ++ "\0\0\7\0\0\0\2\210\0\0\0\0\35\0\0\0\1\0\0\0\4\0\0\0\13\0\0\0\22\0\0\0" ++ "\36\0\0\0-\0\0\0\77\0\0\0U\21\22\17\272y{m\377\215\221w\377\214\220v" ++ "\377\213\217v\377\212\216u\377\211\215t\377\211\215s\377\210\214s\377" ++ "\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377\203" ++ "\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177\203" ++ "k\377~\202k\377\225|\200i\377\14ak^\377VbY\377BKD\377\23\24\21\327\0" ++ "\0\0m\0\0\0Y\0\0\0B\0\0\0*\0\0\0\32\0\0\0\14\0\0\0\5\0\0\0\1\210\0\0" ++ "\0\0\22\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\20\0\0\0\30\0\0\0%\0\0\0""5\0\0" ++ "\0E\15\16\14\220Y[N\377\213\217v\377\212\216t\377\211\215s\377\210\214" ++ "s\377\210\214r\377\207\213q\377\206\212q\377\205\211p\377\202\204\210" ++ "o\377\7\203\207n\377\202\206m\377\201\205l\377\200\204l\377\177\203k" ++ "\377\177\203j\377~\202j\377\223|\200i\377\17z\177h\377x}g\377v{g\377" ++ "pvd\377VcZ\377VbY\3776>7\377\20\21\16\266\0\0\0]\0\0\0J\0\0\0""2\0\0" ++ "\0!\0\0\0\26\0\0\0\12\0\0\0\3\212\0\0\0\0\30\0\0\0\2\0\0\0\5\0\0\0\14" ++ "\0\0\0\22\0\0\0\35\0\0\0)\0\0\0""6\10\10\7Z13+\377\214\220x\377\210\214" ++ "s\377\207\213r\377\206\212q\377\205\211q\377\204\210p\377\204\210o\377" ++ "\203\207o\377\202\206n\377\201\205m\377\200\204m\377\177\203l\377\177" ++ "\203k\377~\202j\377}\201j\377\204|\200i\377\21z\177h\377x}g\377v{g\377" ++ "sye\377qxe\377ovd\377mtc\377krb\377hqa\377fo`\377dm_\377bk^\377_j]\377" ++ "]h\\\377[f\\\377Yd[\377VcZ\377\206VbY\377\11','\377\15\16\13\207\0\0" ++ "\0F\0\0\0""4\0\0\0%\0\0\0\32\0\0\0\16\0\0\0\7\0\0\0\2\212\0\0\0\0\34" ++ "\0\0\0\1\0\0\0\3\0\0\0\10\0\0\0\17\0\0\0\24\0\0\0\34\0\0\0&\0\0\0""1" ++ "\30\31\25\354hkX\377{\177h\377x|f\377uze\377rwc\377pvb\377lsa\377jq_" ++ "\377gn^\377el]\377bi[\377`hZ\377]eY\377ZdX\377XbW\377VaV\377T`V\377R" ++ "^U\377P]T\377\226P\\T\377\12MXQ\377\30\32\26\377\10\10\7M\0\0\0-\0\0" ++ "\0\"\0\0\0\32\0\0\0\21\0\0\0\12\0\0\0\3\0\0\0\1\213\0\0\0\0\11\0\0\0" ++ "\1\0\0\0\4\0\0\0\10\0\0\0\16\0\0\0\23\0\0\0\30\0\0\0\40\17\17\15N\26" ++ "\27\23\332\240\27\30\24\352\210\27\30\24\351\11\26\27\24\344\21\22\17" ++ "h\0\0\0!\0\0\0\36\0\0\0\30\0\0\0\20\0\0\0\11\0\0\0\5\0\0\0\1\215\0\0" ++ "\0\0\7\0\0\0\1\0\0\0\3\0\0\0\7\0\0\0\12\0\0\0\16\0\0\0\21\0\0\0\24\211" ++ "\0\0\0\25\234\0\0\0\24\202\0\0\0\23\205\0\0\0\22\5\0\0\0\16\0\0\0\14" ++ "\0\0\0\7\0\0\0\5\0\0\0\2\217\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0" ++ "\5\203\0\0\0\6\252\0\0\0\5\202\0\0\0\4\202\0\0\0\2\1\0\0\0\1\223\0\0" ++ "\0\0\216\0\0\0\1\254\0\0\0\0"}; ++ ++ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++static const guint8 stock_documents_48[] = ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (3237) */ ++ "\0\0\14\275" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (192) */ ++ "\0\0\0\300" ++ /* width (48) */ ++ "\0\0\0""0" ++ /* height (48) */ ++ "\0\0\0""0" ++ /* pixel_data: */ ++ "\377\0\0\0\0\377\0\0\0\0\363\0\0\0\0\1XXX\2\240\0\0\0\0\1\0\0\0Y\213" ++ "\0\0\0\377\7\0\0\0\366\0\0\0\362\16\16\16\377(((\377aaa\333\0\0\0\10" ++ "\0\0\0\1\235\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\210" ++ "\377\377\377\377\1\371\371\371\377\202\371\371\370\377\6\347\347\347" ++ "\377\344\344\344\377\315\315\315\377\37\37\37\344\0\0\0\24\0\0\0\2\234" ++ "\0\0\0\0\2\0\0\0\377\366\366\366\377\212\377\377\377\377\11\371\371\370" ++ "\377\357\357\356\377\257\257\256\377\351\351\351\377\377\377\377\377" ++ "\263\263\263\377888\375\0\0\0\16\0\0\0\2\233\0\0\0\0\1\0\0\0\377\202" ++ "\377\377\377\377\205yyy\377\2xxx\377yyy\377\202xxx\377\12\371\371\370" ++ "\377\356\356\356\377\244\244\243\377\360\360\360\377\377\377\377\377" ++ "\364\364\364\377\253\253\253\377\5\5\5\231\0\0\0\13\0\0\0\1\232\0\0\0" ++ "\0\1\0\0\0\377\205\377\377\377\377\11\376\376\376\377\375\375\375\377" ++ "\374\374\373\377\375\375\375\377\374\374\373\377\373\373\373\377\371" ++ "\371\370\377\362\362\362\377\236\236\236\377\204\0\0\0\377\3\0\0\0\330" ++ "\0\0\0\33\0\0\0\5\225\0\0\0\0\1\0\0\0Y\205\0\0\0\377\202\377\377\377" ++ "\377\1yyy\377\202xxx\377\202www\377\16vvv\377www\377vvv\377vvu\377\371" ++ "\371\370\377\364\364\364\377\324\324\323\377\271\267\266\377\203\203" ++ "\201\377\204\203\201\377jgc\377\0\0\0\343\0\0\0&\0\0\0\7\225\0\0\0\0" ++ "\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377\377\377\26\0" ++ "\0\0\377\377\377\377\377\376\376\376\377\375\375\375\377\374\374\373" ++ "\377\373\373\373\377\372\372\371\377\371\371\370\377\370\370\367\377" ++ "\371\371\370\377\370\370\367\377\370\367\366\377\371\371\370\377\363" ++ "\362\361\377\340\340\337\377\334\332\330\377\312\312\310\377\266\266" ++ "\264\377rpl\377\0\0\0\356\0\0\0)\0\0\0\10\225\0\0\0\0\2\0\0\0\377\366" ++ "\366\366\377\203\377\377\377\377\16\0\0\0\377\377\377\377\377\374\374" ++ "\373\377www\377vvv\377vvu\377uuu\377uut\377utt\377uut\377utt\377tts\377" ++ "\364\363\362\377\361\360\357\377\202\360\357\355\377\6\345\344\342\377" ++ "\304\303\300\377\201}t\377\0\0\0\377\0\0\0,\0\0\0\11\225\0\0\0\0\1\0" ++ "\0\0\377\202\377\377\377\377\202yyy\377\13\0\0\0\377\377\377\377\377" ++ "\372\372\371\377\371\371\370\377\370\370\367\377\370\367\366\377\367" ++ "\366\365\377\366\366\364\377\365\364\363\377\366\366\364\377\365\364" ++ "\363\377\204\364\363\362\377\1\353\352\350\377\202\341\337\334\377\4" ++ "\213\206}\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\1\0\0\0Y\205\0\0" ++ "\0\377\204\377\377\377\377\7\0\0\0\377\377\377\377\377\370\370\367\377" ++ "uut\377utt\377tts\377tss\377\204ssr\377\2rrq\377qqp\377\202ppo\377\7" ++ "llk\377jih\377\341\337\334\377\244\236\223\377\0\0\0\377\0\0\0/\0\0\0" ++ "\11\220\0\0\0\0\3\0\0\0\377\323\323\323\377\366\366\366\377\202\377\377" ++ "\377\377\1\0\0\0\377\202\377\377\377\377\6yyy\377xxx\377\0\0\0\377\377" ++ "\377\377\377\366\365\364\377\365\365\363\377\202\364\363\362\377\20\363" ++ "\363\361\377\362\362\360\377\361\361\357\377\362\362\360\377\361\361" ++ "\357\377\361\360\356\377\356\355\353\377\354\353\351\377\347\346\343" ++ "\377\342\341\337\377\344\343\340\377\341\337\334\377\244\236\223\377" ++ "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\2\0\0\0\377\366\366\366\377\203" ++ "\377\377\377\377\12\0\0\0\377\377\377\377\377\376\376\376\377\375\375" ++ "\375\377\374\374\373\377\0\0\0\377\377\377\377\377\364\363\362\377sr" ++ "r\377rrq\377\202qqp\377\17rqp\377qqp\377rqp\377qqp\377qpo\377oon\377" ++ "nml\377llj\377lkj\377kji\377\341\337\334\377\244\236\223\377\0\0\0\377" ++ "\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\202\377\377\377\377\202yyy\377" ++ "\33\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0\0\0\377" ++ "\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\360" ++ "\360\356\377\357\357\355\377\361\360\356\377\360\357\355\377\361\360" ++ "\356\377\360\357\355\377\357\356\354\377\354\353\351\377\350\347\345" ++ "\377\345\344\341\377\344\343\340\377\342\341\336\377\341\337\334\377" ++ "\244\236\223\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\1\0\0\0\377\204" ++ "\377\377\377\377\10\0\0\0\377\377\377\377\377\372\372\371\377\371\371" ++ "\370\377\370\370\367\377\0\0\0\377\377\377\377\377\360\360\356\377\202" ++ "\230\250\265\377\4\230\250\264\377\230\247\264\377\227\247\263\377\355" ++ "\354\352\377\202poo\377\13oon\377nml\377mmk\377kki\377kjh\377jjh\377" ++ "\340\337\333\377\241\234\220\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0" ++ "\0\1\0\0\0\377\202\377\377\377\377\21yyy\377xxx\377\0\0\0\377\377\377" ++ "\377\377\370\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\355" ++ "\355\353\377\227\247\263\377\276\274\307\377\355\337\261\377\227\246" ++ "\263\377\226\246\262\377\351\350\345\377\353\352\350\377\202\351\350" ++ "\345\377\12\345\344\341\377\346\344\341\377\343\342\336\377\337\336\332" ++ "\377\336\335\331\377\335\334\330\377\241\233\220\377\0\0\0\377\0\0\0" ++ "/\0\0\0\11\220\0\0\0\0\17\0\0\0\377\377\377\377\377\376\376\376\377\375" ++ "\375\375\377\374\374\373\377\0\0\0\377\377\377\377\377\366\365\364\377" ++ "\365\365\363\377\364\363\362\377\0\0\0\377\377\377\377\377\353\352\350" ++ "\377\225\245\261\377\274\272\305\377\202\353\336\257\377\17\225\244\261" ++ "\377\347\346\343\377nml\377mmk\377mlk\377lki\377kki\377jig\377ihf\377" ++ "hhf\377\334\333\327\377\241\233\220\377\0\0\0\377\0\0\0/\0\0\0\11\220" ++ "\0\0\0\0\40\0\0\0\377\377\377\377\377\374\374\373\377www\377vvv\377\0" ++ "\0\0\377\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\224\243\260\377\273\271\304\377\352\335" ++ "\256\377\351\334\256\377\224\243\257\377\345\344\340\377\346\344\341" ++ "\377\345\344\340\377\344\343\337\377\342\341\335\377\340\337\333\377" ++ "\336\335\331\377\334\333\327\377\333\331\325\377\331\327\323\377\237" ++ "\231\215\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\16\0\0\0\377\377\377" ++ "\377\377\372\372\371\377\371\371\370\377\370\370\367\377\0\0\0\377\377" ++ "\377\377\377\364\363\362\377\363\362\361\377\362\362\360\377\0\0\0\377" ++ "\371\371\371\377\344\343\340\377\223\242\256\377\202\272\267\302\377" ++ "\5\272\270\302\377\222\241\255\377\343\342\336\377kjh\377kki\377\202" ++ "jjh\377\11ihf\377hgf\377hge\377ffd\377\330\326\322\377\236\230\215\377" ++ "\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377\377\377\377\377\370" ++ "\370\367\377uut\377utt\377\0\0\0\377\377\377\377\377\360\360\356\377" ++ "\202qqp\377\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334" ++ "\377\341\340\334\377\340\337\333\377\342\341\335\377\340\337\333\377" ++ "\341\340\334\377\340\337\333\377\341\340\334\377\337\336\332\377\340" ++ "\336\332\377\335\333\327\377\334\332\326\377\331\327\323\377\330\326" ++ "\321\377\327\325\321\377\235\227\213\377\0\0\0\377\0\0\0/\0\0\0\11\220" ++ "\0\0\0\0\25\0\0\0\377\377\377\377\377\366\365\364\377\365\365\363\377" ++ "\364\363\362\377\0\0\0\377\377\377\377\377\355\355\353\377\355\354\352" ++ "\377\354\353\351\377\0\0\0\377\321\321\321\377\341\337\333\377\340\336" ++ "\332\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331" ++ "\377\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330" ++ "\377\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316" ++ "\377\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\220\0\0\0\0\10\0\0\0\377" ++ "\377\377\377\377\364\363\362\377srr\377rrq\377\0\0\0\377\377\377\377" ++ "\377\353\352\350\377\202nnm\377\15\0\0\0\377\231\230\221\377\243\236" ++ "\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243\235\222" ++ "\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234\220\377" ++ "\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235\227\214" ++ "\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\220\0\0\0\0\10" ++ "\0\0\0\377\377\377\377\377\364\363\362\377\363\362\361\377\362\362\360" ++ "\377\0\0\0\377\377\377\377\377\347\346\343\377\202\346\345\342\377\1" ++ "\221\220\216\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\220\0\0\0\0\3" ++ "\0\0\0\377\377\377\377\377\360\360\356\377\202\357\357\355\377\3\0\0" ++ "\0\377\371\371\371\377\344\343\340\377\202kki\377\6jig\377ba_\377YXV" ++ "\377WWU\377WVT\377WWU\377\202VVT\377\11\265\264\261\377\264\262\257\377" ++ "\263\261\256\377\261\257\254\377\260\256\253\377\200{s\377\0\0\0\377" ++ "\0\0\0U\0\0\0""6\202\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\220\0\0\0\0\33" ++ "\0\0\0\377\377\377\377\377\355\355\353\377poo\377oon\377\0\0\0\377\355" ++ "\355\355\377\341\340\335\377\341\337\334\377\341\340\334\377\340\337" ++ "\333\377\336\335\331\377\330\330\324\377\331\330\324\377\330\327\323" ++ "\377\331\330\324\377\327\326\322\377\330\326\322\377\325\323\317\377" ++ "\324\322\316\377\321\317\313\377\320\316\311\377\317\315\311\377\227" ++ "\221\206\377\0\0\0\377\0\0\0""6\0\0\0\22\202\0\0\0\11\2\0\0\0\10\0\0" ++ "\0\4\221\0\0\0\0\3\0\0\0\377\377\377\377\377\353\352\350\377\202\351" ++ "\350\346\377\13\0\0\0\377\321\321\321\377\341\337\333\377\340\336\332" ++ "\377\337\336\332\377\336\335\331\377\340\337\333\377\336\335\331\377" ++ "\340\336\332\377\336\335\331\377\340\336\332\377\202\336\334\330\377" ++ "\202\334\332\326\377\7\330\326\322\377\327\326\321\377\325\323\316\377" ++ "\233\225\212\377\0\0\0\377\0\0\0/\0\0\0\11\225\0\0\0\0\3\0\0\0\377\377" ++ "\377\377\377\347\346\343\377\202mlk\377\15\0\0\0\377\231\230\221\377" ++ "\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377\243" ++ "\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242\234" ++ "\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202\235" ++ "\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\225\0" ++ "\0\0\0\6\0\0\0\377\371\371\371\377\344\343\340\377\343\342\337\377\343" ++ "\342\336\377\217\216\214\377\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\225" ++ "\0\0\0\0\26\0\0\0\377\355\355\355\377\341\340\335\377\341\337\334\377" ++ "\341\340\334\377\334\333\327\377\315\314\311\377\273\272\266\377\267" ++ "\266\263\377\266\265\262\377\267\266\263\377\265\265\261\377\266\265" ++ "\261\377\264\262\257\377\263\261\256\377\261\257\254\377\260\256\252" ++ "\377\257\255\252\377\200{q\377\0\0\0\377\0\0\0U\0\0\0""6\202\0\0\0/\3" ++ "\0\0\0*\0\0\0\27\0\0\0\4\225\0\0\0\0\13\0\0\0\377\321\321\321\377\341" ++ "\337\333\377\340\336\332\377\337\336\332\377\336\335\331\377\334\333" ++ "\327\377\327\326\322\377\330\326\322\377\326\325\321\377\330\326\322" ++ "\377\202\326\324\320\377\202\324\322\316\377\7\320\316\312\377\317\316" ++ "\311\377\315\313\306\377\225\217\205\377\0\0\0\377\0\0\0""6\0\0\0\22" ++ "\202\0\0\0\11\2\0\0\0\10\0\0\0\4\226\0\0\0\0\15\0\0\0\377\231\230\221" ++ "\377\243\236\222\377\244\236\223\377\243\235\222\377\243\235\221\377" ++ "\243\235\222\377\241\234\220\377\242\234\220\377\241\234\220\377\242" ++ "\234\220\377\241\233\217\377\241\233\220\377\202\237\231\215\377\202" ++ "\235\227\214\377\5\233\226\212\377gcY\377\0\0\0\377\0\0\0.\0\0\0\11\232" ++ "\0\0\0\0\1\0\0\0^\222\0\0\0\377\3\0\0\0}\0\0\0*\0\0\0\10\232\0\0\0\0" ++ "\3\0\0\0\4\0\0\0\27\0\0\0*\220\0\0\0/\3\0\0\0*\0\0\0\27\0\0\0\4\233\0" ++ "\0\0\0\2\0\0\0\4\0\0\0\10\220\0\0\0\11\2\0\0\0\10\0\0\0\4\377\0\0\0\0" ++ "\377\0\0\0\0\345\0\0\0\0"}; ++ ++ --- gtk+2.0-2.12.1.orig/debian/patches/005_xpmico.patch +++ gtk+2.0-2.12.1/debian/patches/005_xpmico.patch @@ -0,0 +1,19 @@ +Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c +=================================================================== +--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200 ++++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200 +@@ -208,6 +208,14 @@ + + State->HeaderSize = 6 + IconCount*16; + ++ if (State->HeaderSize < 0) { ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("Invalid header in icon")); ++ return; ++ } ++ + if (State->HeaderSize>State->BytesInHeaderBuf) { + guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize); + if (!tmp) { --- gtk+2.0-2.12.1.orig/debian/patches/030_gtkentry_password-char-circle.patch +++ gtk+2.0-2.12.1/debian/patches/030_gtkentry_password-char-circle.patch @@ -0,0 +1,35 @@ +Index: gtk+2.0-2.11.3/gtk/gtkentry.c +=================================================================== +--- gtk+2.0-2.11.3.orig/gtk/gtkentry.c 2007-06-15 20:07:37.000000000 +0200 ++++ gtk+2.0-2.11.3/gtk/gtkentry.c 2007-06-16 14:25:47.000000000 +0200 +@@ -537,7 +537,7 @@ + g_param_spec_unichar ("invisible-char", + P_("Invisible character"), + P_("The character to use when masking entry contents (in \"password mode\")"), +- '*', ++ (gunichar) 0x25CF, + GTK_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, +@@ -1101,7 +1101,7 @@ + + entry->editable = TRUE; + entry->visible = TRUE; +- entry->invisible_char = '*'; ++ entry->invisible_char = (gunichar) 0x25CF; + entry->dnd_position = -1; + entry->width_chars = -1; + entry->is_cell_renderer = FALSE; +@@ -4550,9 +4550,9 @@ + * gtk_entry_set_visibility() has been called to set text visibility + * to %FALSE. i.e. this is the character used in "password mode" to + * show the user how many characters have been typed. The default +- * invisible char is an asterisk ('*'). If you set the invisible char +- * to 0, then the user will get no feedback at all; there will be +- * no text on the screen as they type. ++ * invisible char is a black circle (Unicode character 25CF). If ++ * you set the invisible char to 0, then the user will get no ++ * feedback at all; there will be no text on the screen as they type. + **/ + void + gtk_entry_set_invisible_char (GtkEntry *entry, --- gtk+2.0-2.12.1.orig/debian/rules +++ gtk+2.0-2.12.1/debian/rules @@ -0,0 +1,325 @@ +#!/usr/bin/make -f + +# Debian GNOME Maintainers +DISABLE_UPDATE_UPLOADERS := 1 +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +# get-orig-source target +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := gtk+ + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +STAMP_DIR := debian/stampdir + +PATCH_DIR := debian/patches + +# rules in this debian/rules Makefile can be built concurrently as well as +# upstream rules in Makefile; all $(MAKE) invocations will inherit this flag, +# if you recurse into debian/rules ($(MAKE) +# -f debian/rules in rules), you need to pass a flag to avoid adding "-jX" when +# the childs encounters this line +DEB_BUILD_OPTIONS_PARALLEL ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +MAKEFLAGS += $(if $(DEB_BUILD_OPTIONS_PARALLEL),-j$(DEB_BUILD_OPTIONS_PARALLEL)) + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) + +# ppc64 support; see #386815 +# XXX Should probably be fixed in binutils +# XXX Use LDFLAGS instead of CFLAGS? +# XXX shouldn't we check the arch instead of the CPU? +ifeq ($(DEB_BUILD_GNU_CPU),powerpc64) + CFLAGS += -mminimal-toc +endif + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +# used to fail in directfb code -- but this might be fixed -- currently fails +# in the cups gtkprint backend +#LDFLAGS += -Wl,-z,defs + +DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') +APIVER := 2.0 +SONAME := 0 +SHVER := 2.12.0 + +# earliest version that this release has backwards binary compatibility for +GTK_BINARY_VERSION := 2.10.0 + +# Gtk binary version virtual Provide +GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION) + +# package names +SHARED_PKG := libgtk$(APIVER)-$(SONAME) +COMMON_PKG := libgtk$(APIVER)-common +DEV_PKG := libgtk$(APIVER)-dev +DIRECTFB_PKG := libgtk-directfb-$(APIVER)-$(SONAME) +DIRECTFB_DEV_PKG := libgtk-directfb-$(APIVER)-dev +UDEB_PKG := $(DIRECTFB_PKG)-udeb +DOC_PKG := libgtk$(APIVER)-doc +BIN_PKG := libgtk$(APIVER)-bin +DEBUG_PKG := $(SHARED_PKG)-dbg +EXAMPLES_PKG := gtk$(APIVER)-examples +PIXBUF_PKG := gtk2-engines-pixbuf + +# package groups, used in rule dependencies and in cleanup +BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) +BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) +ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS) + +# list of flavors we build; each gets a builddir, a configure pass (configure +# args are defined below), a build pass, and an install pass (in two steps) +# Note: the shared flavor is required +FLAVORS := directfb shared static + +# list of flavors to run the test suite on +# don't run the directfb testsuite on kfreebsd as it hangs; see #431477 +ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) +CHECK_FLAVORS := $(filter shared static, $(FLAVORS)) +else +CHECK_FLAVORS := $(filter directfb shared static, $(FLAVORS)) +endif + +# build dir for the current flavor; this is only expanded in flavor specific +# targets +builddir = $(buildbasedir)/$* +buildbasedir = $(CURDIR)/debian/build + +# install dir for the current flavor; this is only expanded in flavor specific +# targets +installdir = $(installbasedir)/$* +installbasedir = $(CURDIR)/debian/install + +# relative base directory for all types of modules +MODULES_BASE_PATH := usr/lib/gtk-$(APIVER)/$(GTK_BINARY_VERSION) + +# relative directory to store the generated IM module files +IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d + +# relative directory to store the generated GdkPixbuf loader files +LOADER_FILES_D := $(MODULES_BASE_PATH)/loader-files.d + +# configure flags +common_configure_flags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ + --enable-explicit-deps=yes \ + --enable-test-print-backend +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif +shared_configure_flags := $(common_configure_flags) \ + --with-xinput=yes \ + --enable-shared \ + --disable-static +static_configure_flags := $(common_configure_flags) \ + --with-xinput=yes \ + --with-included-loaders=yes \ + --disable-modules \ + --disable-shared \ + --enable-static +directfb_configure_flags := $(common_configure_flags) \ + --with-xinput=no \ + --enable-shared \ + --disable-static \ + --with-gdktarget=directfb + +# macro computing the list of 'debian/.*" files which have a corresponding +# ".in" file; pass the list of packages in $(1) +dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1))))) + +debian/dh_gtkmodules.1: debian/dh_gtkmodules + cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1 + +patch: $(STAMP_DIR)/patch-stamp + +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir $(STAMP_DIR) + # apply patches + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 + # backup the original files to restore them in the clean target + -test -r config.sub && cp config.sub config.sub.orig + -test -r config.guess && cp config.guess config.guess.orig + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + touch $@ + +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) + +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \ + $(MAKE) -C $(builddir) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) + +$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-% + dh_testdir + # setting LD_LIBRARY_PATH for "make check" might be needed in the + # future, but doesn't seem necessary right now + #LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) + # testsuite failures are ignored + -$(MAKE) -C $(builddir) check + touch $@ + +check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS)) + +$(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-% + mkdir -p $(installdir) + $(MAKE) -C $(builddir) install \ + DESTDIR=$(installdir) + touch $@ + +install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS)) + +# gross kludge to force control generation with the %.in target +clean:: + touch debian/control.in + +debian/%: debian/%.in + dh_testdir + sed \ + -e "s#@SONAME@#$(SONAME)#g" \ + -e "s#@APIVER@#$(APIVER)#g" \ + -e "s#@VERSION@#$(VERSION)#g" \ + -e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \ + -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \ + -e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \ + -e "s#@DEV_PKG@#$(DEV_PKG)#g" \ + -e "s#@DIRECTFB_PKG@#$(DIRECTFB_PKG)#g" \ + -e "s#@DIRECTFB_DEV_PKG@#$(DIRECTFB_DEV_PKG)#g" \ + -e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \ + -e "s#@DOC_PKG@#$(DOC_PKG)#g" \ + -e "s#@BIN_PKG@#$(BIN_PKG)#g" \ + -e "s#@DEBUG_PKG@#$(DEBUG_PKG)#g" \ + -e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \ + -e "s#@PIXBUF_PKG@#$(PIXBUF_PKG)#g" \ + -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \ + -e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \ + -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ + $@.in > $@ + +clean:: debian/control + dh_testdir + dh_testroot + # remove install and build dirs + rm -rf $(installbasedir) + rm -rf $(buildbasedir) + # restore files from backup (before unpatching) + -test -r config.sub.orig && mv -f config.sub.orig config.sub + -test -r config.guess.orig && mv -f config.guess.orig config.guess + # unapply patches, if any + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + -rm -rf .pc + -rm -rf $(STAMP_DIR) + -rm -f $(call dh_subst_files,$(ALL_PKGS)) + -rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 + dh_clean + +maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) + +binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) + dh_testdir + dh_testroot + dh_install -i + dh_installchangelogs -i -N$(BIN_PKG) ChangeLog ChangeLog.* + dh_installdocs -i -N$(BIN_PKG) NEWS NEWS.pre-1-0 README + dh_installman -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 + dh_testdir + dh_testroot + dh_install -s + # empty the dependency_libs in the *.la files + sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la + # we don't need the rpath in the udeb + chrpath -d debian/$(UDEB_PKG)/usr/lib/*directfb*.so.* + # fix permissions of binaries below /usr/lib/$(SHARED_PKG) + for f in update-gdkpixbuf-loaders update-gtk-immodules; do \ + chmod 755 debian/$(SHARED_PKG)/usr/lib/$(SHARED_PKG)/$$f; \ + done + dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.* + dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README + dh_installman -s + # fix the permissions of the development package because it ships + # dh_gtkmodules which we need to invoke in this build + dh_fixperms -p$(DEV_PKG) + # generate a dependency on the Gtk binary version + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules -p$(PIXBUF_PKG) + # generate an IM module file and a GdkPixbuf loader file for the shared + # library + LD_LIBRARY_PATH=debian/$(SHARED_PKG)/usr/lib:$(LD_LIBRARY_PATH) \ + GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \ + GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \ + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \ + -k \ + -p$(SHARED_PKG) + # generate a GdkPixbuf loader config file for the udeb + LD_LIBRARY_PATH=debian/$(UDEB_PKG)/usr/lib:$(LD_LIBRARY_PATH) \ + GTK_QUERYLOADERS=$(installbasedir)/directfb/usr/bin/gdk-pixbuf-query-loaders \ + debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \ + -k \ + -p$(UDEB_PKG) + dh_installexamples -s + dh_link -s + dh_strip -s --dbg-package=$(DEBUG_PKG) + dh_compress -s + dh_fixperms -s -Xusr/lib/$(SHARED_PKG) + dh_makeshlibs -p$(SHARED_PKG) \ + -X$(MODULES_BASE_PATH) \ + -V"$(SHARED_PKG) (>= $(SHVER))" \ + --add-udeb=$(UDEB_PKG) + dh_makeshlibs -p$(DIRECTFB_PKG) \ + -X$(MODULES_BASE_PATH) \ + -V"$(DIRECTFB_PKG) (>= $(SHVER))" \ + --add-udeb=$(UDEB_PKG) + dh_installdeb -s + # override shlibs for libraries from this source before computing + # dependencies of packages generated from this source; we already have + # inter-dependencies expressed manually in the control file, we do not + # need the shlibs to add duplicates + cat debian/*/DEBIAN/shlibs | \ + sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \ + > debian/shlibs.local + dh_shlibdeps -s -N$(UDEB_PKG) + dh_shlibdeps -p$(UDEB_PKG) -l/usr/lib/libcairo-directfb/lib/ + -rm -f debian/shlibs.local + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +list-missing: + perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \ + egrep -v '(\.la|usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2 + +binary: binary-indep binary-arch +.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-0.links.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-0.links.in @@ -0,0 +1 @@ +usr/share/doc/@COMMON_PKG@ usr/share/doc/@SHARED_PKG@ --- gtk+2.0-2.12.1.orig/debian/changelog +++ gtk+2.0-2.12.1/debian/changelog @@ -0,0 +1,1960 @@ +gtk+2.0 (2.12.1-2ubuntu1) hardy; urgency=low + + * debian/control.in: update maintainer information + * debian/rules: + - use the --enable-explicit-deps option again to workaround build issues + + -- Sebastien Bacher Fri, 16 Nov 2007 15:55:48 +0100 + +gtk+2.0 (2.12.1-2) unstable; urgency=low + + * Stop suggesting gtk-engines-pixmap. + * Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom + Parker. If some other packages still rely on having explicit X11 + dependencies, they are buggy and need to be fixed anyway. + * Keep --enable-explicit-deps in the directfb build; otherwise this + breaks any binary linking against it because the rpath isn't passed. + * 033_treeview_resizing.patch: updated patch from Kristian Rietveld. + + Add a new sizing fix for the case where there is a scrollbar. + * 031_gtksearchenginetracker_fixes.patch: added back, only the name + change was fixed upstream. + * 034_gtkcupsutils_type_fix.patch: type-casting fix from Herbert + Valerio Riedel that allows remote printing. Closes: #448071. + * 040_filechooser_single-click.patch: allow a situation where no + shortcut is selected, to avoid issues for keyboard users. + Closes: #448674. + * 042_treeview_single_focus.patch: don't select the focused item for + GTK_SELECTION_SINGLE type treeviews. Allows the fix in + 040_filechooser_single-click.patch to work. + * Conflict against libeel2-2.18. Closes: #443701, #499070. + * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on + startup). + * 021_loader-files-d.patch: enclose process_module_file in correct + #ifdef's. + * 040_filechooser_single-click.patch: filter out duplicate entries in + bookmarks. This avoids a situation where the selection is changed to + the duplicate during DnD, causing an assertion error. + Closes: #447279. + + -- Josselin Mouette Sun, 04 Nov 2007 16:22:31 +0100 + +gtk+2.0 (2.12.1-1) unstable; urgency=low + + * New upstream stable release; no API change; bug fixes and translation + updates. + - Drop patches 031_gtksearchenginetracker_fixes, + 080_from_bugzilla_workaround_eclipse_crash, 081_icon-cache-validate + fixed upstream. + - Refresh patches 033_treeview_resizing, 040_filechooser_single-click to + apply cleanly. + - Drop patches 060_opening-display-by-env-error-message, + 065_gtk-filechooser-locale-time merged upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Chech the exit status of close() in dh_gtkmodules; closes: #427654. + * New patch, 060_ignore-random-icons, don't list images from unknown + directories in icon cache; closes: #443571, #443574, #444285, #446188. + + -- Loic Minier Sun, 21 Oct 2007 22:05:42 +0200 + +gtk+2.0 (2.12.0-3) unstable; urgency=low + + [ Josselin Mouette ] + * 031_gtksearchenginetracker_fixes.patch: new patch. + + Use libtrackerclient.so.0 (closes: #443403). + + Check that tracker actually works before using it. + + [ Loic Minier ] + * Conflict with libwxgtk2.6-0 << 2.6.3.2.2-1 to prevent the migration of gtk + to testing until the wxwidgets2.6 fix is there too; see #441766 and + friends. + + [ Josselin Mouette ] + * Conflict with glabels << 2.1.3-3 to prevent a segmentation fault + from showing up. + + [ Loic Minier ] + * Cleanup whitespace. + * Add comments to relibtoolizing patch, 070_mandatody-relibtoolize, to + mention the age of the upstream libtool in released tarballs which make + relibtoolizing important for hurd-i386; GNOME #484426; Debian #445001. + + [ Josselin Mouette ] + * 020_immodules-files-d.patch, 021_loader-files-d.patch: read the + GDK_PIXBUF_MODULE_FILE and GTK_IM_MODULE_FILE variables before the + Debian directories. Thanks Thadeu Lima de Souza Cascardo. + Closes: #439004. + + [ Loic Minier ] + * New patch, 080_from_bugzilla_workaround_eclipse_crash, fixes crash when + displaying tooltips in SWT apps such as Eclipse; GNOME #410194; LP + #128232; closes: #445613. + * New patch, 060_opening-display-by-env-error-message, fixes error message + on opening of display to include the display when it was set via the + DISPLAY env var; GNOME #486636; closes: #283076. + * New patch, 065_gtk-filechooser-locale-time, fixes conversion of localized + week days in non-UTF-8 locales in the file chooser; GNOME #482504; + closes: #444927. + * Enable 091_workaround_no_gtk_init_incorrect_display to allow the non-free + Flash plugin to work for users of non-Gtk browsers; please do bug Adobe + about this; closes: #443661, #440165. + * New patch, 071_fix_gdk_window_null_crasher, fixes potential crashes in + IceWeasel's print preview dialog; GNOME #482531; LP #144326; found in the + Ubuntu package. + + -- Loic Minier Sun, 14 Oct 2007 20:46:29 +0200 + +gtk+2.0 (2.12.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Add a conflict against openoffice.org-core (<< 2.2.1-8). + Closes: #439256. + + [ Loic Minier ] + * Upload to unstable; drop check-dist include. + + -- Loic Minier Thu, 20 Sep 2007 11:59:26 +0200 + +gtk+2.0 (2.12.0-1) experimental; urgency=low + + [ Alan Baghumian ] + * New upstream stable release + - Regenerated 070_mandatory-relibtoolize.patch + * Added 081_icon-cache-validate.patch, GNOME #476342 + + [ Loic Minier ] + * Refresh patches 033_treeview_resizing and 040_filechooser_single-click to + apply cleanly. + * Drop patch 080_from_svn_fix_dangling_tooltip, merged upstream. + * Bump shlibs to 2.12.0 in the new upstream release for the addition of + gdk_window_thaw_toplevel_updates_libgtk_only() and + gdk_window_freeze_toplevel_updates_libgtk_only() to the ABI. + * Add disabled patch 091_workaround_no_gtk_init_incorrect_display, taken + from the Ubuntu package; it works around broken applications missing a + call to gtk_init() but the breakage should better be exposed now so that + applications can be fixed in time for release. + + -- Loic Minier Tue, 18 Sep 2007 22:30:39 +0200 + +gtk+2.0 (2.11.6-1) experimental; urgency=low + + [ Loic Minier ] + * Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch + by Petr Salinger; closes: #431477. + + [ Josselin Mouette ] + * Move manual pages of binaries in /usr/sbin to section 8. + * update-icon-caches: new script, updates the icon caches in a given + list of directories. It is meant to be used by packages shipping + icons, in the postinst/postrm. + For transition purposes, icon caches are currently updated but not + created if they don't already exist. + * Install this script and its manual page in libgtk2.0-bin. + + [ Loic Minier ] + * Call dh_shlibdeps separately for the udeb and add a + -l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is + found. + * New upstream development release, with API additions. + - Bump up shlibs to >= 2.11.6. + - Refresh patches 006_proper-directfb-modules, + 015_default-fallback-icon-theme, 040_filechooser_single-click to apply + cleanly. + - Update patches 009_gtk-export-filechooser, 033_treeview_resizing to + apply; update relibtoolizing patch, 070_mandatory-relibtoolize. + * Update patch 009_gtk-export-filechooser: + - gtk/Makefile.am (gtk_private_h_sources, gtk_semi_private_h_sources): + export gtkquery.h and gtksearchengine.h as semi-private. + - gtk/gtkquery.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef guard. + - gtk/gtksearchengine.h: add GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED #ifdef + guard. + + -- Loic Minier Tue, 24 Jul 2007 10:43:23 +0200 + +gtk+2.0 (2.11.5-1) experimental; urgency=low + + * New upstream development release, with API additions; the new API may + still change incompatibly, especially the tooltips API. + - Bump shlibs to >= 2.11.5. + - Bump up libpango1.0-dev build-dep to >= 1.17.3. + - Ship the new gtk-builder-convert Python script to convert Glade files to + GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a + ${python:Depends} but Recommend python (>= 2.4) to avoid pulling python + on buildds; the script requires python >= 2.4, but this is not enforced + in the dependencies. + - Refresh patches 001_static-linking-dont-query-immodules, + 006_proper-directfb-modules, 040_filechooser_single-click to apply + cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Use -s instead of -a in arch-specific dh_* calls. + + -- Loic Minier Tue, 03 Jul 2007 13:01:25 +0200 + +gtk+2.0 (2.11.4-1) experimental; urgency=low + + [ Josselin Mouette ] + * 040_filechooser_single-click.patch: fix the patch to apply cleanly + again, and enable it. + + [ Loic Minier ] + * Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens; + closes: #386815. + * New upstream development release, with API additions; the new API may + still change incompatibly. + - Bump shlibs to >= 2.11.3. + - Refresh patches 006_proper-directfb-modules, + 008_implicit_pointer_conversion_gdkgc_directfb, + 009_gtk-export-filechooser, 030_gtkentry_password-char-circle, + 033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs + to apply cleanly. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + * Add a debian/dh_listmissing.pl script based on dh_install snippets but + customized to handle multiple source installation dirs which can report + files which were not installed to a package. + * New list-missing rule to list files which were not installed to a package + calling debian/dh_listmissing.pl. + * Also depend on libxcomposite-dev, libxdamage-dev; thanks Sébastien Bacher. + * Ship etc/gtk-2.0/im-multipress.conf in the shared library. + * New upstream development release, with incompatible API changes; the new + API may still change incompatibly. + - Bump shlibs to >= 2.11.4. + - Refresh relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up libglib2.0-dev build-dep to >= 2.11.5. + + -- Loic Minier Wed, 20 Jun 2007 10:47:42 +0200 + +gtk+2.0 (2.11.2-1) experimental; urgency=low + + * New upstream release series; these are development releases, the new API + may still change incompatibly. + - Target at experimental; include check-dist. + - Bump shlibs to >= 2.11.2. + - Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico, + 009_gtk-export-filechooser, 015_default-fallback-icon-theme, + 033_treeview_resizing, 041_ia32-libs to apply cleanly. + - Update patch 021_loader-files-d to apply with the upstream G_MODULE + changes and the support for included modules. + - Update patch 030_gtkentry_password-char-circle to apply. + - Drop patch 031_cursor-blinking-timeout, merged upstream. + - Disable 040_filechooser_single-click for now as it doesn't apply cleanly + and doesn't seem critical; add a description and cross-refs. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + - Bump up build-deps to libglib2.0-dev >= 2.13.1, libpango1.0-dev >= + 1.15.3, gtk-doc-tools >= 1.6. + - Build-dep on libxcomposite-dev for composite support. + - Build-dep on libxdamage-dev for damage support. + - Enable test print backend by passing --enable-test-print-backend to + configure. + * Update 007_implicit_pointer_conversion_gdkdrawable_directfb to include + cairo.h instead of defining the directfb feature manually. + * New patch, 006_proper-directfb-modules, fixes pkg-config modules included + to build directfb stuff, uncovered by the change in + 007_implicit_pointer_conversion_gdkdrawable_directfb; refresh + relibtoolizing patch. + * Add cross-refs to patch headers. + * Clean up CFLAGS. + * Prepare passing -z defs via LDFLAGS in the future. + + -- Loic Minier Wed, 13 Jun 2007 16:57:47 +0200 + +gtk+2.0 (2.10.13-1) unstable; urgency=low + + * Bump Conflicts to iiimf-client-gtk << 12.3.91-4. + * Upload to unstable; drop check-dist include. + * New upstream release; no API change. + - Drop patches 011_directfb-build-fixes-from-head, + 013_gdkproperty-directfb-strdup, 032_filechooser-sizing, + 090_capslock-numlock-im-thai merged upstream. + - Update relibtoolizing patch, 070_mandatory-relibtoolize. + + -- Loic Minier Wed, 13 Jun 2007 10:06:49 +0200 + +gtk+2.0 (2.10.12-3) experimental; urgency=low + + * Use printf instead of echo in dh_gtkmodules to write to write data to + files in complex_doit() calls as dash's echo will always honor escape + sequences. + * Conflict with gtk2-engines-ubuntulooks (<= 0.9.11-1). + * New patch, 009_gtk-export-filechooser, exports some filechooser API for + use in maemo / Hildon; from Nokia, taken from the Ubuntu package; update + patch 032_filechooser-sizing to apply cleanly; bump shlibs to 2.10.12-3; + update patch 070_mandatory-relibtoolize. + * Kill patch 025_dfb-window-destroy-leak from source tree as well now. + * Include check-dist to prevent accidental uploads to unstable. + + -- Loic Minier Thu, 07 Jun 2007 00:13:00 +0200 + +gtk+2.0 (2.10.12-2) unstable; urgency=low + + [ Loic Minier ] + * New patch, 15_default-fallback-icon-theme, sets the default + gtk-fallback-icon-theme to "gnome"; closes: #421353. + * Also honor parallel=n in DEB_BUILD_OPTIONS. + + [ Josselin Mouette ] + * 032_filechooser-sizing.patch: patch from Carlos Garnacho in bugzilla + #420285, committed in trunk. Fixes (among many other things) infinite + flickering with some window managers (closes: #420021). + * Refresh other patches. + + [ Loic Minier ] + * New patch 090_capslock-numlock-im-thai, fixes Thai input method when + NumLock/CapsLock is on; thanks Theppitak Karoonboonyanan; GNOME #438261; + closes: #414698. + * Re-add patch 031_cursor-blinking-timeout to patch series. + + [ Josselin Mouette ] + * 033_treeview_resizing.patch: fix column resizing in GtkTreeView when + there is an expander column. See bugzilla #316087. + + -- Josselin Mouette Fri, 18 May 2007 19:02:20 +0200 + +gtk+2.0 (2.10.12-1) unstable; urgency=low + + * Bump Conflicts to gtk-im-libthai <= 0.1.4-2. + * Document that 2.10.11-2 bumped the conflict on scim-gtk2-immodule to <= + 1.4.4-7. + * Post-transition bump of conflicts to gtk2-engines-wonderland << 1.0-4, + imhangul (<< 0.9.13-5), gcin (<< 1.3.4-2), gtk-im-libthai (<< 0.1.4-3), + scim-gtk2-immodule (<< 1.4.4-8), uim-gtk2.0 (<< 1:1.4.1-3), + gtk2-engines-cleanice (<< 2.4.0-1.1), gtk2-engines-magicchicken + (<< 1.1.1-7.1), gtk2-engines-qtpixmap (<< 0.28-1.2), libginspx0 + (<< 20050529-1.1), tamil-gtk2im (<< 2.2-4.4), gtk2-engines-xfce + (<< 2.4.0-1), scim-bridge-client-gtk (<< 0.4.10-1.1), swf-player + (<< 0.3.6-2.3), gtk-qt-engine (<< 1:0.8~svn-rev36-1). + * Let the udeb provide the Gtk+ module ABI (binver); closes: #419592. + * Add a -k flag to dh_gtkmodules, matching the change in dh_pangomodules. + * Use this new flag for the udeb and the shared library packages. + * Add ${misc:Depends}. + * Drop "libtool_is_fool" snippet patching hardcode_libdir_flag_spec and + archive_cmds which is probably dangerous with newer libtools. + * Drop patch 000_gtk+-2.0.6-exportsymbols which made all libs export way too + many symbols and hence was dangerous; closes: #327652. + - Update patch 070_mandatory-relibtoolize. + * Fix description of the -dbg package. + * New upstream release; no ABI change. + - Refresh patches 011_directfb-build-fixes-from-head and + 040_filechooser_single-click. + - Update relibtoolizing patch. + + -- Loic Minier Thu, 03 May 2007 15:13:54 +0200 + +gtk+2.0 (2.10.11-2) unstable; urgency=low + + [ Loic Minier ] + * Bump libwmf conflicts to << 0.2.8.4-5. + * Fix control generation. + * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating + its logic; build-dep on gnome-pkg-tools >= 0.11. + * Run "make check" test suite for all flavors except if DEB_BUILD_OPTIONS + contains the "nocheck" keyword; ignore failures. + * Add support for DEB_BUILD_OPTIONS_PARALLEL. + * Re-enable FAQ and Tutorial which were fixed upstream at some point; update + installation dirs. + * Call dh_installman -a. + + [ Josselin Mouette ] + * 040_filechooser_single-click.patch: remove shortcut-related actions + in the response callback. This fixes the annoying bug where you need + to click twice on "save" after clicking on a shortcut. + + [ Loic Minier ] + * Initialize CFLAGS to -Wall -g; pass debian/rules' CFLAGS and LDFLAGS to + configure, doh! + * Document that 2.10.8 (and 2.10.9) fixed CVE-2007-0010. + * Stop shipping engines in the udeb again. + * New patch, 040_ia32-libs.patch, for ia32-libs support via ia32-libs-gtk; + based on a patch by Goswin von Brederlow with the following changes: a) + use .32 and .64 suffixes in all cases (compatible with Ubuntu), b) fix + typo, c) use g_file_test() instead of g_access(); does not cover module + loading via env vars; closes: #406453. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Add Conflicts on gcin (<= 1.3.4-1), gtk-qt-engine (<= 1:0.8~svn-rev31-3), + iiimf-client-gtk (<= 12.3.91-3), libginspx0 (<= 20050529-1), + scim-bridge-client-gtk (<= 0.4.10-1), iiimgcf (<= 11.4.1870-7). + * Bump Conflicts to gtk2-engines-gtk-qt << 1:0.7-2, imhangul <= + 0.9.13-3.1, libgnomeui-0 <= 2.14.1-3, swf-player <= 0.3.6-2.2, + tamil-gtk2im <= 2.2-4.3, uim-gtk2.0 <= 1:1.2.1-9, scim-gtk2-immodule (<= + 1.4.4-7). + * Drop docbook-utils and linuxdoc-tools-text from the build-deps. + + -- Loic Minier Fri, 13 Apr 2007 22:25:49 +0200 + +gtk+2.0 (2.10.11-1) experimental; urgency=low + + * Move build and install base dirs to debian/build and debian/install + instead of debian/tmp/build and debian/tmp/install. + * Cleanup rules. + * Make debian/control PHONY. + * Use @DOC_PKG@ to point at the HTML doc as well. + * Tune udeb description. + * New upstream releases. + - Drop patch 003_default_fallback_icon_theme, upstream added a fallback on + hicolor. + - Drop patch 015_gdkmain-x11_button-mask.patch, merged upstream. + - Refresh patches. + - Relibtoolize. + * Remove 031_cursor-blinking-timeout from patch series as it causes a + regression in the Thai IM; closes: #414698. + + -- Loic Minier Wed, 14 Mar 2007 14:11:58 +0100 + +gtk+2.0 (2.10.9-1) experimental; urgency=low + + [ Josselin Mouette ] + * 024_filechooser_single-click.patch: + + Monitor selection changes instead of monitoring the cursor. + + Miscellaneous fixes. + * 015_gdkmain-x11_button-mask.patch, stolen from upstream SVN: fix the + issue of resizing columns needing two tries in some cases + (closes: #406906). + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Rename patch 023_gtkentry_password-char-circle to + 030_gtkentry_password-char-circle. + * Rename patch 024_filechooser_single-click to 040_filechooser_single-click. + * New patch, 031_cursor-blinking-timeout.patch, to stop blinking the cursor + after a configurable timeout; helps saving energy by not waking up all Gtk + processes with a cursor continuously; from upstream SVN r16366 (trunk); + GNOME #353670, #352442. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libglib2.0-dev of libgtk2.0-dev dep to >= 2.12.0 as well; thanks + Marc Brockschmidt. + + [ Josselin Mouette ] + * New upstream release. + - Fixes CVE-2007-0010; RedHat #218755, #218932. + * Remove patches integrated upstream: + + 009_directfb_build.patch + + 010_fix-stuc-vs-stub-typo.patch + + 012_missing-stub-files.patch + + 014_gtktreeview_missing-icons.patch + * Refresh patches: + + 020_immodules-files-d.patch + + 031_cursor-blinking-timeout.patch + + 040_filechooser_single-click.patch + + 070_mandatory-relibtoolize.patch + + -- Josselin Mouette Thu, 1 Mar 2007 21:50:34 +0100 + +gtk+2.0 (2.10.7-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + * 022_gtkcupsutils_multipage.patch: removed, integrated upstream. + * Regenerate 070_mandatory-relibtoolize.patch. + * 014_gtktreeview_missing-icons.patch: update patch with the upstream + fix that was committed. + * 009_directfb_build.patch: new patch, fix typo in configure.in for + the directfb build. + + -- Josselin Mouette Wed, 10 Jan 2007 00:03:03 +0100 + +gtk+2.0 (2.10.6-5) experimental; urgency=low + + [ Loic Minier ] + * Really update gtk2-engines conflict to << 2.8.2-2. + + [ Josselin Mouette ] + * 022_gtkcupsutils_multipage.patch: new patch, stolen upstream. + Properly pass multi-value options to cups (closes: #404867). + * 023_gtkentry_password-char-circle.patch: new patch to replace stars by + black circles in password fields; thanks Sven Arvidsson; found in Fedora + and OpenSuse (closes: #401568). + * 024_filechooser_single-click.patch: patch from UHU-Linux to make the + side pane in the filechooser usable with a single click + (closes: #405296). + + -- Josselin Mouette Wed, 3 Jan 2007 00:14:28 +0100 + +gtk+2.0 (2.10.6-4) experimental; urgency=low + + [ Loic Minier ] + * Update gtk2-engines conflict to << 2.8.2-2. + + [ Josselin Mouette ] + * 014_gtktreeview_missing-icons.patch, stolen from bugzilla: fix + missing icon in "save as" filechooser dialogs. + + -- Josselin Mouette Thu, 30 Nov 2006 20:42:44 +0100 + +gtk+2.0 (2.10.6-3) experimental; urgency=low + + [ Loic Minier ] + * Update gtk2-engines conflict to <= 2.8.1-4. + * Update gtk2-engines-pixbuf conflict to <= 2.10. + * Bump up libcairo-directfb2-dev build-dep to 1.2.4-4. + + [ Josselin Mouette ] + * 070_mandatory-relibtoolize.patch: recreate with autoconf 2.59, to + avoid the AM_GLIB_DEFINE_LOCALEDIR bug (making GTK+ applications + untranslated). + * Make gtk2-engines conflict less strict. + + -- Josselin Mouette Sat, 11 Nov 2006 00:04:46 +0100 + +gtk+2.0 (2.10.6-2) experimental; urgency=medium + + * New patch, 013_gdkproperty-directfb-strdup, to g_strdup() strings returned + by gdk_atom_name(); GNOME #357611; thanks Attilio Fiandrotti. + + -- Loic Minier Sun, 8 Oct 2006 16:03:08 +0200 + +gtk+2.0 (2.10.6-1) experimental; urgency=low + + * New upstream release. + - Drop patch 013_stock-icons-typo-in-rm, merged upstream. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Wed, 4 Oct 2006 11:41:37 +0200 + +gtk+2.0 (2.10.5-1) experimental; urgency=low + + * Fail if dh_gtkmodules called query helpers on module files, but no module + could be written to the module file. + * Parse stderr as well as the stdout of query helpers and bail out if + g_module_open(); suggest adjusting LD_LIBRARY_PATH. + * Fix some probably harmless typos. + * New patch, 030_gtkfilechooserbutton-update-combo-box-null-base-path, to + avoid a segfault when opening some filechoosers; thanks Sam Morris for + reporting and testing; from CVS HEAD; GNOME #358405; closes: #390231. + * New upstream release; no API change. + - Drop patch 030_gtkfilechooserbutton-update-combo-box-null-base-path, + merged upstream. + - New patch, 013_stock-icons-typo-in-rm, to fix a typo in gtk/Makefile.am; + GNOME #358931. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Mon, 2 Oct 2006 16:59:18 +0200 + +gtk+2.0 (2.10.4-1) experimental; urgency=low + + * New upstream release; no API change. + - Switch from tar-in-tar and sys-build to regular source and quilt + patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR) + and @TOP_SRC_DIR@ which isn't needed anymore. + - Refresh patch 021_loader-files-d. + - New patch, 010_fix-stuc-vs-stub-typo, to replace "stuc" with "stub" in + gtk/Makefile.am; from HEAD, not commited in the gtk-2-10 branch. + - New patch, 011_directfb-build-fixes-from-head, to backport directfb + build fixes; from HEAD not commited in the gtk-2-10 branch. Thanks + Attilio Fiandrotti for pointing me at the actual log entry. + - New patch, 012_missing-stub-files, to add gtk/gtkplug-stub.c and + gtksocket-stub.c missing from the tarball; from the gtk-2-10 branch. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Sun, 24 Sep 2006 12:24:31 +0200 + +gtk+2.0 (2.10.3-3) experimental; urgency=medium + + * Update patch 021_loader-files-d to not warn about missing module files or + unreadable files as is already the case for immodules; see #388450 for + more background. + * Fix awful typo which broke generation of the udeb shlibs and which I + didn't notice with debdiff; thanks Frans Pop. + * Drop debian/docs.in and pass the list of files to dh_installdocs instead; + should fix the missing README and NEWS files. + + -- Loic Minier Thu, 21 Sep 2006 17:35:16 +0200 + +gtk+2.0 (2.10.3-2) experimental; urgency=low + + * Drop obsolete --with-cairo-backend configure flag. + * Make update-gtk-immodules and update-gtk-immodules no-ops, to avoid + modules to recreate the /etc modules files on upgrades or by mistake; + remove the generated module files in /etc on upgrades. closes: #388450 + * Merge 2.8.20-2; drop patch 009_revert-gdkdrawable-directfb, merged + upstream. + + -- Loic Minier Wed, 20 Sep 2006 22:17:30 +0200 + +gtk+2.0 (2.10.3-1) experimental; urgency=low + + * New upstream releases; with API additions in the filesystem modules API, + probably only used by gtk-demo, and in the quartz gdk backend, not used in + Debian. + - Bump shlibs to >= 2.10.3. + - Drop patch 009_configurable-cairo-backend-module, it was not really + required to select a cairo backend dynamically as the backend is always + cairo-directfb for a directfb gdk. + - Drop patch 010_gdk-require-cairo-module, merged upstream. + - Drop patch 011_gdk-directfb-cvs-changes, this release includes the + changes that were pulled back then. + - Relibtoolize: update patch 070_mandatory-relibtoolize. + + -- Loic Minier Tue, 19 Sep 2006 20:42:38 +0200 + +gtk+2.0 (2.10.1-2) experimental; urgency=low + + * Drop obsolete scary warning in 2.10.1-1. + * Drop update-gtk-immodules and update-gdkpixbuf-loaders calls from + libgtk2.0-0's postinst, this isn't needed for backwards compatibility. + * Use /usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders and + /usr/lib/libgtk2.0-0/gtk-query-immodules-2.0 instead of + /usr/bin/gdk-pixbuf-query-loaders and /usr/bin/gtk-query-immodules-2.0 in + dh_gtkmodules. + + -- Loic Minier Tue, 19 Sep 2006 16:40:22 +0200 + +gtk+2.0 (2.10.1-1) experimental; urgency=low + + * Add a missing x11proto-xext-dev build-dep for X SYNC checks. + * Add a missing libatk1.0-dev (>= 1.9.0) build-dep for ATK. + * Replace GTK_BINARY_VERSION in debian/*.in to set the binary version of + binary modules; it is set via debian/scripts/vars and currently in use in + update-gdkpixbuf-loaders.in and update-gtk-immodules.in. + * Remove fake support for version argument from update-gdkpixbuf-loaders and + update-gtk-immodules. + * New upstream development releases with API additions, and non-public API + changes and removals. + - Target at experimental. + - Update copyright from AUTHORS. + - Update upstream URL. + - Bump up libglib2.0-dev build-dep to >= 2.12.0. + - Add a libdirectfb-dev (>= 0.9.24) build-dep for DirectFB. + - Add a libcupsys2-dev (>= 1.2) build-dep for CUPS printing backend. + - Bump shlibs to >= 2.10.0. + - Update list of docs to ship; now includes NEWS. (Closes: #384225) + - Update watch file to track stable releases and use HTTP. + - Set GTK_BINARY_VERSION to 2.10.0. + - Add or bump Conflicts with packages shipping modules for the 2.4.0 + binary version of Gtk: gtk2-engines-wonderland <= 1.0-3, + gtk2-engines-cleanice <= 2.4.0-1, gtk2-engines <= 1:2.6.10-2, + gtk2-engines-magicchicken <= 1.1.1-7, gtk2-engines-pixbuf <= 2.8.20-1, + gtk2-engines-gtk-qt <= 1:0.7-1, gtk2-engines-qtpixmap <= 0.28-1.1, + librsvg2-common <= 2.14.4-2, gtk2-engines-xfce <= 2.3.90.2-1, + libgnomeui-0 <= 2.14.1-2, tamil-gtk2im <= 2.2-4.2, imhangul <= 0.9.13-3, + iiimgcf <= 11.4.1870-7.3, scim-bridge <= 0.2.4-1, scim-gtk2-immodule <= + 1.4.4-4, gtk-im-libthai <= 0.1.4-1, uim-gtk2.0 <= 1:1.2.1-3, libwmf-dev + <= 0.2.8.4-2, libwmf0.2-7 <= 0.2.8.4-2, swf-player <= 0.3.6-2.1. + - Replace 001_gtk+-2.2.0-buildfix-immodule patch with + 001_static-linking-dont-query-immodules which has more chances to be + merged upstream; see GNOME #346531. + - Drop 006_gtk+-2.8.17-directfb patch, merged upstream. + - Refresh patches: 000_gtk+-2.0.6-exportsymbols, + 003_default_fallback_icon_theme, + 004_gtk+-ximian-gtk2-filesel-navbutton-5, + 007_implicit_pointer_conversion_gdkdrawable_directfb. + - Update 070_mandatory-relibtoolize with libtoolize --force --copy && + aclocal-1.7 -I m4macros && autoconf && automake-1.7. + - New patch, 002_static-linking-dont-build-perf, to avoid building the + perf measurement tools in static builds; see GNOME #346559; needs + the 001_gtk+-2.2.0-buildfix-immodule patch. + - New patch, 009_configurable-cairo-backend-module, to add a new + --with-cairo-backend flag which will select a cairo-$backend.pc + pkg-config module instead of the default of cairo.pc; see GNOME #351509. + - Configure with --with-cairo-backend=directfb for the dfb build. + - New patch, 010_gdk-require-cairo-module, to require the Cflags and Libs + from the cairo-directfb module (as $cairo_module); see GNOME #351519. + - New patch, 011_gdk-directfb-cvs-changes, backport of CVS only build + fixes to permit compilation against directfb 0.9.25.1. + * Fix bashishms in debian/rules. (Closes: #385473) + * Generate a Provides: gtk2.0-binver-@BINVER@ in libgtk2.0-@SONAME@ to track + the binary version of Gtk and to permit Gtk modules to depend on it. + * Define the flags for each flavor (shared, static, and udeb) in Makefile + vars and share the common flags. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Stop shipping *.la and *.a files of modules (all module types). + * Move GTK_BINARY_VERSION back to rules. + * Use GTK_BINVER_DEP instead of BINVER. + * Build flavors out-of-tree; saves 25% of required build space (315 MB) and + some build time / IO load; this clutters the headers a little (full build + path is mentionned instead of ".") though. + * Rewrite and cleanup the build process completely. + * Install the full set of pkg-config files from the dfb flavor in + /usr/lib/pkgconfig/libgtk-directfb-2.0; to use this feature, set + PKG_CONFIG_PATH while invoking pkg-config (or configure); the + /usr/lib/pkgconfig/*directfb*.pc files will be removed when Debian sources + have been converted. + * In the same spirit, gdkconfig.h is in /usr/lib/gtk-2.0/include/directfb; + to use it, prepend -I/usr/lib/gtk-2.0/include/directfb to CFLAGS. + * Fix generation of /etc/gtk-2.0/gdk-pixbuf.loaders for the udeb. + (Closes: #382435) + * Build-depend on libcairo-directfb2-dev >= 1.2.4-2 to get PDF/PS support in + the directfb flavor of libcairo. + * Recommend the linked source packages in libgtk2.0-doc instead of simply + suggesting them. + * Rewrite update-gdkpixbuf-loaders and update-gtk-immodules. + * Drop double libatk1.0-dev build-dep. + * Empty the dependency_libs in the *.la files of libgtk2.0-dev. + * New immodule files handling with *.immodules files below + /usr/lib/gtk-2.0//immodule-files.d. + - New patch, 020_immodules-files-d, to split the module search path on + ":", as is done in Pango, prepend + /usr/lib/gtk-2.0//immodule-files.d to the search path, + and to read all *.immodules files when a directory is encountered in the + search path. + - Pre-generate + /usr/lib/gtk-2.0//immodule-files.d/libgtk2.0-0.immodules + for the shared library. + - Continue generating /etc/gtk-2.0/gtk.immodules until packages are + updated. + * Add the libpixmap engine to the udeb for the new Bladr GTK theme for g-i. + * New loader files handling with *.loaders files below + /usr/lib/gtk-2.0//loaders-files.d. + - New patch, 021_loader-files-d, to split the module search path on + ":", as is done in Pango, prepend + /usr/lib/gtk-2.0//loader-files.d to the search path, + and to read all *.loaders files when a directory is encountered in the + search path. + - Pre-generate + /usr/lib/gtk-2.0//loader-files.d/libgtk2.0-0.loaders + for the shared library and libgtk-directfb-2.0-0-udeb.loaders for the + udeb. + - Continue generating /etc/gtk-2.0/gdk-pixbuf.loaders until packages are + updated. + - This particular patch uses two ugly workarounds and needs work before + being sent upstream. + * New Debhelper-based command, dh_gtkmodules, to create module files for IM + modules and GdkPixbuf loaders; it will still add a dependency on the + binary version of Gtk for other modules. + * Make use of the new dh_gtkmodules during the build (override the path to + gtk-query-immodules-2.0 and gdk-pixbuf-query-loaders. + * Add ${misc:Depends} to gtk2-engines-pixbuf. + + -- Loic Minier Tue, 19 Sep 2006 15:13:38 +0200 + +gtk+2.0 (2.8.20-2) unstable; urgency=low + + * New patch, 009_revert-gdkdrawable-directfb, to revert a fix for Italic + letters which caused ugly unneeded horizontal/vertical lines; thanks + Davide Viti. (Closes: #386860) + * Fix typo, install-dfb depends on build-dfb, not build-shared. + * Fix typo (DFB_PKGFIR versus DFB_PKGDIR), use the BUILD_DFB_DIR version of + gdk-pixbuf-query-loaders, and set LD_LIBRARY_PATH to the udeb's /usr/lib; + should fix the empty /etc/gtk-2.0/gdk-pixbuf.loaders. (Closes: #382435) + * Ship all engines of the DirectFB build in the udeb, that is + engines/libpixmap.so. + + -- Loic Minier Wed, 20 Sep 2006 21:36:04 +0200 + +gtk+2.0 (2.8.20-1) unstable; urgency=low + + * New upstream releases; no API changes. + + -- Loic Minier Mon, 14 Aug 2006 16:52:04 +0200 + +gtk+2.0 (2.8.18-7) unstable; urgency=medium + + * Rename patches to reflect the order in which they are applied: + - 000_gtk+-2.2.0-buildfix-immodule to 001_gtk+-2.2.0-buildfix-immodule + - 001_default_fallback_icon_theme to 003_default_fallback_icon_theme + - 001_gtk+-ximian-gtk2-filesel-navbutton-5 to + 004_gtk+-ximian-gtk2-filesel-navbutton-5 + - 002_xpmico to 005_xpmico + - 003_gtk+-2.8.17-directfb to 006_gtk+-2.8.17-directfb + - 005_implicit_pointer_conversion to + 007_implicit_pointer_conversion_gdkdrawable_directfb + - 006_implicit_pointer_conversion to + 008_implicit_pointer_conversion_gdkgc_directfb + * Change the 000_gtk+-2.0.6-exportsymbols, and + 001_gtk+-2.2.0-buildfix-immodule patches to only patch the + non-autogenerated files. + * Rename 004_reautoconf to 070_mandatory-relibtoolize; update it for the + previous changes; use an older autoconf version to work around a bug + in the glib-gettext macro which broke localization in dialog boxes; thanks + Mike Hommey. + + -- Loic Minier Sun, 6 Aug 2006 11:49:48 +0200 + +gtk+2.0 (2.8.18-6) unstable; urgency=low + + * 005_implicit_pointer_conversion.patch: patch from Dann Frazier to + fix an implicit pointer conversion error on 64-bit architectures + (closes: #381081). + * 006_implicit_pointer_conversion.patch: fix another implicit + conversion by allowing deprecated functions in the necessary header + file (closes: #381082). + + -- Josselin Mouette Wed, 2 Aug 2006 14:48:54 +0200 + +gtk+2.0 (2.8.18-5) unstable; urgency=low + + [ Loic Minier ] + * Set Priority to extra to sync with overrides. + + [ Josselin Mouette ] + * Set priority to extra for the udeb. + * Bump build dependencies for libcairo to the stable version. + * Lots of cleanup in debian/rules. + * Rename directfb packages to libgtk-directfb-2.0-*. + * Move .a and .la files from the engine package to the development + package. + + Add appropriate Replaces: field. + + -- Josselin Mouette Sun, 30 Jul 2006 18:21:37 +0200 + +gtk+2.0 (2.8.18-4) experimental; urgency=low + + * Bump libcairo build dependencies. + * Only install the PNG loader in the udeb. + * Rebuild against a fixed glib. + + -- Josselin Mouette Mon, 26 Jun 2006 22:34:27 +0200 + +gtk+2.0 (2.8.18-3) experimental; urgency=low + + * 003_gtk+-2.8.17-directfb.patch: new patch, bringing a new directfb + backend. + * 004_reautoconf.patch: new patch, result of "libtoolize --force + --copy; aclocal; autoheader; automake -acf; autoconf; rm -rf + autom4te.cache" with the previous patches applied. + * Make 3 new packages: libgtk+2.0-directfb0-udeb, + libgtk+2.0-directfb-dev and libgtk+2.0-directfb0. + * Add a new build flavour for directfb (only the shared version). + * Use chrpath to remove the rpath in the udeb. + * Generate a fake shlibs.local to handle all intra-gtk dependencies by + hand. + * Switch to debhelper compatibility mode 5 and require 5.0.22. + * Standards-version is 3.7.2. + * Break the circular dependency between libgtk2.0-0, libgtk2.0-bin and + libgtk2.0-common (closes: #309604). + + Remove libgtk2.0-common dependency on libgtk2.0-0. + + Remove libgtk2.0-0 dependency on libgtk2.0-bin. + + Use ${binary:Version} and ${source:Version} to ensure strict + dependencies. + + Build-depend on dpkg-dev 1.13.19. + + Invert the libgtk2.0-common -> libgtk2.0-0 symbolic link. + + libgtk2.0-common.preinst, libgtk2.0-0.postinst: dance the symbolic + link samba. + + Move support binaries and scripts to libgtk2.0-0 and make + libgtk2.0-bin a binary-all package containing only scripts. + + Move /usr/sbin/update-* calls to libgtk2.0-0. + + update-*: call binaries at their new location. + + -- Josselin Mouette Mon, 26 Jun 2006 22:31:14 +0200 + +gtk+2.0 (2.8.18-2) UNRELEASED; urgency=low + + * Bump libgtk2.0-dev dependency and build-dep on libx11-dev to >= 2:1.0.0-6 + as it ships x11.pc which ends up in the Requires of gdk-x11-2.0.pc. + (Closes: #326199, #370693) + [debian/control, debian/control.in] + + -- Loic Minier Tue, 6 Jun 2006 15:18:28 +0200 + +gtk+2.0 (2.8.18-1) unstable; urgency=low + + * New upstream version: + Bugs fixed: + - search box positioning has some bugs + - Gdk does not translate VK_NUMPADx to GDK_KP_x + - sanely handle late (re)setting of dnd image + - Text is shifted off-by-one in Add to panel + - gtk_widget_create_pango_layout docs typo + - GtkLayout In GtkScrolledWindow does not receive the scroll_event + - gtktreeview has RTL problems with toggle buttons if using gtktreestore + as a model + - Wrong drop location in GtkEntry + - GtkImage animation CRITICALS on switching themes + - DnD: Conditional jump or move depends on uninitialised value + - cursor blocked to dnd mode after using shift and dnd on a GtkCalendar + - Crashes while creating source code w/GtkFontSelection + - the right edge tab does not appear when switching tab + - Warning in gtk_paned_compute_position + - gdk should set resolution on PangoCairoFontmap, not PangoCairoContext + - GtkTreeView does not resize correctly + - gtk_tree_view_get_cell_area() forgets depth-one expander + - expander animation not working in RTL mode + - Multiple issues discovered by Coverity + - Make gtk_file_chooser_button_new() friendlier for language bindings + + -- Sebastien Bacher Tue, 30 May 2006 17:02:26 +0200 + +gtk+2.0 (2.8.17-1) unstable; urgency=low + + * New upstream version: + Bugs fixed: + - Expander disclosure button is too small + - gtk_image_clear doesn't cause redraw + - typo in configure.in yields suspicious warning + - gtk_icon_view_set_cursor causes Segmentation fault + - garbage output of --help in non UTF-8 locale + - GtkNotebook does not destroy its children on destroy() + - TreeView DnD between-row highlight colo + - Gtk-Criticals occur when scrolling a text_view that is not realized + - Hidden menubar still activates submenus with kbd + - GtkTreeItem broken + - Clean up button press handling (use one-grab-op-at-a-time pattern) + - broken scrolling when selecting + - GTK+ File-chooser dialog crashes + - Nautilus crashes when dragging icons to another screen + - mixed line separators confuse gtk_text_iter_ends_line + - Textview child is covered by window border + - gdk_pixbuf_loader_new_with_type(): What image types are allowed? + - Missing progress bar label + - Fix a problem which caused grab-notify signal to be missed in some cases + * debian/control.in: + - clear the Build-Depends on xlibs-static-pic | xlibs-pic, not required + - updated the Build-Depends on libpango1.0-dev so it build with + the xorg transitioned version + * * debian/patches/001_default_fallback_icon_theme.patch: + - set the default fallback icon theme to "gnome", fixes the issues with + the moves of icons from hicolor to gnome + + -- Sebastien Bacher Sun, 9 Apr 2006 21:54:11 +0200 + +gtk+2.0 (2.8.16-1) unstable; urgency=low + + * New upstream version + + -- Sebastien Bacher Wed, 15 Mar 2006 19:26:46 +0100 + +gtk+2.0 (2.8.15-1) unstable; urgency=low + + * New upstream version: + * Bugs fixed: + - Keys P and N in "open file" dialog have special meaning + - MS-Windows theme (GTK-Wimp) shows all funky characters + - Optimize gdk on win32 + - Hollow polygons have wrong linecaps + - panel crash with a11y enabled + * Updated translations (bg,bn,cs,eu,ro) + + -- Sebastien Bacher Tue, 14 Mar 2006 15:41:56 +0100 + +gtk+2.0 (2.8.13-1) unstable; urgency=low + + * New upstream version: + * Bugs fixed: + - Can't select some items in GtkIconView + - gtk_icon_theme_list_icons: example contexts don't work + - gnopernicus crashes on changing display screen source for magnifier + - evince crashes in gdk_region_union_with_rect + - Small error in _gdk_gc_update_context + - gtk.Notebook.get_current_page() returns incorrect page number + when pages hidden + - GtkAboutDialog not responsive to Escape key + - GtkNotebook popup menu not keynavigatable + - GtkRadioButton does not issue notify::active + - Make more use of G_DISABLE_ASSERT in TextView code + * Updated translations + + -- Sebastien Bacher Sat, 25 Feb 2006 23:56:58 +0100 + +gtk+2.0 (2.8.12-1) unstable; urgency=low + + * New upstream bugfix release. + * [debian/copyright] Updated FSF's address. + + -- J.H.M. Dassen (Ray) Sun, 12 Feb 2006 14:11:11 +0100 + +gtk+2.0 (2.8.11-1) unstable; urgency=low + + * New upstream version + * Avoid memory overruns in the pixbuf theme engine with nonsensical + gradient specifications. [Matthias] + * Bugs fixed: + - Cursor doesn't move as expected + - Segfault from combination of gtk_container_set_resize_mode() + and GtkComboBox + - segfault in update_cursor on amd64 + - eog crashes at launch under AIX + - "~" should bring up the location dialog + - gtk_text_layout_get_cursor_locations() chokes on layout=0x0 + * Documentation improvements [Federico Mena Quintero] + * Translation updates (es,pt_BR,zh_HK,zh_TW) + + -- Sebastien Bacher Fri, 27 Jan 2006 22:28:05 +0100 + +gtk+2.0 (2.8.10-1) unstable; urgency=low + + * New upstream version + * debian/control.in: + - updated the glib requirement + * debian/patches/001_fs_documents.patch: + - dropped, stick with upstream behaviour rather + + -- Sebastien Bacher Thu, 12 Jan 2006 13:34:37 +0100 + +gtk+2.0 (2.8.9-2) unstable; urgency=low + + * Upload to unstable + + -- Sebastien Bacher Thu, 15 Dec 2005 15:13:32 +0100 + +gtk+2.0 (2.8.9-1) experimental; urgency=low + + * New upstream version: + Bugs fixed: + - File chooser filter behaves weird + - 2.8.4 to 2.8.6: sound-juicer crash, fileselector assertions + - On unsetting the Model, GtkTreeView does not clear + it's associated TreeSelection + - Crash on selecting a file of null mime-type + - gtktoolbutton leaks a pixbuf + - GdkEvent leaked in gtktreeview.c / gtk_tree_view_key_press + - Typo in trap_activate_cb() + - gtkcalendar.c: The identifier is already declared. + - gtk_menu_attach_to_widget() does not take NULL detacher + - Unhinted fonts are measured incorrectly and drawing + problems occur as a result + - unwanted scrolling in recent gtk + - Toolbars without icons are invisible in icon-only mode + - Search-entry in the TreeView not working properly + - gtktoolbutton.c:562: warning: 'image' is used + uninitialized in this function + - reference count of textbuffer increases with each paste + - gtk_selection_data_get_uris leaks memory + Other changes: + - Remove GMemChunk from public header files to + support building against GLib 2.10 + - Report errors in option parsing + - Merge upstream xdgmime changes to handle duplicate glob patterns + + -- Sebastien Bacher Sat, 10 Dec 2005 18:22:50 +0100 + +gtk+2.0 (2.8.8-1) experimental; urgency=low + + * New upstream version: + GtkFileChooser: + - Make F2 work for renaming bookmarks + GtkEntry: + - Turn off input methods in password entries + - Other fixes * Documentation improvements + - Updated translations + + -- Sebastien Bacher Tue, 29 Nov 2005 16:00:32 +0100 + +gtk+2.0 (2.8.7-1) experimental; urgency=low + + * New upstream version. + * Security fixes: + - Add check to XPM reader to prevent integer overflow for specially crafted + number of colors (CVE-2005-3186) (Closes: #339431). + - Fix endless loop with specially crafted number of colors (CVE-2005-2975). + * debian/patches/001_fs_documents.patch: + - updated. + * debian/rules: + - fix confusing cp usage. + + [ Loic Minier ] + * Drop xlibs-dev deps and build-deps. + [debian/control, debian/control.in] + + -- Sebastien Bacher Wed, 16 Nov 2005 11:54:11 +0100 + +gtk+2.0 (2.8.3-1) experimental; urgency=low + + * New upstream version: + - Fix problems with the handling of initial settings + for font options and cursor themes. + - Add a --ignore-theme-index option to gtk-update-icon-cache. + + -- Jordi Mallach Thu, 1 Sep 2005 19:45:50 +0200 + +gtk+2.0 (2.8.2-1) experimental; urgency=low + + * New upstream version: + - Fix a crash with custom icon themes, which affected + the gnome-theme-manager. + - Make sure font and cursor settings are propaged down + to the screen initially. + * debian/control.in: + - require the current pango. + + -- Sebastien Bacher Thu, 25 Aug 2005 00:36:18 +0200 + +gtk+2.0 (2.8.1-1) experimental; urgency=low + + * New upstream version: + - gtk-update-icon-cache no longer stores copies of symlinked icons, + and it has a --index-only option to omit image data from the cache. + - Make large GtkSizeGroups more efficient. + - Improve positioning of menus in GtkToolbar. + - Make scrolling work on unrealized icon views. + - Avoid unnecessary redraws on range widgets. + - Make sure that all GTK+ applications reload icon themes promptly. + - Ensure that gdk_pango_get_context() and gtk_widget_get_pango_context() + use the same font options and dpi value. + - Multiple memory leak fixes. + * debian/control.in: + - updated the libgtk2.0-dev Depends according to the changes. + * debian/rules: + Add --enable-explicit-deps=yes to make sure stuff like x11 gets listed as a + Requires: in gdk(-x11)-2.0.pc, because otherwise linkage against -lX11 and + friends doesn't get carried through. Whether or not this is correct is + arguable, since libgdk-x11-2.0.so.0* ends up linked against it anyway, but + stuff like gnome-panel seems to be relying on this transience. + Change by Daniel Stone. + + -- Sebastien Bacher Wed, 24 Aug 2005 11:24:16 +0200 + +gtk+2.0 (2.8.0-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - build with the new cairo (Closes: #323705). + - updated the Build-Depends for xorg (Closes: #323080). + * debian/copyright: + - use License instead of Copyright (Closes: #323209). + * debian/patches/001_fs_documents.patch: + - default to Documents. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Thu, 18 Aug 2005 12:19:41 +0200 + +gtk+2.0 (2.7.2-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - updated the shlibs. + - use cairo. + * debian/watch: + - updated. + + -- Sebastien Bacher Tue, 12 Jul 2005 01:06:55 +0200 + +gtk+2.0 (2.6.8-1) unstable; urgency=low + + * New upstream version. + * debian/patches/003_focus_issues.patch: + - fixed with the new version. + + -- Sebastien Bacher Thu, 16 Jun 2005 12:52:35 +0200 + +gtk+2.0 (2.6.7-2) unstable; urgency=low + + * Upload to unstable. + * Forward patches from 2.6.4 branch: + + 003_focus_issues.patch: stolen from CVS HEAD to fix focus issues. + + debian/gtk-tutorial.devhelp: updated to reflect the reality of the + html files. + * Loïc Minier: + + Document the configuration of Emacs-style key bindings in README.Debian, + with additional instructions for GNOME users. [debian/README.Debian] + (Closes: #309530) + + -- Josselin Mouette Mon, 6 Jun 2005 22:39:27 +0200 + +gtk+2.0 (2.6.7-1) experimental; urgency=low + + * New upstream version: + - Fix compilation with gcc 4.0 (Closes: #303646). + * debian/rules: + - clean from the mips changes. + * debian/patches/002_bmp.patch: + - the new version fixes that. + * debian/patches/004_fs_newdir.patch: + - the new version fixes that. + + -- Sebastien Bacher Thu, 14 Apr 2005 22:06:53 +0200 + +gtk+2.0 (2.6.4-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/004_fs_newdir.patch: + - fix a crash in the fileselector when creating a directory. + * debian/patches/003_iconcache.patch: + - this bug is fixed in the new version. + * debian/patches/004_mipsbuild.patch: + - dropped, this change is not required. + * debian/patches/002_bmp.patch: + - fix CAN-2005-0891: BMP double free Dos (Closes: #303141). + + -- Sebastien Bacher Tue, 5 Apr 2005 21:09:01 +0200 + +gtk+2.0 (2.6.2-4) unstable; urgency=high + + * Sjoerd Simons: + - debian/patches/003_iconcache.patch + + Updated. Let updateiconcache.c include config.h so it's correctly build + with large file support (Closes: #295777). + * Sebastien Bacher: + - debian/shlibs.local: + + dropped, fix the self depends (Closes: #296175). + * Loic Minier: + - debian/control* + + added gtk2-engines-pixbuf subsection and priority to sync with + the override. + * Use high urgency so that icon themes can propagate to testing. + + -- Josselin Mouette Wed, 2 Mar 2005 22:28:38 +0100 + +gtk+2.0 (2.6.2-3) unstable; urgency=low + + * Patch from Steve Langasek : + Add a --disable-testsuite argument to upstream configure, to permit + skipping the testsuite on architectures where large static binaries + are currently problematic (i.e., mips). Closes: #295048. + + -- Sebastien Bacher Sun, 13 Feb 2005 19:23:39 +0100 + +gtk+2.0 (2.6.2-2) unstable; urgency=low + + * debian/libgtk2.0-bin.postinst: + - don't run gtk-update-icon-cache, the themes should do that + (Closes: #293568). + * debian/patches/003_iconcache.patch: + - should fix the gtk-update-icon-cache issue on sparc. + + -- Sebastien Bacher Sun, 6 Feb 2005 19:57:57 +0100 + +gtk+2.0 (2.6.2-1) unstable; urgency=low + + * New upstream release: + - fix the loop in gtkdialog (Closes: #291051). + - should fix the issue on sparc (Closes: #293711). + + -- Sebastien Bacher Sun, 6 Feb 2005 00:16:52 +0100 + +gtk+2.0 (2.6.1-2) unstable; urgency=low + + * Upload to unstable. + * debian/patches/004_gtkmodules.patch: + - don't reverse the order of modules, that fix a crash with the modules. + + -- Sebastien Bacher Wed, 2 Feb 2005 18:28:09 +0100 + +gtk+2.0 (2.6.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 9 Jan 2005 14:23:07 +0100 + +gtk+2.0 (2.6.0-1) experimental; urgency=low + + * New upstream release (Closes: #275239). + * debian/control.in: + - create a gtk2-engines-pixbuf package. + - recommends hicolor-icon-theme (Closes: #287334). + - rename libgtk2.0-dbg to libgtk2.0-0-dbg. + - updated the Build-Depends. + * debian/gtk2-engines-pixbuf.files: + - added. + * debian/libgtk2.0-bin.files: + - install gtk-update-icon-cache here. + * debian/libgtk2.0-bin.postinst: + - call gtk-update-icon-cache. + * debian/patches/001_gtk+-debian-aclocal-pass_all.patch: + - removed, should not be needed with the new version. + * debian/patches/003_treeview-typeahead.patch, + debian/patches/003_filechooser-search.patch, + debian/patches/004_treeview-activate.patch, + debian/patches/005_modifiers.patch: + - removed, these changes are in the new version. + * debian/rules: + - updated the shlibs. + - use dh_strip to make the debug package. + * update-gtk-immodules.in: + * update-gdkpixbuf-loaders.in: + - module version is 2.4.0. + * debian/watch: + - updated. + + -- Sebastien Bacher Wed, 29 Dec 2004 18:55:11 +0100 + +gtk+2.0 (2.4.14-2) unstable; urgency=low + + * debian/patches/003_filechooser-search.patch: + - open the path entry if "/" is enter in the file-selector. + * debian/patches/004_treeview-activate.patch: + - typeahead active the row. + * debian/patches/005_modifiers.patch: + - accept shift-/ for bringing up the location popup. + + -- Sebastien Bacher Tue, 21 Dec 2004 16:21:15 +0100 + +gtk+2.0 (2.4.14-1) unstable; urgency=low + + * New upstream release (Closes: #286021). + * debian/control.in: + - set myself as maintainer. + * debian/patches/003_treeview-typeahead.patch: + - backport of the typeahead feature for the treeviews. + + -- Sebastien Bacher Sun, 19 Dec 2004 14:55:07 +0100 + +gtk+2.0 (2.4.13-1) unstable; urgency=low + + * New upstream release: + - make new notebook tabs appear again (Closes: #276266). + + -- Sebastien Bacher Wed, 13 Oct 2004 16:48:13 +0200 + +gtk+2.0 (2.4.11-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 11 Oct 2004 19:48:52 +0200 + +gtk+2.0 (2.4.10-1) unstable; urgency=low + + * New upstream release. + * debian/patches/002_xpmico.patch: + - updated, the two xpm fixes are in the new version. + + -- Sebastien Bacher Sun, 19 Sep 2004 00:19:27 +0200 + +gtk+2.0 (2.4.9-2) unstable; urgency=high + + * debian/patches/002_xpmico.patch: + - fix CAN-2004-0782 Heap-based overflow in pixbuf_create_from_xpm. + - fix CAN-2004-0783 Stack-based overflow in xpm_extract_color. + - fix CAN-2004-0788 ico loader integer overflow. + + -- Sebastien Bacher Fri, 17 Sep 2004 12:23:02 +0200 + +gtk+2.0 (2.4.9-1) unstable; urgency=medium + + * GNOME team upload. + * New upstream release. + * debian/patches/002_gtk+-pixbuf-breakage.patch: removed, included in + upstream version 2.4.8. + + -- Jordi Mallach Thu, 26 Aug 2004 14:41:17 +0200 + +gtk+2.0 (2.4.7-1) unstable; urgency=medium + + * GNOME team upload. + * New upstream release. + * debian/patches/002_gtk+-pixbuf-breakage.patch: new, apply patch + from CVS to fix thumbnail corruption in nautilus. + + -- Jordi Mallach Wed, 25 Aug 2004 20:12:28 +0200 + +gtk+2.0 (2.4.4-2) unstable; urgency=medium + + * Rebuilt with libtiff4. + * debian/control.in: + - Build-Depends on libtiff4-dev. + + -- Sebastien Bacher Wed, 28 Jul 2004 23:11:54 +0200 + +gtk+2.0 (2.4.4-1) unstable; urgency=low + + * New upstream release + - fix the problem with directories displayed twice in the file chooser + (Closes: #249057). + * debian/control.in: + - libgtk2.0-bin Conflicts with old libgtk2.0-dev. + + -- Sebastien Bacher Sun, 11 Jul 2004 00:33:45 +0200 + +gtk+2.0 (2.4.3-3) unstable; urgency=low + + * debian/control.in: + - since manpages have moved from libgtk2.0-dev to libgtk2.0-bin we need + to update the Replaces. + + -- Sebastien Bacher Mon, 5 Jul 2004 21:15:25 +0200 + +gtk+2.0 (2.4.3-2) unstable; urgency=low + + * debian/libgtk2.0-bin.files: + - moved gdk-pixbuf-query-loader and gtk-query-immodules-2.0 manpages + to libgtk2.0-bin. (Closes: #257399). + * debian/libgtk2.0-doc.doc-base.gtk-faq, + debian/libgtk2.0-doc.doc-base.gtk-tutorial: + - changed index.html with book1.html. + * Included devehelp files from Richard Cohen + for the faq and the tutorial (Closes: #256844). + + -- Sebastien Bacher Sat, 3 Jul 2004 12:14:38 +0200 + +gtk+2.0 (2.4.3-1) unstable; urgency=medium + + * New upstream release + - fix the button size allocation logic (Closes: #253971, #253974). + * debian/rules + - updated the shlibs. + + -- Sebastien Bacher Tue, 15 Jun 2004 11:29:13 +0200 + +gtk+2.0 (2.4.2-1) unstable; urgency=low + + * New upstream release (Closes: #252690). + + -- Sebastien Bacher Sat, 5 Jun 2004 17:23:57 +0200 + +gtk+2.0 (2.4.1-4) unstable; urgency=low + + * Conflict with librsvg2-common << 2.6.3-1 (closes: #250714, #250647). + + -- Josselin Mouette Tue, 25 May 2004 14:15:22 +0200 + +gtk+2.0 (2.4.1-3) unstable; urgency=low + + * GNOME Team Upload. + * Upload to unstable + + close bug fixed in experimental uploads + (Closes: #161244, #201429, #201507, #203677, #208744, #223316, #228603) + (Closes: #232081, #234902, #238479, #241860) + * Marc Brockschmidt + + debian/rules: Really, *really* surpress warnings when removing directories + (using >/dev/null 2>&1 instead of 2>&1 >/dev/null) + + -- Sebastien Bacher Sat, 22 May 2004 15:23:21 +0200 + +gtk+2.0 (2.4.1-2) experimental; urgency=low + + * debian/control.in: + + Conflict with old versions of packages that need a rebuild to work with + gtk+2.4 to force the updates. + + -- Sebastien Bacher Sat, 15 May 2004 23:24:07 +0200 + +gtk+2.0 (2.4.1-1) experimental; urgency=low + + * New upstream release. + * Akira TAGOH + + debian/control: + - added libgtk2.0-0 to Depends for libgtk2.0-common. (from 2.2.4-6). + - libgtk2.0-dev requires libxext-dev. (Closes: #247469) + * Sebastien Bacher + + debian/rules: + - updated shlib to 2.4.1. + + -- Sebastien Bacher Wed, 5 May 2004 23:32:54 +0200 + +gtk+2.0 (2.4.0-4) experimental; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 02:11:52 +0900 + +gtk+2.0 (2.4.0-3) experimental; urgency=low + + * Akira TAGOH + + debian/rules: + - modified the sed script to strip the version properly. + (closes: Bug#241860) + - clean up. + + debian/control: + - updated the dependencies for the separated xlibs-dev. (from 2.2.4-4) + - separated arch-independent data to libgtk2.0-data package. + (from 2.2.4-4) + + -- Akira TAGOH Fri, 23 Apr 2004 22:43:58 +0900 + +gtk+2.0 (2.4.0-2) experimental; urgency=low + + * debian/control.in: + + Added build dependency on libxcursor-dev. (Closes: #239886) + + Sebastien Bacher : + * debian/rules: + + Updated shver. + * debian/control.in: + + Added again Build-Depends removed in 2.4.0-1. + + -- J.H.M. Dassen (Ray) Thu, 25 Mar 2004 11:18:48 +0100 + +gtk+2.0 (2.4.0-1) experimental; urgency=low + + * First upload of new GTK+ branch in experimental (Closes: #238479): + + back out locale-dependent interpretation of KP_Decimal (Closes: #234902). + + change scrolling method (Closes: #161244). + + first day of the week depends of the locale (Closes: #228603). + + fix fileselector multiple selection handling after keyboard validation + (Closes: #208744). + + fix gtktreeview crash when expanding nodes (Closes: #232081). + + fix quotes missing in gtk-2.0.m4 (Closes: #223316). + + use the new file selector (Closes: #203677, #201429, #201507). + + and probably a lot of other bug fixes and improvements ... + * Sebastien Bacher : + * debian/control.in: + - removed Build-Depends on docbook-utils and linuxdoc-tools-text. + * patches/001_gtk+-debian-docfix-dtds.patch: + - removed since we have a xml catalog now. + * Rob Taylor : + * debian/control.in, debian/sources, debian/scripts/vars, debian/watch: + - updated for 2.4.0. + * debian/patches/: + - 002_gtk+-debian-freetype.patch: + + removed, not needed any more, configure already has the changes. + - 000_gtk+-2.2.4-non-weak-symbols.patch: + + removed, fixed in upstream source. + - 000_gtk+-2.2.4-socketfocus.patch: + + removed, fixed in upstream source. + - 001_gtk+-debian-aclocal-pass_all.patch : + + updated. + - 000_gtk+-2.2.0-buildfix-immodule.patch + + updated. + - 000_gtk+-debian-xinerama-pic.patch + + updated. + + -- Sebastien Bacher Mon, 22 Mar 2004 22:00:09 +0100 + +gtk+2.0 (2.2.4-6) unstable; urgency=low + + * Akira TAGOH + + debian/control: + - added libxt-dev to fix FTBFS. (closes: Bug#246450) + - added libgtk2.0-0 to Depends for libgtk2.0-common. + + -- Akira TAGOH Tue, 4 May 2004 11:30:56 +0900 + +gtk+2.0 (2.2.4-5) unstable; urgency=low + + * Akira TAGOH + + debian/control: + - moved arch-independent files to libgtk2.0-common again. + - separated arch-dependent files to libgtk2.0-bin. + + -- Akira TAGOH Sat, 24 Apr 2004 01:12:08 +0900 + +gtk+2.0 (2.2.4-4) unstable; urgency=low + + * Akira TAGOH + + debian/rules: + - bumped the shlib version to 2.2.1-3. (closes: Bug#208671) + + debian/control: + - separated arch-independent data to libgtk2.0-data package. + (closes: Bug#233396) + - fixed the dependencies for the separated xlibs-dev. + (closes: Bug#241782, Bug#241522) + + debian/libgtk2.0-data.{dir,files}: + - added. + + -- Akira TAGOH Thu, 22 Apr 2004 00:42:02 +0900 + +gtk+2.0 (2.2.4-3) unstable; urgency=low + + * debian/patches/: + - 002_gtk+-debian-freetype.patch: patch from Daniel Schepler to fix the + build failure due to freetype (Closes: #225129). + + -- Sebastien Bacher Sat, 27 Dec 2003 13:00:17 +0100 + +gtk+2.0 (2.2.4-2) unstable; urgency=low + + * debian/control: + - added Uploaders to maintain as team. + - added gnome-pkg-tools to Build-Depends. + * debian/gtk-options.7: + - included a manpage with the help on the options (Closes: Bug#216897). + * debian/libgtk2.0-doc.doc-base.gtk-faq + * debian/libgtk2.0-doc.doc-base.gtk-tutorial: + - replaced book1.html by index.html (closes: Bug#215382). + * debian/patches/: + - 000_gtk+-2.2.4-socketfocus.patch: new patch to fix a GtkSocket focus + problem that hang the system tray applet. + (closes: Bug#210813, Bug#212772). + - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: updated + (closes: Bug#216660). + * debian/rules: + - modified to generate debian/control using gnome-pkg-tools. + + -- Sebastien Bacher Fri, 31 Oct 2003 21:32:29 +0100 + +gtk+2.0 (2.2.4-1) unstable; urgency=low + + * New upstream release. + - implemented the im module that produces C_WITH_CEDILLA rather than + C_WITH_ACUTE for dead_acute+c combinations. it will be used as default + im module for fr and pt. (closes: Bug#168557) + - reworked the handling of XIM's status window. (closes: Bug#203009) + * debian/control: + - removed libgtk2.0-0png3 which is unnecessary anymore. + - added non-versioned Conflicts: libgtk2.0-0png3. + - bumped Standards-Version to 3.6.1.0. + * debian/patches/: removed the backported patches. + - 000_gtk+-2.2.2-docfix-gtk2compliant.patch + - 000_gtk+-2.2.2-docfix-gtktreemodel.patch + - 000_gtk+-2.2.2-gtkwidget-viewable.patch + - 000_gtk+-2.2.2-imxim-reconnect.patch + + -- Akira TAGOH Mon, 8 Sep 2003 03:42:18 +0900 + +gtk+2.0 (2.2.2-3) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.2-docfix-gtk2compliant.patch: applied a backported patch + from CVS to fix the old documentation. (closes: Bug#146723) + - 000_gtk+-2.2.2-docfix-gtktreemodel.patch: applied a backported patch + from CVS to fix the sample code. (closes: Bug#201322) + - 000_gtk+-2.2.2-gtkwidget-viewable.patch: applied a backported patch from + CVS to fix the garbled pixmaps. (closes: Bug#201808, Bug#202486) + - 000_gtk+-2.2.2-imxim-reconnect.patch: applied a backported patch from + CVS to fix the segfaults if the XIM server is killed during running gtk2 + applications. + - 001_gtk+-debian-docfix-dtds.patch: applied to use the local DTD. + * debian/control: + - added Build-Depends-Indep: gtk-doc-tools, docbook-xml to re-generate the + fixed documents. + + -- Akira TAGOH Thu, 7 Aug 2003 01:42:46 +0900 + +gtk+2.0 (2.2.2-2) unstable; urgency=low + + * debian/patches/: + - 001_gtk+-debian-aclocal-pass_all.patch: re-applied a patch to fix FTBFS + on arm. (closes: Bug#201443) + + -- Akira TAGOH Thu, 24 Jul 2003 03:14:10 +0900 + +gtk+2.0 (2.2.2-1) unstable; urgency=low + + * New upstream release. (closes: Bug#200350) + - Fixed threadlocks on GtkTreeView. (closes: Bug#192136) + - Fixed the crash on moving the cursor when the cursor is invisible. + (closes: Bug#187858) + - Fixed the compose table for ascending order. (closes: Bug#182073) + * debian/control: + - fix the FTBFS. Thanks to Daniel Baeyens. + - bumped Standards-Version to 3.6.0. + * debian/rules: + - removed dh_undocumented. + - don't claim the newer shlibs. + * debian/patches/: + - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch: removed. + - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch: removed. + - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch: removed. + - 000_gtk+-2.2.1-gtktreeview-scroll.patch: removed. + - 000_gtk+-debian-xinerama-pic.patch: updated. + - 001_gtk+-debian-aclocal.patch: removed. + - 001_gtk+-ximian-gtk2-filesel-navbutton-5.patch: applied a Ximian patch + to improve the GtkFileSel UI. Requested from Ross Burton. + - 000_gtk+-2.2.2-non-weak-symbols.patch: applied to fix the undefined non + weak symbols. (closes: Bug#193774) + + -- Akira TAGOH Sun, 13 Jul 2003 21:26:49 +0900 + +gtk+2.0 (2.2.1-6) unstable; urgency=low + + * debian/patches/001_gtk+-debian-aclocal.patch: + - damn. forgot to re-run automake and autoconf. fix again. + (closes: Bug#190569) + + -- Akira TAGOH Sat, 3 May 2003 16:56:18 +0900 + +gtk+2.0 (2.2.1-5) unstable; urgency=low + + * debian/control: + - changed a section for libgtk2.0-dbg to libdevel. + * debian/patches/000_gtk+-debian-aclocal.patch: + - applied to fix Xinerama library linkage broken on arm and m68k. + (closes: Bug#190569) + Thanks to James Troup and Phil Blundell. + + -- Akira TAGOH Sat, 3 May 2003 01:50:52 +0900 + +gtk+2.0 (2.2.1-4) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.1-gtk_text_line_previous_could_contain_tag.patch: + applied a backported patch from CVS. (closes: Bug#185066) + - 000_gtk+-2.2.1-gtktreeview-scroll.patch: + applied a patch from Red Hat to fix infinite expose loops in TreeView. + (closes: Bug#187312) + * debian/control: + - bumped Standards-Version to 3.5.9. + - changed a section for libgtk2.0-dev to libdevel. + * debian/rules: + - fixed the symlinks on /usr/share/gtk-doc/html. (closes: Bug#183377) + * debian/compat: + - use it instead of DH_COMPAT. + + -- Akira TAGOH Fri, 4 Apr 2003 01:55:35 +0900 + +gtk+2.0 (2.2.1-3) unstable; urgency=low + + * build against the latest xlibs and xlibs-pic. so now correct + libXinerama_pic.a is linked and supporting xinarama is re-enabled. + (closes: Bug#177318) + * debian/control: + - depend on xlibs-pic (>= 4.2.1-6) + * debian/README.Debian: + - improve description of static libraries issue. (closes: Bug#181879) + Thanks to Marcelo E. Magallon + - mention gtk-key-theme-name and gnome-settings-daemon. + * debian/rules: + - create the symlinks in /usr/share/gtk-doc + + -- Akira TAGOH Mon, 3 Mar 2003 01:35:04 +0900 + +gtk+2.0 (2.2.1-2) unstable; urgency=low + + * debian/patches/: + - 000_gtk+-2.2.1-gdk_visual_get_best_with_depth.patch: + backport from CVS to fix wrong pointer returned. (closes: Bug#180786) + - 000_gtk+-2.2.1-gdk_event_copy_for_xinput.patch: + applied to fix a crash when using xinput. (closes: Bug#178908) + + -- Akira TAGOH Wed, 19 Feb 2003 03:10:55 +0900 + +gtk+2.0 (2.2.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: removed patches. they were fixed in this release. + - 000_gtk+-2.2.0-buildfix-modules.patch + - 000_gtk+-2.2.0-fix-es.po.patch + - 000_gtk+-2.2.0-fnmatch-undef.patch + - 002_gtk+-2.2.0-fixtypo-xinput.patch + * debian/patches/000_gtk+-debian-xinerama-pic.patch: update. + + -- Akira TAGOH Fri, 7 Feb 2003 03:37:44 +0900 + +gtk+2.0 (2.2.0-3) unstable; urgency=low + + * debian/: clean the unnecessary files up. (closes: Bug#177809) + * debian/rules: + remove the old debug libraries on install process if exists. (closes: + Bug#177376) + * debian/patches/: + - 002_gtk+-2.2.0-fixtypo-xinput.patch: + fix to enable XFree86 xinput extension. (closes: Bug#176104) + - 000_gtk+-2.2.0-fix-es.po.patch: + applied to fix es.po. (closes: Bug#178870) + + -- Akira TAGOH Wed, 29 Jan 2003 23:01:43 +0900 + +gtk+2.0 (2.2.0-2) unstable; urgency=low + + * debian/control: + - add Conflicts libgnomeui-0 (<< 2.0.6-2) to avoid the gtk+ 2.2 breakage. + (closes: Bug#175946) + - add Conflicts gtk2.0-examples (<< 2.2.0) (closes: Bug#175868) + - add dependency of libgtk2.0-common. (closes: Bug#175873) + - removed libgtk-common package. it's no longer needed. I hope the loop + dependency will be disappeared. + - used libpng12-0-dev instead of libpng3-dev for Build-Depends. + * debian/patches/001_gtk+-2.2.0-xinerama-pic.patch: + disabled Xinerama support until xlibs-pic has libXinerama_pic.a. + (closes: Bug#175923) + + -- Akira TAGOH Sat, 11 Jan 2003 05:09:12 +0900 + +gtk+2.0 (2.2.0-1) unstable; urgency=low + + * New upstream release. + - upstream bug were closed. so it should be fixed. (closes: Bug#147697) + * debian/control: + - updated Build-Depends. + - bumped Standards-Version to 3.5.8. + - fix description-synopsis-ends-with-full-stop stuff. + * debian/update-gdkpixbuf-loaders: add brand-new wrapper script. + * debian/update-gdkpixbuf-loaders.1: add manpage. + * debian/rules: + modified to build the static libraries. (closes: Bug#161938) + * debian/README.Debian: updated. + * debian/patches/: + - 000_gtk+-2.0.6-extranotify.patch: removed. + - 000_gtk+-2.0.6-scroll_to.patch: removed. + - 000_gtk+-2.2.0-fnmatch-undef.patch: + applied to fix having main() in the library. + - 000_gtk+-2.2.0-buildfix-immodule.patch: + applied to build the static libraries. + - 000_gtk+-2.2.0-buildfix-modules.patch: + applied to fix a typo in configure.in. + + -- Akira TAGOH Mon, 6 Jan 2003 18:34:31 +0900 + +gtk+2.0 (2.0.9-1) unstable; urgency=low + + * New upstream release. + * debian/patches/000_gtk+-2.0.8-refcolormap.patch: this release contains it. + removed. + + -- Akira TAGOH Sun, 24 Nov 2002 00:08:42 +0900 + +gtk+2.0 (2.0.8-2) unstable; urgency=low + + * debian/patches/000_gtk+-2.0.8-refcolormap.patch: applied to fix the crash + problem with close. For solve your problem, I recommend you restart all + processes related gtk+2.0. (closes: Bug#169005) + + -- Akira TAGOH Fri, 15 Nov 2002 09:16:40 +0900 + +gtk+2.0 (2.0.8-1) unstable; urgency=low + + * New upstream release. + * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: it's no longer needed. + * debian/rules: fix twice called ldconfig. (closes: Bug#168071) + + -- Akira TAGOH Sun, 10 Nov 2002 16:36:45 +0900 + +gtk+2.0 (2.0.7-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + - support noopt option for DEB_BUILD_OPTIONS. + - add symlink for gobject. (closes: Bug#167755) + * Hm, closed a bug which is marked as NMU due to mis-upload. (closes: + Bug#166442) + * debian/patches: these patches are no longer needed, so removed. + - 000_gtk+-2.0.6-64bitfix.patch + - 000_gtk+-2.0.6-imenvvar.patch + - 000_gtk+-2.0.6-keycode.patch + - 000_gtk+-2.0.6-usintl.patch + * debian/patches/000_gtk+-2.0.7-gifsymbol.patch: applied to fix the + undefined symbol issue on libpixbufloader-gif.so. + + -- Akira TAGOH Wed, 6 Nov 2002 01:42:22 +0900 + +gtk+2.0 (2.0.6-4) unstable; urgency=low + + * debian/patches/000_gtk+-2.0.6-64bitfix.patch: applied to fix a segfault on + IA64. (closes: Bug#166442) + + -- Akira TAGOH Sun, 27 Oct 2002 03:07:59 +0900 + +gtk+2.0 (2.0.6-3) unstable; urgency=low + + * debian/control: moved libgtk2.0-0png3 to the last entry. + * debian/rule: fix invalid symlink. + + -- Akira TAGOH Sat, 31 Aug 2002 09:46:36 +0900 + +gtk+2.0 (2.0.6-2) unstable; urgency=low + + * debian/control: + - bumped Standards-Version and depends debhelper (>> 4). + - revert to libgtk2.0-0 and remove Conflicts libgtk2.0-0, then add + versioned conflict to work eog2, gnome-panel2, celestia, gimp1.3 and + metatheme. (closes: Bug#155689, Bug#155854) + - add libgtk2.0-0png3 to Conflicts, Replaces. + - add a dummy package for libgtk2.0-0png3. + - remove the image libraries dependency. (closes: Bug#158858) + - clean up -dev's Depends. + - add libglib2.0-doc, libatk1.0-doc and libpango1.0-doc to Suggests. + * debian/patches/: from Red Hat. + - 000_gtk+-2.0.6-exportsymbols.patch: + applied to fix stripping the wrong symbols due to libtool's bug. but + it's not affected about the symbols used by ld and ld.so. mainly for nm, + gdb and etc. + - 000_gtk+-2.0.6-extranotify.patch: + applied to fix extra settings notifies on startup that were causing + significant performance problems as fonts were reloaded. + - 000_gtk+-2.0.6-imenvvar.patch: + applied to fix a bug with GTK_IM_MODULE environment variable. + - 000_gtk+-2.0.6-keycode.patch: applied to fix a problem with keycodes + passed to GtkIMContextXIM. + - 000_gtk+-2.0.6-usintl.patch: + applied to fix to GtkIMContextSimple compose for us-intl keyboards. + should be fixed. (closes: Bug#149515) + - 000_gtk+-2.0.6-scroll_to.patch: + applied to fix gtk_tree_view_scroll_to_cell. + * debian/rules: add symlink to fix the missing symlink for glib, atk and + pango. (closes: Bug#158107) + * debian/update-gtk-immodules.fr.1: added. Thanks Julien Louis. (closes: + Bug#156985) + + -- Akira TAGOH Sat, 31 Aug 2002 05:22:33 +0900 + +gtk+2.0 (2.0.6-1) unstable; urgency=low + + * New upstream release. + * Build against libpng3 (closes: 147852) + + -- Akira TAGOH Sun, 4 Aug 2002 18:31:53 +0900 + +gtk+2.0 (2.0.5-2) unstable; urgency=low + + * debian/rules: add --with-xinput=xfree. (closes: Bug#151668) + * debian/control: + - add Conflicts: libgdkxft0 to avoid some problem. (closes: Bug#151439). + - changed a summary from 'Dummy' to 'Empty'. + + -- Akira TAGOH Thu, 4 Jul 2002 00:18:53 +0900 + +gtk+2.0 (2.0.5-1) unstable; urgency=low + + * New upstream release. + * debian/control: fix typo (closes: Bug#150147) + + -- Akira TAGOH Mon, 17 Jun 2002 01:07:20 +0900 + +gtk+2.0 (2.0.4-1) unstable; urgency=low + + * New upstream release. + - should be fixed in this release. (closes: Bug#149667) + - now it's not linked to the Pango docs (closes: Bug#149143) + * debian/libgtk2.0-doc.doc-base.{gdk,gdk-pixbuf,gtk,gtk-faq,gtk-tutorial}: + add a new line before Format: (closes: Bug#149548, Bug#150043) + + -- Akira TAGOH Sun, 16 Jun 2002 05:16:29 +0900 + +gtk+2.0 (2.0.3-1) unstable; urgency=low + + * New upstream release. + * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}: + changed an index file. + + -- Akira TAGOH Thu, 30 May 2002 23:35:52 +0900 + +gtk+2.0 (2.0.2-5) unstable; urgency=high + + * debian/control: add libtiff3g-dev, libpng2-dev and libjpeg62-dev to + Depends for -dev. + * set urgency=high because previous version violated our policy 2.3.4. + it should be into woody as far as possible. + + -- Akira TAGOH Thu, 23 May 2002 00:31:52 +0900 + +gtk+2.0 (2.0.2-4) unstable; urgency=high + + * debian/patches/000_gtk+2.0-2.0.2-bigendian.patch: applied to fix a problem + for big endian machines. (closes: Bug#145285) + * set urgency=high because it should be in woody. + + -- Akira TAGOH Wed, 1 May 2002 02:46:12 +0900 + +gtk+2.0 (2.0.2-3) unstable; urgency=low + + * debian/update-gtk-immodules: create /etc/gtk-2.0 directory for workaround, + if it's not found. oh, why didn't you have it? (closes: Bug#143508, + Bug#144673) + + -- Akira TAGOH Sun, 28 Apr 2002 04:46:30 +0900 + +gtk+2.0 (2.0.2-2) unstable; urgency=low + + * debian/libgtk2.0-doc.doc-base.{gtk-faq,gtk-tutorial}: + Grr, fix again... (closes: Bug#141069) + * debian/scripts/vars.build: fix bashism. + + -- Akira TAGOH Sat, 6 Apr 2002 04:26:14 +0900 + +gtk+2.0 (2.0.2-1) unstable; urgency=low + + * New upstream release. + - this release has bug fix only. + * debian/control: forgot to update versioned dependency for -dev. + * debian/libgtk2.0-doc.doc-base.gtk-faq, + debian/libgtk2.0-doc.doc-base.gtk-tutorial: + fix wrong index. (closes: Bug#141069) + + -- Akira TAGOH Thu, 4 Apr 2002 02:49:49 +0900 + +gtk+2.0 (2.0.1-1) unstable; urgency=low + + * New upstream release. + * debian/update-gtk-immodules: check the immodules directory. + + -- Akira TAGOH Sun, 31 Mar 2002 00:59:03 +0900 + +gtk+2.0 (2.0.0-3) unstable; urgency=low + + * debian/rules: removed regenerate shlibs. all packages no longer needs to + depend on -common. + + -- Akira TAGOH Sat, 16 Mar 2002 21:51:08 +0900 + +gtk+2.0 (2.0.0-2) unstable; urgency=low + + * debian/control: changed Build-Depends to libpango1.0-dev (>= 1.0.0-3) + * debian/{control,rules}: add libgtk-common as dummy package for upgrading. + * debian/rules: fix the missing directory. + * debian/update-gtk-immodules: fix file attribute for gtk.immodules. + + -- Akira TAGOH Sat, 16 Mar 2002 04:34:39 +0900 + +gtk+2.0 (2.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Akira TAGOH Wed, 13 Mar 2002 00:07:25 +0900 + --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.doc-base.gtk-faq +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.doc-base.gtk-faq @@ -0,0 +1,12 @@ +Document: gtk2-faq +Title: GTK+2.0 Frequently Asked Questions +Author: Tony Gale, Shawn Amundson, and Emmanuel Deloget +Abstract: This document is intended to answer questions that are + likely to be frequently asked by programmers using the GTK+ + graphical user interface library, or people who are just looking at + using GTK+, Gnome, or GIMP. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html +Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html --- gtk+2.0-2.12.1.orig/debian/control.in +++ gtk+2.0-2.12.1/debian/control.in @@ -0,0 +1,302 @@ +Source: gtk+@APIVER@ +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.22), + gettext, + pkg-config, + libglib2.0-dev (>= 2.13.5), + libpango1.0-dev (>= 1.17.3), + libatk1.0-dev (>= 1.9.0), + libx11-dev (>= 2:1.0.0-6), + libxext-dev, + libxi-dev, + libxrandr-dev, + libxt-dev, + libxrender-dev, + libxft-dev, + libxcursor-dev, + libxcomposite-dev, + libxdamage-dev, + libxkbfile-dev, + libxinerama-dev, + libxfixes-dev, + libcairo2-dev (>= 1.2.0), + libcairo-directfb2-dev (>= 1.2.4-4), + libtiff4-dev, + libjpeg62-dev, + libpng12-dev, + gnome-pkg-tools (>= 0.11), + chrpath, + dpkg-dev (>= 1.13.19), + x11proto-xext-dev, + libdirectfb-dev (>= 0.9.24), + libcupsys2-dev (>= 1.2), + quilt +Build-Depends-Indep: gtk-doc-tools (>= 1.6), + docbook-xml +Standards-Version: 3.7.2 + +Package: @SHARED_PKG@ +Section: libs +Architecture: any +Depends: @COMMON_PKG@ (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Provides: @GTK_BINVER_DEP@ +Conflicts: libgtk2.0-0png3, + eog2 (<< 1.0.1-4), + gnome-panel2 (<< 2.0.4-1), + celestia (<< 1.2.4-4), + gimp1.3 (<< 1.3.7-1.1), + metatheme (<< 0.9.7-3), + libgnomeui-0 (<= 2.14.1-3), + gtk2.0-examples (<< 2.2.0), + libgdkxft0, + openoffice.org-core (<< 2.2.1-8), + gtk2-engines-wonderland (<< 1.0-4), + gtk2-engines-cleanice (<< 2.4.0-1.1), + gtk2-engines-thinice (<< 2.6), + gtk2-engines-crux (<< 2.6), + gtk2-engines-mist (<< 2.6), + gtk2-engines-highcontrast (<< 2.6), + gtk2-engines-lighthouseblue (<< 2.6), + gnome-themes (<< 2.6), + gtk2-engines-industrial (<< 0.2.32-5), + gtk2-engines-pixbuf (<= 2.10), + gtk2-engines-redmond95 (<< 2.2.0-2.1), + gtk2-engines-metal (<< 2.2.0-2.1), + gtk2-engines-magicchicken (<< 1.1.1-7.1), + gtk2-engines-qtpixmap (<< 0.28-1.2), + gtk2-engines-smooth (<< 0.5.6-3), + gtk2-engines-ubuntulooks (<= 0.9.11-1), + gtk2-engines-xfce (<< 2.4.0-1), + tamil-gtk2im (<< 2.2-4.4), + imhangul (<< 0.9.13-5), + librsvg2-common (<= 2.14.4-2), + gtk2-engines (<< 1:2.8.2-2), + gtk2-engines-gtk-qt (<< 1:0.7-2), + iiimgcf (<= 11.4.1870-7.3), + scim-bridge (<= 0.2.4-1), + scim-gtk2-immodule (<< 1.4.4-8), + gtk-im-libthai (<< 0.1.4-3), + uim-gtk2.0 (<< 1:1.4.1-3), + libwmf-dev (<< 0.2.8.4-5), + libwmf0.2-7 (<< 0.2.8.4-5), + swf-player (<< 0.3.6-2.3), + gcin (<< 1.3.4-2), + gtk-qt-engine (<< 1:0.8~svn-rev36-1), + iiimf-client-gtk (<< 12.3.91-4), + libginspx0 (<< 20050529-1.1), + scim-bridge-client-gtk (<< 0.4.10-1.1), + iiimgcf (<= 11.4.1870-7), + libwxgtk2.6-0 (<< 2.6.3.2.2-1), + glabels (<< 2.1.3-3), + libeel2-2.18, + xfwm4 (<< 4.4.1-3) +Replaces: libgtk2.0-0png3 +Recommends: hicolor-icon-theme, + ${misc:Depends}, + @BIN_PKG@ +Description: The GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the shared libraries. + +Package: @DIRECTFB_PKG@ +Section: libs +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libgtk+2.0-directfb0 +Description: The GTK+ graphical user interface library - DirectFB runtime + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This version uses DirectFB, a thin library providing an integrated + windowing system and hardware acceleration on top of the Linux + framebuffer. + +Package: @UDEB_PKG@ +XC-Package-Type: udeb +Section: debian-installer +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Provides: @GTK_BINVER_DEP@ +Description: The GTK+ graphical user interface library - minimal runtime + This is a udeb, or a microdeb, for the debian-installer. + . + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the minimal runtime library using DirectFB needed + by the Debian installer. + +Package: @COMMON_PKG@ +Section: misc +Architecture: all +Depends: ${misc:Depends} +Recommends: @SHARED_PKG@ +Replaces: libgtk1.3-common, + libgtk2.0-data +Conflicts: libgtk1.3-common, + libgtk2.0-data +Description: Common files for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the common files which the libraries need. + +Package: @BIN_PKG@ +Section: misc +Architecture: all +Depends: ${misc:Depends}, + @SHARED_PKG@ (>= ${source:Version}) +Replaces: libgtk2.0-common (<= 2.4.0-3), + libgtk2.0-dev (<= 2.4.3-1) +Conflicts: libgtk2.0-dev (<= 2.4.3-1) +Description: The programs for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the program files which is used for the libraries + and others. + +Package: @DEV_PKG@ +Section: libdevel +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + ${misc:Depends}, + libglib2.0-dev (>= 2.12.0), + libpango1.0-dev (>= 1.10.0-2), + libatk1.0-dev (>= 1.6.1-2), + libcairo2-dev, + libx11-dev (>= 2:1.0.0-6), + libxext-dev, + libxinerama-dev, + libxi-dev, + libxrandr-dev, + libxcursor-dev, + libxfixes-dev, + libxcomposite-dev, + libxdamage-dev, + pkg-config +Recommends: python (>= 2.4) +Suggests: @DOC_PKG@ +Replaces: libgtk1.3-dev, + gtk2-engines-pixbuf (<< 2.8.18-5) +Conflicts: libgtk1.3-dev +Description: Development files for the GTK+ library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications. + +Package: @DIRECTFB_DEV_PKG@ +Section: libdevel +Architecture: any +Depends: @DIRECTFB_PKG@ (= ${binary:Version}), + ${misc:Depends}, + @DEV_PKG@ (= ${binary:Version}), + libcairo-directfb2-dev, + libcairo2-dev (>= 1.2.0) +Conflicts: libgtk+2.0-directfb-dev +Description: Development files for the GTK+ library - DirectFB version + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications on top of the DirectFB + library. + +Package: @DEBUG_PKG@ +Section: libdevel +Priority: extra +Architecture: any +Depends: @SHARED_PKG@ (= ${binary:Version}), + ${misc:Depends} +Conflicts: libgtk2.0-dbg +Replaces: libgtk2.0-dbg +Description: The GTK+ libraries and debugging symbols + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: @DOC_PKG@ +Section: doc +Architecture: all +Depends: lynx | www-browser, + ${misc:Depends} +Replaces: libgtk1.3-doc +Conflicts: libgtk1.3-doc +Recommends: libglib2.0-doc, + libatk1.0-doc, + libpango1.0-doc +Description: Documentation for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the HTML documentation for the GTK+ library + in /usr/share/doc/@DOC_PKG@/ . + +Package: @EXAMPLES_PKG@ +Section: x11 +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + @SHARED_PKG@ (= ${binary:Version}) +Replaces: libgtk1.3-dev +Description: Examples files for the GTK+ 2.0 + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the examples files and a demonstration program + for the GTK+-2.0. + +Package: @PIXBUF_PKG@ +Section: graphics +Priority: optional +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + @SHARED_PKG@ (= ${binary:Version}) +Conflicts: gtk2.0-engines-pixbuf +Replaces: gtk2.0-engines-pixbuf +Description: Pixbuf-based theme for GTK+ 2.x + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the pixbuf theme engine. --- gtk+2.0-2.12.1.orig/debian/dh_listmissing.pl +++ gtk+2.0-2.12.1/debian/dh_listmissing.pl @@ -0,0 +1,79 @@ +#!/bin/false /usr/bin/perl -w +# shebang disabled while this script resides in debian/ + +# similar to dh_install; needs some documentation + +use strict; +use File::Find; +use Debian::Debhelper::Dh_Lib; + +init(); + +# list of sourcedirs +my @sourcedirs = @ARGV; + +my @installed; + +my $srcdir = '.'; + +# dh_install code, but not doing any installation, just building @installed +# and stripping sourcedirs from these +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp=tmpdir($package); + my $file=pkgfile($package,"install"); + + my @install; + if ($file) { + @install=filedoublearray($file); # no globbing yet + } + + # Support for -X flag. + my $exclude = ''; + if ($dh{EXCLUDE_FIND}) { + $exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)'; + } + + foreach my $set (@install) { + if (! defined $dh{AUTODEST} && @$set > 1) { + pop @$set; + } + foreach my $src (map { glob "$srcdir/$_" } @$set) { + next if excludefile($src); + + # strip source dir + foreach my $d (@sourcedirs) { + $src=~s/^\Q$srcdir\E\/\Q$d\E\///; + } + + # Keep track of what's installed. + # Kill any extra slashes. Makes the @installed stuff more robust. + $src=~y:/:/:s; + $src=~s:/+$::; + $src=~s:^(\./)*::; + push @installed, "\Q$src\E\/.*|\Q$src\E"; + } + } +} + +# dh_install code, but stripping sourcedirs +my @missing; +my $installed=join("|", @installed); +$installed=qr{^($installed)$}; +find(sub { + -f || -l || return; + $_="$File::Find::dir/$_"; + foreach my $d (@sourcedirs) { + s/^\Q$d\E\///; + } + if (! /$installed/ && ! excludefile($_)) { + my $file=$_; + push @missing, $file; + } +}, @sourcedirs); +if (@missing) { + warning "$_ has been installed upstream but is not in any package" foreach @missing; + if ($dh{FAIL_MISSING}) { + error("missing files, aborting"); + } +} + --- gtk+2.0-2.12.1.orig/debian/control +++ gtk+2.0-2.12.1/debian/control @@ -0,0 +1,302 @@ +Source: gtk+2.0 +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier +Build-Depends: debhelper (>= 5.0.22), + gettext, + pkg-config, + libglib2.0-dev (>= 2.13.5), + libpango1.0-dev (>= 1.17.3), + libatk1.0-dev (>= 1.9.0), + libx11-dev (>= 2:1.0.0-6), + libxext-dev, + libxi-dev, + libxrandr-dev, + libxt-dev, + libxrender-dev, + libxft-dev, + libxcursor-dev, + libxcomposite-dev, + libxdamage-dev, + libxkbfile-dev, + libxinerama-dev, + libxfixes-dev, + libcairo2-dev (>= 1.2.0), + libcairo-directfb2-dev (>= 1.2.4-4), + libtiff4-dev, + libjpeg62-dev, + libpng12-dev, + gnome-pkg-tools (>= 0.11), + chrpath, + dpkg-dev (>= 1.13.19), + x11proto-xext-dev, + libdirectfb-dev (>= 0.9.24), + libcupsys2-dev (>= 1.2), + quilt +Build-Depends-Indep: gtk-doc-tools (>= 1.6), + docbook-xml +Standards-Version: 3.7.2 + +Package: libgtk2.0-0 +Section: libs +Architecture: any +Depends: libgtk2.0-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Provides: gtk2.0-binver-2.10.0 +Conflicts: libgtk2.0-0png3, + eog2 (<< 1.0.1-4), + gnome-panel2 (<< 2.0.4-1), + celestia (<< 1.2.4-4), + gimp1.3 (<< 1.3.7-1.1), + metatheme (<< 0.9.7-3), + libgnomeui-0 (<= 2.14.1-3), + gtk2.0-examples (<< 2.2.0), + libgdkxft0, + openoffice.org-core (<< 2.2.1-8), + gtk2-engines-wonderland (<< 1.0-4), + gtk2-engines-cleanice (<< 2.4.0-1.1), + gtk2-engines-thinice (<< 2.6), + gtk2-engines-crux (<< 2.6), + gtk2-engines-mist (<< 2.6), + gtk2-engines-highcontrast (<< 2.6), + gtk2-engines-lighthouseblue (<< 2.6), + gnome-themes (<< 2.6), + gtk2-engines-industrial (<< 0.2.32-5), + gtk2-engines-pixbuf (<= 2.10), + gtk2-engines-redmond95 (<< 2.2.0-2.1), + gtk2-engines-metal (<< 2.2.0-2.1), + gtk2-engines-magicchicken (<< 1.1.1-7.1), + gtk2-engines-qtpixmap (<< 0.28-1.2), + gtk2-engines-smooth (<< 0.5.6-3), + gtk2-engines-ubuntulooks (<= 0.9.11-1), + gtk2-engines-xfce (<< 2.4.0-1), + tamil-gtk2im (<< 2.2-4.4), + imhangul (<< 0.9.13-5), + librsvg2-common (<= 2.14.4-2), + gtk2-engines (<< 1:2.8.2-2), + gtk2-engines-gtk-qt (<< 1:0.7-2), + iiimgcf (<= 11.4.1870-7.3), + scim-bridge (<= 0.2.4-1), + scim-gtk2-immodule (<< 1.4.4-8), + gtk-im-libthai (<< 0.1.4-3), + uim-gtk2.0 (<< 1:1.4.1-3), + libwmf-dev (<< 0.2.8.4-5), + libwmf0.2-7 (<< 0.2.8.4-5), + swf-player (<< 0.3.6-2.3), + gcin (<< 1.3.4-2), + gtk-qt-engine (<< 1:0.8~svn-rev36-1), + iiimf-client-gtk (<< 12.3.91-4), + libginspx0 (<< 20050529-1.1), + scim-bridge-client-gtk (<< 0.4.10-1.1), + iiimgcf (<= 11.4.1870-7), + libwxgtk2.6-0 (<< 2.6.3.2.2-1), + glabels (<< 2.1.3-3), + libeel2-2.18, + xfwm4 (<< 4.4.1-3) +Replaces: libgtk2.0-0png3 +Recommends: hicolor-icon-theme, + ${misc:Depends}, + libgtk2.0-bin +Description: The GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the shared libraries. + +Package: libgtk-directfb-2.0-0 +Section: libs +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libgtk+2.0-directfb0 +Description: The GTK+ graphical user interface library - DirectFB runtime + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This version uses DirectFB, a thin library providing an integrated + windowing system and hardware acceleration on top of the Linux + framebuffer. + +Package: libgtk-directfb-2.0-0-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Provides: gtk2.0-binver-2.10.0 +Description: The GTK+ graphical user interface library - minimal runtime + This is a udeb, or a microdeb, for the debian-installer. + . + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the minimal runtime library using DirectFB needed + by the Debian installer. + +Package: libgtk2.0-common +Section: misc +Architecture: all +Depends: ${misc:Depends} +Recommends: libgtk2.0-0 +Replaces: libgtk1.3-common, + libgtk2.0-data +Conflicts: libgtk1.3-common, + libgtk2.0-data +Description: Common files for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the common files which the libraries need. + +Package: libgtk2.0-bin +Section: misc +Architecture: all +Depends: ${misc:Depends}, + libgtk2.0-0 (>= ${source:Version}) +Replaces: libgtk2.0-common (<= 2.4.0-3), + libgtk2.0-dev (<= 2.4.3-1) +Conflicts: libgtk2.0-dev (<= 2.4.3-1) +Description: The programs for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the program files which is used for the libraries + and others. + +Package: libgtk2.0-dev +Section: libdevel +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + ${misc:Depends}, + libglib2.0-dev (>= 2.12.0), + libpango1.0-dev (>= 1.10.0-2), + libatk1.0-dev (>= 1.6.1-2), + libcairo2-dev, + libx11-dev (>= 2:1.0.0-6), + libxext-dev, + libxinerama-dev, + libxi-dev, + libxrandr-dev, + libxcursor-dev, + libxfixes-dev, + libxcomposite-dev, + libxdamage-dev, + pkg-config +Recommends: python (>= 2.4) +Suggests: libgtk2.0-doc +Replaces: libgtk1.3-dev, + gtk2-engines-pixbuf (<< 2.8.18-5) +Conflicts: libgtk1.3-dev +Description: Development files for the GTK+ library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications. + +Package: libgtk-directfb-2.0-dev +Section: libdevel +Architecture: any +Depends: libgtk-directfb-2.0-0 (= ${binary:Version}), + ${misc:Depends}, + libgtk2.0-dev (= ${binary:Version}), + libcairo-directfb2-dev, + libcairo2-dev (>= 1.2.0) +Conflicts: libgtk+2.0-directfb-dev +Description: Development files for the GTK+ library - DirectFB version + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the header files and static libraries which is + needed for developing the GTK+ applications on top of the DirectFB + library. + +Package: libgtk2.0-0-dbg +Section: libdevel +Priority: extra +Architecture: any +Depends: libgtk2.0-0 (= ${binary:Version}), + ${misc:Depends} +Conflicts: libgtk2.0-dbg +Replaces: libgtk2.0-dbg +Description: The GTK+ libraries and debugging symbols + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgtk2.0-doc +Section: doc +Architecture: all +Depends: lynx | www-browser, + ${misc:Depends} +Replaces: libgtk1.3-doc +Conflicts: libgtk1.3-doc +Recommends: libglib2.0-doc, + libatk1.0-doc, + libpango1.0-doc +Description: Documentation for the GTK+ graphical user interface library + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the HTML documentation for the GTK+ library + in /usr/share/doc/libgtk2.0-doc/ . + +Package: gtk2.0-examples +Section: x11 +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-0 (= ${binary:Version}) +Replaces: libgtk1.3-dev +Description: Examples files for the GTK+ 2.0 + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the examples files and a demonstration program + for the GTK+-2.0. + +Package: gtk2-engines-pixbuf +Section: graphics +Priority: optional +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgtk2.0-0 (= ${binary:Version}) +Conflicts: gtk2.0-engines-pixbuf +Replaces: gtk2.0-engines-pixbuf +Description: Pixbuf-based theme for GTK+ 2.x + The GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, the GTK+ is suitable + for projects ranging from small one-off tools to complete application + suites. + . + This package contains the pixbuf theme engine. --- gtk+2.0-2.12.1.orig/debian/update-icon-caches +++ gtk+2.0-2.12.1/debian/update-icon-caches @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "$1" in + ""|-h|--help) + echo "Usage: $0 directory [ ... ]" + exit 1 + ;; +esac + +for dir in "$@"; do + if [ ! -d "$dir" ]; then + echo "$dir is not a directory" + exit 2 + fi + if [ -f "$dir"/index.theme ]; then + if [ -f "$dir"/icon-theme.cache ]; then + # The cache already exists, regenerate it + gtk-update-icon-cache --force --quiet "$dir" + fi + else + # No more index.theme, remove the cache if it exists + rm -f "$dir"/icon-theme.cache + rmdir -p --ignore-fail-on-non-empty "$dir" + fi +done + --- gtk+2.0-2.12.1.orig/debian/gtk-tutorial.devhelp +++ gtk+2.0-2.12.1/debian/gtk-tutorial.devhelp @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gtk+2.0-2.12.1.orig/debian/watch +++ gtk+2.0-2.12.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/gtk+/([\d\.]+)[02468]/ \ + gtk\+-(.*)\.tar\.gz \ + debian uupdate --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-0.install.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-0.install.in @@ -0,0 +1,12 @@ +# from Debian +debian/update-gdkpixbuf-loaders usr/lib/@SHARED_PKG@ +debian/update-gtk-immodules usr/lib/@SHARED_PKG@ +# from the shared flavor +debian/install/shared/etc/gtk-@APIVER@/im-multipress.conf etc/gtk-@APIVER@ +debian/install/shared/usr/bin/gdk-pixbuf-query-loaders usr/lib/@SHARED_PKG@ +debian/install/shared/usr/bin/gtk-query-immodules-2.0 usr/lib/@SHARED_PKG@ +debian/install/shared/usr/bin/gtk-update-icon-cache usr/lib/@SHARED_PKG@ +debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders +debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules +debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends +debian/install/shared/usr/lib/*.so.* usr/lib --- gtk+2.0-2.12.1.orig/debian/update-gdkpixbuf-loaders.8 +++ gtk+2.0-2.12.1/debian/update-gdkpixbuf-loaders.8 @@ -0,0 +1,31 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GDKPIXBUF-LOADERS 8 "6 January 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +update-gdkpixbuf-loaders \- Update wrapper script for the Gdkpixbuf loaders list +.SH SYNOPSIS +.B update-gdkpixbuf-loaders +.I package\| version +.SH DESCRIPTION +\fIupdate-gdkpixbuf-loaders\fP is a wrapper script for updating /etc/gtk-2.0/gdk-pixbuf.loaders using \fIgdk-pixbuf-query-loaders\fP. +.br +\fIupdate-gdkpixbuf-loaders\fP get a argument and /etc/gtk-2.0/gdk-pixbuf.loaders for that version will be generated by \fIgdk-pixbuf-query-loaders\fP. +.SH SEE ALSO +.BR gdk-pixbuf-query-loaders (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system. --- gtk+2.0-2.12.1.orig/debian/gtk2.0-examples.examples +++ gtk+2.0-2.12.1/debian/gtk2.0-examples.examples @@ -0,0 +1,2 @@ +# from the source +examples/* --- gtk+2.0-2.12.1.orig/debian/gtk-faq.devhelp +++ gtk+2.0-2.12.1/debian/gtk-faq.devhelp @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gtk+2.0-2.12.1.orig/debian/update-icon-caches.8 +++ gtk+2.0-2.12.1/debian/update-icon-caches.8 @@ -0,0 +1,19 @@ +.TH UPDATE-ICON-CACHES 8 "13 July 2007" +.SH NAME +update-icon-caches \- Update wrapper script for the icon caches +.SH SYNOPSIS +\fBupdate-icon-caches\fP \fIdirectory\fP [ \fI...\fP ] +.SH DESCRIPTION +\fBupdate-icon-caches\fP is a wrapper script for updating the icon +caches in a list of directories. +.P +In each of the directories passed as arguments, the icon cache is +updated if it is already present. It is not created if it does not +already exist. +.P +If the theme index file is not present, the icon cache is removed. +.SH SEE ALSO +.BR gtk-update-icon-cache (1) +.SH AUTHOR +This manual page was written by Josselin Mouette , +for the Debian GNU/Linux system. --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-dev.links.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-dev.links.in @@ -0,0 +1 @@ +usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEV_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-0-dbg.links.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-0-dbg.links.in @@ -0,0 +1 @@ +usr/share/doc/@SHARED_PKG@ usr/share/doc/@DEBUG_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.install.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.install.in @@ -0,0 +1,9 @@ +# from Debian +debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq +debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial +# from the shared flavor +debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc +# from the source +docs/faq/html usr/share/doc/@DOC_PKG@/faq +docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial +docs/*.txt usr/share/doc/@DOC_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-bin.manpages +++ gtk+2.0-2.12.1/debian/libgtk2.0-bin.manpages @@ -0,0 +1,5 @@ +debian/gtk-options.7 +debian/update-gtk-immodules.8 +debian/update-gtk-immodules.fr.8 +debian/update-gdkpixbuf-loaders.8 +debian/update-icon-caches.8 --- gtk+2.0-2.12.1.orig/debian/update-gdkpixbuf-loaders.in +++ gtk+2.0-2.12.1/debian/update-gdkpixbuf-loaders.in @@ -0,0 +1,28 @@ +#!/bin/sh + +# this script is a no-op since 2.10.3-2 +exit 0 + +set -e + +VERSION="@VERSION@" +APIVER="@APIVER@" +SHARED_PKG="@SHARED_PKG@" +TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX") + +echo -n "Updating the gdk-pixbuf loaders list for Gtk+ $VERSION..." +"/usr/lib/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE +if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then + echo "no gdk-pixbuf loader found." +else + echo "done." +fi +if ! test -d "/etc/gtk-$APIVER"; then + echo -n "Creating /etc/gtk-$APIVER..." + mkdir "/etc/gtk-$APIVER" + echo "done." +fi +cp "$TMPFILE" "/etc/gtk-$APIVER/gdk-pixbuf.loaders" +chmod 644 "/etc/gtk-$APIVER/gdk-pixbuf.loaders" + +rm -f "$TMPFILE" --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.doc-base.gtk2-tutorial +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.doc-base.gtk2-tutorial @@ -0,0 +1,18 @@ +Document: gtk2-tutorial +Title: GTK+2.0 Tutorial +Author: Tony Gale and Ian Main +Abstract: GTK (GIMP Toolkit) is a library for creating graphical user + interfaces. It is licensed using the LGPL license, so you can develop + open software, free software, or even commercial non-free software + using GTK without having to spend anything for licenses or royalties. + . + This tutorial is an attempt to document as much as possible of GTK, + but it is by no means complete. This tutorial assumes a good + understanding of C, and how to create C programs. It would be a great + benefit for the reader to have previous X programming experience, but + it shouldn't be necessary. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html +Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-0.postinst.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-0.postinst.in @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +if [ -d /usr/share/doc/@SHARED_PKG@ -a ! -L /usr/share/doc/@SHARED_PKG@ ]; then + if rmdir /usr/share/doc/@SHARED_PKG@; then + ln -sf @COMMON_PKG@ /usr/share/doc/@SHARED_PKG@ + else + echo "Warning: could not remove /usr/share/doc/@SHARED_PKG@." >&2 + fi +fi + +# versions prior to 2.10.1-1 used the 2.4.0 binary version and generated module +# files below /etc/gtk-2.0 which will we can not leave behind (since they +# reference modules not on the system anymore) +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.10.3-2"; then + echo "Removing generated module files coming from the previous Gtk binary version..." + rm -v -f /etc/gtk-2.0/gdk-pixbuf.loaders + rm -v -f /etc/gtk-2.0/gtk.immodules +fi + +#DEBHELPER# --- gtk+2.0-2.12.1.orig/debian/gtk-options.7 +++ gtk+2.0-2.12.1/debian/gtk-options.7 @@ -0,0 +1,107 @@ +.\" gtk-options.7 - Standard Command Line Options for Gnome Programs +.\" Copyright 2003 Jochen Voss +.\" You may redistribute and modify this manual page +.\" under the terms of the GPL. +.TH gtk\-options 7 "2003\-10\-20" "GTK+ 1.2" "GTK+ User\'s Manual" +.SH NAME +gtk\-options \- Standard Command Line Options for GTK+ Programs +.SH SYNOPSIS +.IR "program " [ "standard options" "] [" "specific options" "] " arguments +.SH DESCRIPTION +This manual page describes the command line options, which are common +to all GTK+ based applications. +.SH OPTIONS +.SS GTK+ OPTIONS +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module. +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +A colon separated list of GTK+ debugging flags to set. +Valid flags are +.IR objects , +.IR misc , +.IR signals , +.IR dnd , +and +.IR plugsocket . +The special value +.I all +enables all flags. +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +GTK+ debugging flags to unset. Use this options to override the +.I GTK_DEBUG +environment variable. +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal. +.SS GDK OPTIONS +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +Set the X display to use. Use this option to override the +.I DISPLAY +environment variable. +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use. Use this options to override the screen part +of the +.I DISPLAY +environment variable (see the +.I DISPLAY NAMES +section of the +.IR X (7x) +manual page). +.TP +\fB\-\-sync\fR +Make X calls synchronous. This slows down the program considerably, +but may be useful for debugging purposes. +.TP +\fB\-\-no\-xshm\fR +Do not use the X server\'s XSHM shared memory extension. This slows down the +program. +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the window manager. +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the window manager. +.HP +\fB\-\-gxid_host\fR=\fIHOST\fR +.HP +\fB\-\-gxid_port\fR=\fIPORT\fR +.HP +\fB\-\-xim\-preedit\fR +.TP +\fB\-\-xim\-status\fR +Control the X input method. +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +A colon\-separated list of GDK debugging flags to set. This only works +if your GDK library was compile with debugging support. Valid flags +are +.IR events , +.IR misc , +.IR dnd , +.IR color\-context , +and +.IR xim . +The special value +.I all +enables all valid flags. +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +A colon\-separated list of GDK debugging flags to unset. +Use this options to override the +.I GDK_DEBUG +environment variable. +.SH "SEE ALSO" +.BR X (7x), +the GTK+ documentation, and +the GDK documentation. +.PP +For most GTK+ programs there will be additional command line options, +which are specific to the program. These will be explained in the +application\'s documentation. +.SH AUTHOR +This manual page was written by Jochen Voss . --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-dev.install.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-dev.install.in @@ -0,0 +1,14 @@ +# from Debian +debian/dh_gtkmodules usr/bin +# from the shared flavor +debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin +debian/install/shared/usr/bin/gtk-builder-convert usr/bin +debian/install/shared/usr/include usr +debian/install/shared/usr/lib/*.la usr/lib +debian/install/shared/usr/lib/*.so usr/lib +debian/install/shared/usr/lib/pkgconfig usr/lib +debian/install/shared/usr/lib/gtk-@APIVER@/include usr/lib/gtk-@APIVER@ +debian/install/shared/usr/share/aclocal usr/share +debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/ +# from the static flavor +debian/install/static/usr/lib/*.a usr/lib --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.doc-base.gtk.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.doc-base.gtk.in @@ -0,0 +1,11 @@ +Document: gtk +Title: GTK+ Reference Manual +Author: Damon Chaplin et al. +Abstract: The GTK+ library provides a graphical user interface for + C programs, and is used in projects such as GIMP, Gnome, and Mozilla. + This document covers programming using the GTK+ library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/@DOC_PKG@/gtk/index.html +Files: /usr/share/doc/@DOC_PKG@/gtk/*.html --- gtk+2.0-2.12.1.orig/debian/compat +++ gtk+2.0-2.12.1/debian/compat @@ -0,0 +1 @@ +5 --- gtk+2.0-2.12.1.orig/debian/update-gtk-immodules.in +++ gtk+2.0-2.12.1/debian/update-gtk-immodules.in @@ -0,0 +1,31 @@ +#!/bin/sh + +# this script is a no-op since 2.10.3-2 +exit 0 + +set -e + +VERSION="@VERSION@" +GTK_BINARY_VERSION="@GTK_BINARY_VERSION@" +APIVER="@APIVER@" +SHARED_PKG="@SHARED_PKG@" +TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX") + +echo -n "Updating the IM modules list for Gtk+ $VERSION..." +"/usr/lib/$SHARED_PKG/gtk-query-immodules-$APIVER" \ + $(find "/usr/lib/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \ + > "$TMPFILE" +if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then + echo "no Gtk+ IM modules found." +else + echo "done." +fi +if ! test -d "/etc/gtk-$APIVER"; then + echo -n "Creating /etc/gtk-$APIVER..." + mkdir "/etc/gtk-$APIVER" + echo "done." +fi +cp "$TMPFILE" "/etc/gtk-$APIVER/gtk.immodules" +chmod 644 "/etc/gtk-$APIVER/gtk.immodules" + +rm -f "$TMPFILE" --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.doc-base.gdk-pixbuf +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.doc-base.gdk-pixbuf @@ -0,0 +1,12 @@ +Document: gdk-pixbuf +Title: GDK-pixbuf Reference Manual +Author: Federico Mena Quintero +Abstract: The GDK-pixbuf library is used to manipulate images and + other image-like objects, similar to the imlib library. GDK and + GTK+ use it for image storage and manipulation. This document + covers programming using this library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/index.html +Files: /usr/share/doc/libgtk2.0-doc/gdk-pixbuf/*.html --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-bin.install.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-bin.install.in @@ -0,0 +1,5 @@ +# from the shared flavor +debian/install/shared/usr/share/man/man1/gtk-update-icon-cache.1 usr/share/man/man1 +debian/install/shared/usr/share/man/man1/gtk-query-immodules-@APIVER@.1 usr/share/man/man1 +debian/install/shared/usr/share/man/man1/gdk-pixbuf-query-loaders.1 usr/share/man/man1 +debian/update-icon-caches usr/sbin --- gtk+2.0-2.12.1.orig/debian/README.Debian +++ gtk+2.0-2.12.1/debian/README.Debian @@ -0,0 +1,50 @@ +GTK+2.0 for Debian +------------------- + +Static libraries issue +====================== +If you wish to link the GTK+ 2.0 libraries statically into your program, +please note that you *can not* use the '-static' flag to gcc. +Instead, you have to link your program *dynamically* and link *only* +the GTK+ 2.0 libraries statically, like this: + +$ gcc -export-dynamic -o foo foo.c \ + -Wl,-Bstatic `pkg-config --cflags --libs gtk+-2.0` -Wl,-Bdynamic \ + [other dynamically linked libraries] + +The reason for this is that GTK+ 2.0 uses dlopen(3) in order to load +some modules. Undefined symbols in these modules are resolved by the +dynamic linker. If the program is linked statically, the linker has +no way of finding out which symbols are already present in the program +and might causes strange problem so that proper symbols isn't used -- +Initialize function in statically linked libraries is called, and some +global variable is initialized, dynamically loaded modules might also +expects those initialized global variable. + + +Key binding +=========== +gnome-settings-daemon overrides gtk-key-theme-name in your gtkrc. so if you +use GNOME 2, it won't work, and it's not a bug. +Please use gnome-keybinding-properties instead of gtk-key-theme-name in your +gtkrc. + + +Emacs-style key bindings +======================== +Gtk provides a way of configuring key bindings in Gtk Widgets, especially +to move the cursor in text fields. The default behavior in older Gtk versions +was similar to Emacs, and still available for users to configure. You can +configure the Emacs-style key binding theme in your ~/.gtkrc-2.0 file as +follows: + gtk-key-theme-name = "Emacs" + +Please note that applications can still override this configuration, and this +is the case of the GNOME Desktop: gnome-settings-daemon loads the key theme +from the "/desktop/gnome/interface/gtk_key_theme" GConf entry. This can be +modified with gconf-editor. + + +This file is the initial work of Akira TAGOH and was updated +by Loic Minier . + --- gtk+2.0-2.12.1.orig/debian/update-gtk-immodules.8 +++ gtk+2.0-2.12.1/debian/update-gtk-immodules.8 @@ -0,0 +1,31 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GTK-IMMODULES 8 "13 March 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +update-gtk-immodules \- Update wrapper script for the GTK+ IM modules list +.SH SYNOPSIS +.B update-gtk-immodules +.I package\| version +.SH DESCRIPTION +\fIupdate-gtk-immodules\fP is a wrapper script for updating /etc/gtk-2.0/gtk.immodules using \fIgtk-query-immodules-2.0\fP. +.br +\fIupdate-gtk-immodules\fP get a argument and /etc/gtk-2.0/gtk.immodules for that version will be generated by \fIgtk-query-immodules-2.0\fP. +.SH SEE ALSO +.BR gtk-query-immodules-2.0 (1) +.SH AUTHOR +This manual page was written by Akira TAGOH , +for the Debian GNU/Linux system. --- gtk+2.0-2.12.1.orig/debian/libgtk-directfb-2.0-0.links.in +++ gtk+2.0-2.12.1/debian/libgtk-directfb-2.0-0.links.in @@ -0,0 +1 @@ +usr/share/doc/@SHARED_PKG@ usr/share/doc/@DIRECTFB_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-dev.manpages +++ gtk+2.0-2.12.1/debian/libgtk2.0-dev.manpages @@ -0,0 +1 @@ +debian/dh_gtkmodules.1 --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.doc-base.gdk +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.doc-base.gdk @@ -0,0 +1,13 @@ +Document: gdk +Title: GDK Reference Manual +Author: Damon Chaplin et al. +Abstract: The GDK library provides an OS-independant wrapper around the + most fundamental graphical user interface functions. This allows + GTK+ to be ported to non-X11 systems, as long as GDK is ported first. + . + This document covers programming in GDK. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgtk2.0-doc/gdk/index.html +Files: /usr/share/doc/libgtk2.0-doc/gdk/*.html --- gtk+2.0-2.12.1.orig/debian/copyright +++ gtk+2.0-2.12.1/debian/copyright @@ -0,0 +1,91 @@ +This package was debianized by Akira TAGOH on +Wed, 13 Mar 2002 00:07:25 +0900. + +It was downloaded from . + +Copyright Holders: + +Please do not mail any of the authors listed here +asking questions about this version of GTK+. + +Original Authors +---------------- +Peter Mattis +Spencer Kimball +Josh MacDonald + +The GTK+ Team (in alphabetical order) +------------------------------------- +Shawn T. Amundson +Jerome Bolliet +Damon Chaplin +Tony Gale +Jeff Garzik +Lars Hamann +Raja R Harinath +Carsten Haitzler +Tim Janik +Stefan Jeske +Elliot Lee +Raph Levien +Ian Main +Federico Mena +Paolo Molaro +Jay Painter +Manish Singh +Owen Taylor + +There are many others who have contributed patches; we thank them, +GTK+ is much better because of them. + + +Over time, GTK+ has incorporated some pieces of software which +started as independent projects. We list the original authors here: + + +MS-Windows theme engine +----------------------- +Raymond Penners +Dom Lachowicz + + +Pixbuf theme engine +------------------- +Owen Taylor + + +IME input method +---------------- +Takuro Ashie +Kazuki IWAMOTO + + +Mac OS X backend +---------------- +Anders Carlsson + + +DirectFB backend +---------------- +Denis Oliver Kropp +Sven Neumann +Mike Emmel + +License: + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA. + + See /usr/share/common-licenses/LGPL-2 on your debian system. --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-doc.links.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-doc.links.in @@ -0,0 +1,7 @@ +usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk +usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf +usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk +usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk +usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib +usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject +usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DOC_PKG@/pango --- gtk+2.0-2.12.1.orig/debian/update-gtk-immodules.fr.8 +++ gtk+2.0-2.12.1/debian/update-gtk-immodules.fr.8 @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH UPDATE-GTK-IMMODULES 8 "13 mars 2002" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NOM +update-gtk-immodules \- Script de mise à jour de la liste des modules +GTK+ IM +.SH SYNOPSIS +.B update-gtk-immodules +.I paquet\| version +.SH DESCRIPTION +\fIupdate-gtk-immodules\fP est un script d'analyse pour la mise à jour de +/etc/gtk-2.0/gtk.immodules en utilisant \fIgtk-query-immodules-2.0\fP. +.br +\fIupdate-gtk-immodules\fP reçoit un argument et /etc/gtk-2.0/gtk.immodules sera +généré pour cette version par \fIgtk-query-immodules-2.0\fP. +.SH VOIR AUSSI +.BR gtk-query-immodules-2.0 (1) +.SH AUTEUR +Cette page de manuel a été écrite par Akira TAGOH , +pour le système Debian GNU/Linux. +.SH TRADUCTION +Julien Louis --- gtk+2.0-2.12.1.orig/debian/dh_gtkmodules.in +++ gtk+2.0-2.12.1/debian/dh_gtkmodules.in @@ -0,0 +1,229 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_gtkmodules - create Gtk module files for Gtk modules + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; +use Cwd; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +B is a debhelper program that handles correctly +generating Gtk module files for GdkPixbuf loaders and IM modules +that it finds in the standard module directory. + +This command automatically adds a ".loaders" file to the +current package with the package name or ".immodules" if it +finds any GdkPixbuf loaders or IM modules. + +If this command finds the versionned standard module directory in the +current package, it will generate a dependency on the earliest Gtk +version that Gtk currently has compatibility for in ${misc:Depends} +("binary version"). + +=head1 OPTIONS + +=over 4 + +=item B<-k> + +Do not generate any dependencies in ${misc:Depends}. + +=cut + +init(); + +# 'abs_path' from Cwd resolves symlinks, and we don't want that to happen +# (otherwise it's harder to remove the prefix of the generated output) +sub make_absolute_path { + my $path = shift; + if ($path =~ m#^/#) { + return $path; + } + my $cwd = getcwd; + return "$cwd/$path"; +} + +# gdk-pixbuf-query-loaders helper (generates a GdkPixbuf loaders module +# file on its stdout with *.so passed on its command-line) +my $queryloaders; +if ($ENV{GTK_QUERYLOADERS}) { + $queryloaders = $ENV{GTK_QUERYLOADERS}; +} else { + $queryloaders = '/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders'; +} + +# gtk-query-immodules-2.0 helper (generates an IM module file on its +# stdout with *.so passed on its command-line) +my $queryimmodules; +if ($ENV{GTK_QUERYIMMODULES}) { + $queryimmodules = $ENV{GTK_QUERYIMMODULES}; +} else { + $queryimmodules = '/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0'; +} + +# relative Gtk base module path +my $modules_base_path = '@MODULES_BASE_PATH@'; + +# relative path to GdkPixbuf loaders modules (separated by ":") +my $loaders_modules_path = "$modules_base_path/loaders"; +# relative directory to store the generated loader module file +my $loader_module_files_d = "$modules_base_path/loader-files.d"; + +# relative path to IM modules (separated by ":") +my $im_modules_path = "$modules_base_path/immodules"; +# relative directory to store the generated IM module file +my $im_module_files_d = "$modules_base_path/immodule-files.d"; + +# Gtk binary version virtual Provide +my $gtk_binver_dep = '@GTK_BINVER_DEP@'; + +sub find_modules { + # where to store the modules we find + my $modules_ref = shift; + # base directory to prepend to the list of locations + my $basedir = shift; + # list of locations to search relative to $basedir separated with ":" + my $path = shift; + + foreach (map("$basedir/$_", split(/:/, $path))) { + # it's necessary to make the path absolute to strip the build-time + # prefix later on + my $path = make_absolute_path($_); + if (! -e $path) { + warning("skipping $path."); + next; + } + if (-d $path) { + # if path is a directory (or symlink to a directory), search for + # *.so files or symlinks + open(FIND, + "find '$path' -name '*.so' \\( -type f -or -type l \\) |") + or die "Can't run find: $!"; + while () { + chomp; + push @$modules_ref, $_; + } + close FIND or die "Error while running find: $!"; + } elsif (-f $path or -l $path) { + # if path is a file or symlink, simply add it to the list + push @$modules_ref, $path; + } else { + error("$path has unknown file type."); + } + } +} + +sub query_modules { + # absolute pathname to query helper + my $querymodules = shift; + # base directory to prepend to the output module file and to strip + # of the output + my $basedir = shift; + # relative directory where to write the module file + my $module_files_d = shift; + # relative path of the module file + my $module_file = shift; + # modules to query + my @modules = @_; + + my $do_query = join ' ', $querymodules, @modules; + open(QUERY, "$do_query 2>&1 |") + or die "Can't query modules with $querymodules: $!"; + + doit("rm", "-f", "$module_file"); + if (! -d "$basedir/$module_files_d") { + doit("install", "-d", "$basedir/$module_files_d"); + } + complex_doit("printf '%s\\n' '# automatically generated by dh_gtkmodules, do not edit' >>$module_file"); + + my $absolute_basedir = make_absolute_path($basedir); + my $n_lines = 0; + while () { + next if m/^#/; + chomp; + # if some module couldn't be loaded by the query helper, bail out + if (m#^g_module_open\(\) failed for #) { + error("$querymodules could not load a module:\n$_\nYou should probably make the libraries built by your package available via LD_LIBRARY_PATH."); + } + # strip build-time prefix from output + if (m#^\Q"$absolute_basedir/\E#) { + s#^\Q"$absolute_basedir/\E#"/#; + } + complex_doit("printf '%s\\n' '$_' >>$module_file"); + $n_lines++; + } + # nothing written to the module file, fail miserably + if (0 == $n_lines) { + doit("rm", "-f", "$module_file"); + error("Internal error: could not find any module in the output of $querymodules."); + } + + doit("chmod", 644, "$module_file"); + doit("chown", "0:0", "$module_file"); + + close QUERY or die "Error while querying modules with $querymodules: $!"; +} + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp = tmpdir($package); + my @loaders_modules = (); + my @im_modules = (); + + # if the versionned directory isn't present, give up on package + if (! -d "$tmp/$modules_base_path") { + next; + } + + # since the versionned module directory exists, generate a dependency + # on the Gtk binary version + if (! $dh{K_FLAG}) { + addsubstvar($package, "misc:Depends", $gtk_binver_dep); + } + + # search for specific module types + find_modules(\@loaders_modules, $tmp, $loaders_modules_path); + find_modules(\@im_modules, $tmp, $im_modules_path); + + # if no modules of these types were found, we're done + if (0 == @loaders_modules + @im_modules) { + warning("no GdkPixbuf loaders or Gtk IM modules found for package $package."); + next; + } + + if (@loaders_modules) { + query_modules($queryloaders, + $tmp, + $loader_module_files_d, + "$tmp/$loader_module_files_d/$package.loaders", + @loaders_modules); + } + if (@im_modules) { + query_modules($queryimmodules, + $tmp, + $im_module_files_d, + "$tmp/$im_module_files_d/$package.immodules", + @im_modules); + } +} + +=head1 SEE ALSO + +L + +This program relies on Debhelper, but is shipped with the Gtk +development files. + +=head1 AUTHOR + +Loic Minier + +=cut --- gtk+2.0-2.12.1.orig/debian/gtk2-engines-pixbuf.install.in +++ gtk+2.0-2.12.1/debian/gtk2-engines-pixbuf.install.in @@ -0,0 +1,2 @@ +# from the shared flavor +debian/install/shared/@MODULES_BASE_PATH@/engines/*.so @MODULES_BASE_PATH@/engines --- gtk+2.0-2.12.1.orig/debian/libgtk-directfb-2.0-0-udeb.install.in +++ gtk+2.0-2.12.1/debian/libgtk-directfb-2.0-0-udeb.install.in @@ -0,0 +1,3 @@ +# from the directfb flavor +debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders +debian/install/directfb/usr/lib/*.so.* usr/lib --- gtk+2.0-2.12.1.orig/debian/gtk2.0-examples.install.in +++ gtk+2.0-2.12.1/debian/gtk2.0-examples.install.in @@ -0,0 +1,3 @@ +# from the shared flavor +debian/install/shared/usr/bin/gtk-demo usr/bin +debian/install/shared/usr/share/gtk-@APIVER@/demo usr/share/gtk-@APIVER@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-0.postrm.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-0.postrm.in @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + rm -rf /etc/gtk-@APIVER@ + ;; +esac + +#DEBHELPER# --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-bin.links.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-bin.links.in @@ -0,0 +1,6 @@ +usr/lib/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders +usr/lib/@SHARED_PKG@/gtk-query-immodules-@APIVER@ usr/bin/gtk-query-immodules-@APIVER@ +usr/lib/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache +usr/lib/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules +usr/lib/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders +usr/share/doc/@SHARED_PKG@ usr/share/doc/@BIN_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk-directfb-2.0-dev.install.in +++ gtk+2.0-2.12.1/debian/libgtk-directfb-2.0-dev.install.in @@ -0,0 +1,6 @@ +# from the directfb flavor +debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk +debian/install/directfb/usr/lib/*directfb*.so usr/lib +debian/install/directfb/usr/lib/pkgconfig/* usr/lib/pkgconfig/@DIRECTFB_PKG@ +debian/install/directfb/usr/lib/pkgconfig/*directfb* usr/lib/pkgconfig +debian/install/directfb/usr/lib/gtk-@APIVER@/include/gdkconfig.h usr/lib/gtk-@APIVER@/include/directfb --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-common.preinst.in +++ gtk+2.0-2.12.1/debian/libgtk2.0-common.preinst.in @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ -L /usr/share/doc/@COMMON_PKG@ ]; then + rm -f /usr/share/doc/@COMMON_PKG@ +fi + +#DEBHELPER# --- gtk+2.0-2.12.1.orig/debian/libgtk-directfb-2.0-0.install +++ gtk+2.0-2.12.1/debian/libgtk-directfb-2.0-0.install @@ -0,0 +1,2 @@ +# from the directfb flavor +debian/install/directfb/usr/lib/*directfb*.so.* usr/lib --- gtk+2.0-2.12.1.orig/debian/libgtk-directfb-2.0-dev.links.in +++ gtk+2.0-2.12.1/debian/libgtk-directfb-2.0-dev.links.in @@ -0,0 +1 @@ +usr/share/doc/@DIRECTFB_PKG@ usr/share/doc/@DIRECTFB_DEV_PKG@ --- gtk+2.0-2.12.1.orig/debian/libgtk2.0-common.install +++ gtk+2.0-2.12.1/debian/libgtk2.0-common.install @@ -0,0 +1,3 @@ +# from the shared flavor +debian/install/shared/usr/share/locale usr/share +debian/install/shared/usr/share/themes usr/share