Merge lp:~attente/gdk-pixbuf/gicon-upstream into lp:ubuntu/saucy/gdk-pixbuf

[William Hua]

* debian/patches/gicon-serialization-support.patch:
  - Add upstream's GdkPixbuf serialization support.

Take upstream's update of GdkPixbuf to implement the GLoadableIcon interface. Requires https://code.launchpad.net/~attente/glib/gicon-upstream/+merge/162430.

[lp:~attente/gdk-pixbuf/gicon-upstream]

55. By Sebastien Bacher on 2013-05-07

* Resynchronize on Debian, remaining changes:
* debian/control.in:
  - B-D on libtiff5-dev | libtiff-dev instead of libtiff-dev, as we
    have made this transition ahead of Debian.

56. By Sebastien Bacher on 2013-05-13

* Resynchronize on Debian, remaining changes:
* debian/control.in:
  - B-D on libtiff5-dev | libtiff-dev instead of libtiff-dev, as we
    have made this transition ahead of Debian.

[Sebastien Bacher (seb128)]

Thanks for the work, the patch require glib 2.36 and the debian/control 2.34 ... should that be bumped to 2.34? Did you try it with glib 2.37.0 which landed this week? out of the glib requirement issue it should be fine to upload to the ppa for some testing and then to ubuntu

review: Needs Information

[lp:~attente/gdk-pixbuf/gicon-upstream]

58. By William Hua on 2013-05-17

Depend on GLib 2.37 for GIcon changes.

[William Hua (attente)]

Thanks, I bumped the GLib version number required, so we should be good now. I'm running it on my system against 2.37 and everything is working fine.

[Sebastien Bacher (seb128)]

Thanks, I've renamed the patch to append "git-" (which we use as a convention to indicator it's an upstream git backport, makes easier to figure out it can be dropped later), added the git description to the patch and uploaded to Ubuntu

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2013-05-17 06:11:25 +0000
@@ -0,0 +1,1 @@
+gicon-serialization-support.patch

=== removed file '.pc/applied-patches'
=== added directory '.pc/gicon-serialization-support.patch'
=== added file '.pc/gicon-serialization-support.patch/configure.ac'
--- .pc/gicon-serialization-support.patch/configure.ac	1970-01-01 00:00:00 +0000
+++ .pc/gicon-serialization-support.patch/configure.ac	2013-05-17 06:11:25 +0000
@@ -0,0 +1,1057 @@
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.63])
+
+# Making point releases:
+#   gdk_pixbuf_micro_version += 1;
+#   gdk_pixbuf_interface_age += 1;
+#   gdk_pixbuf_binary_age += 1;
+#
+# if any functions have been added, set gdk_pixbuf_interface_age to 0.
+#
+# if backwards compatibility has been broken:
+#   gdk_pixbuf_major_version += 1;
+#   gdk_pixbuf_interface_age = 0;
+#   gdk_pixbuf_binary_age = 0;
+
+m4_define([gdk_pixbuf_major_version], [2])
+m4_define([gdk_pixbuf_minor_version], [28])
+m4_define([gdk_pixbuf_micro_version], [1])
+m4_define([gdk_pixbuf_interface_age], [1])
+m4_define([gdk_pixbuf_binary_age],
+          [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
+m4_define([gdk_pixbuf_version],
+          [gdk_pixbuf_major_version.gdk_pixbuf_minor_version.gdk_pixbuf_micro_version])
+m4_define([gdk_pixbuf_api_version], [2.0])
+m4_define([gdk_pixbuf_binary_version], [2.10.0])
+
+
+# required versions of other packages
+m4_define([glib_required_version], [2.34.0])
+
+AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],
+        [gdk-pixbuf])
+
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_SRCDIR([gdk-pixbuf/gdk-pixbuf.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+# Save this value here, since automake will set cflags later
+cflags_set=${CFLAGS+set}
+
+AM_INIT_AUTOMAKE([1.11 foreign no-define -Wno-portability dist-xz no-dist-gzip tar-ustar])
+AM_MAINTAINER_MODE([enable])
+
+# Support silent build rules. Disable
+# by either passing --disable-silent-rules to configure or passing V=0
+# to make
+AM_SILENT_RULES([yes])
+
+#
+# For each of the libraries we build, we define the following
+# substituted variables:
+#
+# foo_PACKAGES:     pkg-config packages this library requires
+# foo_EXTRA_LIBS:   Libraries this module requires not pulled in by pkg-config
+# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config
+# foo_DEP_LIBS:     All libraries this module requires
+# foo_DEP_CFLAGS:   All cflags this module requires
+
+GDK_PIXBUF_MAJOR=gdk_pixbuf_major_version
+GDK_PIXBUF_MINOR=gdk_pixbuf_minor_version
+GDK_PIXBUF_MICRO=gdk_pixbuf_micro_version
+GDK_PIXBUF_VERSION=gdk_pixbuf_version
+GDK_PIXBUF_API_VERSION=gdk_pixbuf_api_version
+GDK_PIXBUF_BINARY_VERSION=gdk_pixbuf_binary_version
+AC_SUBST(GDK_PIXBUF_MAJOR)
+AC_SUBST(GDK_PIXBUF_MINOR)
+AC_SUBST(GDK_PIXBUF_MICRO)
+AC_SUBST(GDK_PIXBUF_VERSION)
+AC_SUBST(GDK_PIXBUF_API_VERSION)
+AC_SUBST(GDK_PIXBUF_BINARY_VERSION)
+
+# libtool versioning
+#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+#LT_REVISION=$GTK_INTERFACE_AGE
+#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
+#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+
+m4_define([lt_current], [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version - gdk_pixbuf_interface_age)])
+m4_define([lt_revision], [gdk_pixbuf_interface_age])
+m4_define([lt_age], [m4_eval(gdk_pixbuf_binary_age - gdk_pixbuf_interface_age)])
+LT_VERSION_INFO="lt_current:lt_revision:lt_age"
+LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
+AC_SUBST(LT_VERSION_INFO)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_CC_C_O
+AC_PROG_CC_STDC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
+
+AC_CANONICAL_HOST
+
+AC_ARG_ENABLE(gio-sniffing,
+              [AC_HELP_STRING([--enable-gio-sniffing=@<:@no/yes/auto@:>@],
+                              [enable or disable gio sniffing [default=auto]])],,
+              [enable_gio_sniffing=auto])
+
+MATH_LIB=-lm
+AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    gio_can_sniff=no
+    MATH_LIB=
+    case "$host" in
+    x86_64-*-*)
+      LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
+      ;;
+    esac
+    ;;
+  *)
+    os_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
+
+case $host in
+  *-*-linux*)
+    os_linux=yes
+    ;;
+esac
+
+if test "$os_win32" = "yes"; then
+  if test x$enable_static = xyes -o x$enable_static = x; then
+    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+    enable_static=no
+  fi
+  if test x$enable_shared = xno; then
+    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+  fi
+  enable_shared=yes
+fi
+
+dnl Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static win32-dll])
+# Create libtool early, because it's used in configure
+LT_OUTPUT
+
+# Make sure we use 64-bit versions of various file stuff.
+AC_SYS_LARGEFILE
+
+AM_PROG_AS
+AC_CHECK_TOOLS(NM, nm, nm)
+
+AC_MSG_CHECKING([for some Win32 platform])
+AS_CASE(["$host"],
+        [*-*-mingw*|*-*-cygwin*], [platform_win32=yes],
+        [platform_win32=no]
+)
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
+AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
+
+if test "$os_win32" = "yes"; then
+  AC_CHECK_TOOL(WINDRES, windres, no)
+  if test "$WINDRES" = no; then
+    AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
+  fi
+  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+fi
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
+
+m4_define([debug_default],
+          m4_if(m4_eval(gdk_pixbuf_minor_version % 2), [1], [yes], [minimum]))
+
+dnl declare --enable-* args and collect ac_help strings
+AC_ARG_ENABLE(debug,
+              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
+                             [turn on debugging @<:@default=debug_default@:>@]),,
+              enable_debug=debug_default)
+AC_ARG_ENABLE(rebuilds,
+              [AC_HELP_STRING([--disable-rebuilds],
+                              [disable all source autogeneration rules])],,
+              [enable_rebuilds=yes])
+
+AS_CASE([$enable_debug],
+        [yes],
+        [
+          test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
+          GDK_PIXBUF_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
+        ],
+
+        [no], [GDK_PIXBUF_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"],
+
+        [minimum], [GDK_PIXBUF_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"]
+)
+
+# Build time sanity check...
+AM_SANITY_CHECK
+
+changequote(,)dnl
+if test "x$GCC" = "xyes"; then
+  case " $CFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) CFLAGS="$CFLAGS -Wall" ;;
+  esac
+
+  if test "x$enable_ansi" = "xyes"; then
+    case " $CFLAGS " in
+    *[\ \	]-ansi[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -ansi" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-pedantic[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -pedantic" ;;
+    esac
+  fi
+fi
+changequote([,])dnl
+
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+
+# Ensure MSVC-compatible struct packing convention is used when
+# compiling for Win32 with gcc.
+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
+# gcc2 uses "-fnative-struct".
+if test x"$os_win32" = xyes; then
+  if test x"$GCC" = xyes; then
+    msnative_struct=''
+    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
+    if test -z "$ac_cv_prog_CC"; then
+      our_gcc="$CC"
+    else
+      our_gcc="$ac_cv_prog_CC"
+    fi
+    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
+      2.)
+        if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
+          msnative_struct='-fnative-struct'
+        fi
+        ;;
+      *)
+        if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
+          msnative_struct='-mms-bitfields'
+        fi
+        ;;
+    esac
+    if test x"$msnative_struct" = x ; then
+      AC_MSG_RESULT([no way])
+      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
+    else
+      CFLAGS="$CFLAGS $msnative_struct"
+      AC_MSG_RESULT([${msnative_struct}])
+    fi
+  fi
+fi
+
+## Initial sanity check, done here so that users get told they
+## have the wrong dependencies as early in the process as possible.
+## Later on we actually use the cflags/libs from separate pkg-config
+## calls. Oh, also the later pkg-config calls don't include
+## the version requirements since those make the module lists
+## annoying to construct
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, [glib-2.0 >= glib_required_version])
+
+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 "^[[^_]].*"'
+else
+    # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+    LIBTOOL_EXPORT_OPTIONS=
+fi
+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+
+dnl ******************************************************
+dnl * See whether to include shared library dependencies *
+dnl ******************************************************
+
+AC_ARG_ENABLE(explicit-deps,
+              [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
+                              [use explicit dependencies in .pc files [default=auto]])],,
+              [enable_explicit_deps=auto])
+
+AC_MSG_CHECKING([Whether to write dependencies into .pc files])
+case $enable_explicit_deps in
+  auto)
+    export SED
+    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
+    if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+      enable_explicit_deps=yes
+    else
+      enable_explicit_deps=no
+    fi
+  ;;
+  yes|no)
+  ;;
+  *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
+  ;;
+esac
+AC_MSG_RESULT($enable_explicit_deps)
+
+AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# and awk are found, so autogenerated sources can be rebuilt
+
+AC_PATH_PROGS(PERL, perl5 perl)
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+  REBUILD=
+fi
+AC_SUBST(REBUILD)
+
+# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
+AC_MSG_CHECKING(for sigsetjmp)
+AC_TRY_LINK([#include <setjmp.h>], [
+sigjmp_buf env;
+sigsetjmp(env, 0);
+], gtk_ok=yes, gtk_ok=no)
+AC_MSG_RESULT($gtk_ok)
+if test "$gtk_ok" = "yes"; then
+  AC_DEFINE(HAVE_SIGSETJMP, 1,
+            [Define to 1 if sigsetjmp is available])
+fi
+
+# i18n stuff
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
+GETTEXT_PACKAGE="$PACKAGE"
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [The prefix for our gettext translation domains.])
+
+dnl The DU4 header files don't provide library prototypes unless
+dnl -std1 is given to the native cc.
+AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+
+gtk_save_LIBS=$LIBS
+LIBS="$LIBS -lm"
+AC_TRY_RUN([#include <math.h>
+             int main (void) { return (log(1) != log(1.)); }],
+     AC_MSG_RESULT(none needed),
+     gtk_save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS -std1"
+     AC_TRY_RUN([#include <math.h>
+                 int main (void) { return (log(1) != log(1.)); }],
+         AC_MSG_RESULT(-std1),
+         AC_MSG_RESULT()
+         CFLAGS="$gtk_save_CFLAGS"
+         AC_MSG_WARN(
+                [No ANSI prototypes found in library. (-std1 didn't work.)]),
+         true
+     ),
+     AC_MSG_RESULT(none needed)
+)
+LIBS=$gtk_save_LIBS
+
+AC_MSG_CHECKING(for the BeOS)
+case $host in
+  *-*-beos*)
+    AC_MSG_RESULT(yes)
+    MATH_LIB=
+  ;;
+  *)
+    AC_MSG_RESULT(no)
+  ;;
+esac
+
+AC_SUBST(MATH_LIB)
+#
+# see bug 162979
+#
+AC_MSG_CHECKING(for HP-UX)
+case $host_os in
+  hpux9* | hpux10* | hpux11*)
+    AC_MSG_RESULT(yes)
+    CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
+  ;;
+  *)
+    AC_MSG_RESULT(no)
+  ;;
+esac
+
+dnl NeXTStep cc seems to need this
+AC_MSG_CHECKING([for extra flags for POSIX compliance])
+AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
+  AC_MSG_RESULT(none needed),
+  gtk_save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -posix"
+  AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
+    AC_MSG_RESULT(-posix),
+    AC_MSG_RESULT()
+    CFLAGS="$gtk_save_CFLAGS"
+    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
+
+#
+# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
+#
+
+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
+
+AM_PATH_GLIB_2_0(glib_required_version, :,
+  AC_MSG_ERROR([
+*** GLIB glib_required_version or better is required. The latest version of
+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
+  gobject gmodule-no-export gthread)
+
+dnl
+dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
+dnl
+gtk_save_LIBS=$LIBS
+LIBS="$LIBS $GLIB_LIBS"
+AC_CHECK_FUNCS(bind_textdomain_codeset)
+LIBS=$gtk_save_LIBS
+
+AC_CHECK_HEADERS(unistd.h,
+                 AC_DEFINE(HAVE_UNISTD_H, 1,
+                           [Define to 1 if unistd.h is available]))
+
+saved_cflags="$CFLAGS"
+saved_ldflags="$LDFLAGS"
+
+
+# Checks for header files.
+AC_HEADER_STDC
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+##################################################
+# Checks for gdk-pixbuf
+##################################################
+
+dnl ********************************************************
+dnl * See whether we need to load our modules as .la files *
+dnl ********************************************************
+
+use_la_modules=false
+case $host in
+  *-aix*) use_la_modules=true
+esac
+
+if $use_la_modules ; then
+   AC_DEFINE(USE_LA_MODULES, 1,
+             [Whether to load modules via .la files rather than directly])
+fi
+
+
+AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
+
+AC_ARG_ENABLE(modules,
+              [AC_HELP_STRING([--disable-modules],
+                              [disable dynamic module loading])])
+
+dynworks=false
+deps=
+if test x$enable_modules = xno; then
+    AC_MSG_RESULT(no)
+else
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING(whether dynamic modules work)
+    ## for loop is to strip newline
+    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
+    for I in $tmp; do
+        dynworks=$I
+    done
+
+    dnl Now we check to see if our libtool supports shared lib deps
+    dnl (in a rather ugly way even)
+    if $dynworks; then
+        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
+        pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+            grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+            sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+        if test "x$pixbuf_deplibs_check" = "xnone" || \
+           test "x$pixbuf_deplibs_check" = "xunknown" || \
+           test "x$pixbuf_deplibs_check" = "x"; then
+            dynworks=false
+        fi
+    fi
+
+    if $dynworks; then
+        AC_DEFINE(USE_GMODULE, 1,
+                  [Define to 1 if gmodule works and should be used])
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+    fi
+fi
+
+dnl We allow people to disable image loaders explicitely, but if they don't we error
+dnl out so that people don't accidentally build without them.
+
+AC_ARG_WITH(libpng,
+            [AC_HELP_STRING([--without-libpng],
+                            [disable PNG loader for gdk-pixbuf])])
+AC_ARG_WITH(libjpeg,
+            [AC_HELP_STRING([--without-libjpeg],
+                            [disable JPEG loader for gdk-pixbuf])])
+AC_ARG_WITH(libtiff,
+            [AC_HELP_STRING([--without-libtiff],
+                            [disable TIFF loader for gdk-pixbuf])])
+AC_ARG_WITH(libjasper,
+            [AC_HELP_STRING([--with-libjasper],
+                            [enable JPEG2000 loader for gdk-pixbuf])])
+AC_ARG_WITH(gdiplus,
+            [AC_HELP_STRING([--without-gdiplus],
+                            [disable GDI+ loaders for gdk-pixbuf on Windows])])
+
+AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
+
+dnl Test for libtiff
+if test x$os_win32 = xno || test x$with_gdiplus = xno; then
+  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+    AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
+      [AC_CHECK_HEADER(tiffio.h,
+        TIFF='tiff'; LIBTIFF='-ltiff',
+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+      [AC_CHECK_LIB(tiff, TIFFWriteScanline,
+        [AC_CHECK_HEADER(tiffio.h,
+          TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
+          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+        [AC_CHECK_LIB(tiff34, TIFFFlushData,
+          [AC_CHECK_HEADER(tiffio.h,
+            TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
+            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))],
+        AC_MSG_WARN(*** TIFF loader will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+  fi
+
+  if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
+     AC_MSG_ERROR([
+*** Checks for TIFF loader failed. You can build without it by passing
+*** --without-libtiff to configure but some programs using GTK+ may
+*** not work properly])
+  fi
+fi
+
+dnl Test for libjpeg
+if test x$os_win32 = xno || test x$with_gdiplus = xno; then
+  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+      jpeg_ok=yes,
+      jpeg_ok=no
+      AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
+    if test "$jpeg_ok" = yes; then
+      AC_MSG_CHECKING([for jpeglib.h])
+      AC_TRY_CPP(
+[#include <stdio.h>
+#undef PACKAGE
+#undef VERSION
+#undef HAVE_STDLIB_H
+#include <jpeglib.h>],
+        jpeg_ok=yes,
+        jpeg_ok=no)
+      AC_MSG_RESULT($jpeg_ok)
+      if test "$jpeg_ok" = yes; then
+        LIBJPEG='-ljpeg'
+        AC_CHECK_LIB(jpeg, jpeg_simple_progression,
+          AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
+                    [Define to 1 is libjpeg supports progressive JPEG]),
+          AC_MSG_WARN(JPEG library does not support progressive saving.))
+      else
+          AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
+      fi
+    fi
+  fi
+
+  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
+     AC_MSG_ERROR([
+*** Checks for JPEG loader failed. You can build without it by passing
+*** --without-libjpeg to configure but some programs using GTK+ may
+*** not work properly])
+  fi
+fi
+
+dnl Test for libpng
+  if test x$with_libpng != xno && test -z "$LIBPNG"; then
+    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10; do
+      AC_MSG_CHECKING(for $l)
+      if $PKG_CONFIG --exists $l ; then
+        AC_MSG_RESULT(yes)
+        PNG='png'
+        PNG_DEP_CFLAGS_PACKAGES=$l
+        LIBPNG=`$PKG_CONFIG --libs $l`
+        break
+      else
+        AC_MSG_RESULT(no)
+      fi
+    done
+    if test x$PNG != xpng; then
+      AC_MSG_RESULT(no)
+      AC_CHECK_LIB(png, png_read_info,
+        [AC_CHECK_HEADER(png.h,
+          png_ok=yes,
+          png_ok=no)],
+        AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
+      if test "$png_ok" = yes; then
+        AC_MSG_CHECKING([for png_structp in png.h])
+        AC_TRY_COMPILE([#include <png.h>],
+          [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
+          png_ok=yes,
+          png_ok=no)
+        AC_MSG_RESULT($png_ok)
+        if test "$png_ok" = yes; then
+          PNG='png'; LIBPNG='-lpng -lz'
+        else
+          AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
+        fi
+      else
+       AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
+      fi
+    fi
+  fi
+
+  if test x$with_libpng != xno && test -z "$LIBPNG"; then
+     AC_MSG_ERROR([
+*** Checks for PNG loader failed. You can build without it by passing
+*** --without-libpng to configure but many programs using GTK+ will
+*** not work properly. The PNG loader is also needed if you are compiling
+*** from Git.])
+  fi
+
+dnl Test for libjasper
+  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
+    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm)
+  fi
+
+  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
+     AC_MSG_ERROR([
+*** Checks for JPEG2000 loader failed. You can build without it by passing
+*** --without-libjasper to configure])
+  fi
+
+AC_SUBST(LIBTIFF)
+AC_SUBST(LIBJPEG)
+AC_SUBST(LIBPNG)
+AC_SUBST(LIBJASPER)
+
+AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
+
+#
+# Allow building some or all gdk-pixbuf loaders included
+#
+AC_MSG_CHECKING(pixbuf loaders to build)
+
+dnl due to an autoconf bug, commas in the first arg to
+dnl AC_HELP_STRING cause problems.
+dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
+dnl                [build the specified loaders into gdk-pixbuf])
+AC_ARG_WITH(included_loaders,
+[  --with-included-loaders=LOADER1,LOADER2,...
+                          build the specified loaders into gdk-pixbuf])
+
+if $dynworks; then
+   :
+else
+   ## if the option was specified, leave it; otherwise disable included loaders
+   if test x$with_included_loaders = xno; then
+           with_included_loaders=yes
+   fi
+fi
+
+# Use the traditional png loader instead of the GDI+ one on Windows,
+# because some important apps like GIMP need to read and write
+# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
+
+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif"
+if test x$with_libjasper = xyes; then
+  all_loaders="$all_loaders,jasper"
+fi
+if test x$os_win32 = xyes && test x$with_gdiplus != xno; then
+  # Skip PNG, see comment above
+  gdip_formats="bmp emf gif ico jpeg tiff wmf"
+  for f in $gdip_formats; do
+    all_loaders="$all_loaders,gdip-$f"
+  done
+else
+  all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
+fi
+included_loaders=""
+# If no loaders specified, include all
+if test "x$with_included_loaders" = xyes ; then
+  included_loaders="$all_loaders"
+else
+  included_loaders="$with_included_loaders"
+fi
+
+AC_MSG_RESULT($included_loaders)
+
+INCLUDED_LOADER_OBJ=
+INCLUDED_LOADER_DEFINE=
+
+IFS="${IFS=     }"; gtk_save_ifs="$IFS"; IFS=","
+for loader in $included_loaders; do
+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
+   :
+ else
+   AC_MSG_ERROR([the specified loader $loader does not exist])
+ fi
+
+ loader_underscores=`echo $loader | sed -e 's/-/_/g'`
+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
+
+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
+ case $loader in
+   gdip-*) ;;
+   *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
+ esac
+ eval INCLUDE_$loader_underscores=yes
+done
+
+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
+# (except gdip-png, which isn't built at all)
+if test x"$INCLUDE_gdip_ico" = xyes; then
+  INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
+fi
+
+IFS="$gtk_save_ifs"
+AC_SUBST(INCLUDED_LOADER_OBJ)
+AC_SUBST(INCLUDED_LOADER_DEFINE)
+
+AM_CONDITIONAL(INCLUDE_PNG, [test x"$INCLUDE_png" = xyes])
+AM_CONDITIONAL(INCLUDE_BMP, [test x"$INCLUDE_bmp" = xyes])
+AM_CONDITIONAL(INCLUDE_WBMP, [test x"$INCLUDE_wbmp" = xyes])
+AM_CONDITIONAL(INCLUDE_GIF, [test x"$INCLUDE_gif" = xyes])
+AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
+AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
+AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
+AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
+AM_CONDITIONAL(INCLUDE_RAS, [test x"$INCLUDE_ras" = xyes])
+AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
+AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
+AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
+AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
+AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
+AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
+AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
+AM_CONDITIONAL(INCLUDE_QTIF, [test x"$INCLUDE_qtif" = xyes])
+# As all GDI+ loaders are either built-in or not, arbitrarily just
+# check one of the variables here
+AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
+
+if test x$enable_gio_sniffing = xauto && test x$gio_can_sniff = x; then
+  AC_MSG_CHECKING([if gio can sniff png])
+  gtk_save_LIBS="$LIBS"
+  gtk_save_CFLAGS="$CFLAGS"
+  LIBS="`$PKG_CONFIG --libs gio-2.0`"
+  CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  #include <gio/gio.h>
+  static const gsize data_size = 159;
+  static const guint8 data[] =
+  {
+    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+    0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+    0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
+    0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+    0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
+    0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
+    0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
+    0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
+    0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+    0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
+    0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
+    0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
+    0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+    0x42, 0x60, 0x82
+  };
+  int
+  main (int argc, char **argv)
+  {
+    char *content_type;
+    char *image_png;
+    g_type_init ();
+    content_type = g_content_type_guess (NULL, data, data_size, NULL);
+    image_png = g_content_type_from_mime_type ("image/png");
+    return !!g_strcmp0 (content_type, image_png);
+  }]])],
+    [gio_can_sniff=yes
+     AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
+    [gio_can_sniff=no])
+  AC_MSG_RESULT($gio_can_sniff)
+  LIBS="$gtk_save_LIBS"
+  CFLAGS="$gtk_save_CFLAGS"
+else
+  if test x$enable_gio_sniffing = xyes; then
+     gio_can_sniff=yes
+     AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+  else
+     gio_can_sniff=no
+  fi
+fi
+
+AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
+AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+
+if $dynworks ; then
+  STATIC_LIB_DEPS=
+  if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
+  fi
+  if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
+  fi
+  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
+      STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+    fi
+  fi
+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+  fi
+else
+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+fi
+
+# Checks to see whether we should include mediaLib
+# support.
+#
+AC_CHECK_HEADER(sys/systeminfo.h,
+                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
+                          [Define to 1 if sys/systeminfo.h is available]))
+AC_CHECK_HEADER(sys/sysinfo.h,
+                AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
+                          [Define to 1 if sys/sysinfo.h is available]))
+
+AC_MSG_CHECKING(for mediaLib 2.3)
+use_mlib25=no
+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
+# patch requires.
+AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
+if test $use_mlib = yes; then
+    AC_DEFINE(USE_MEDIALIB, 1,
+              [Define to 1 if medialib is available and should be used])
+    MEDIA_LIB=-lmlib
+
+    AC_MSG_CHECKING(for mediaLib 2.5)
+    # Check for a mediaLib 2.5 function since that is what is needed for
+    # gdk_rgb_convert integration.
+    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
+    if test $use_mlib25 = yes; then
+        AC_DEFINE(USE_MEDIALIB25, 1,
+                  [Define to 1 if medialib 2.5 is available])
+    fi
+fi
+AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
+AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
+
+# Checks to see if we should compile in MMX support (there will be
+# a runtime test when the code is actually run to see if it should
+# be used - this just checks if we can compile it.)
+#
+# This code is partially taken from Mesa
+#
+AC_MSG_CHECKING(for x86 platform)
+case $host_cpu in
+  i386|i486|i586|i686|i786|k6|k7)
+        use_x86_asm=yes
+        ;;
+   *)
+        use_x86_asm=no
+esac
+AC_MSG_RESULT($use_x86_asm)
+
+use_mmx_asm=no
+if test $use_x86_asm = yes; then
+    save_ac_ext=$ac_ext
+    ac_ext=S
+
+    AC_MSG_CHECKING(compiler support for MMX)
+    cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
+    if AC_TRY_EVAL(ac_compile); then
+        use_mmx_asm=yes
+    fi
+
+    rm -rf conftest*
+
+    ac_ext=$save_ac_ext
+    if test $use_mmx_asm = yes; then
+      AC_DEFINE(USE_MMX, 1,
+                [Define to 1 if XXM is available and should be used])
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+fi
+
+AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
+
+REBUILD_PNGS=
+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$with_gdiplus = xno; then
+  REBUILD_PNGS=#
+fi
+
+dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
+if test $cross_compiling = yes; then
+  AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+    REBUILD_PNGS=#
+  fi
+fi
+
+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
+GDK_PIXBUF_EXTRA_CFLAGS=
+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+
+AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
+AC_SUBST(GDK_PIXBUF_PACKAGES)
+AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
+AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
+AC_SUBST(GDK_PIXBUF_DEP_LIBS)
+AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
+
+###############
+# Check for X11
+###############
+
+GDK_PIXBUF_XLIB_PACKAGES=
+GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+GDK_PIXBUF_XLIB_EXTRA_LIBS=
+
+AC_ARG_WITH(x11,
+            [AC_HELP_STRING([--with-x11],
+                            [build X11 support])])
+
+if test x$with_x11 = xyes; then
+  AM_CONDITIONAL(USE_X11, true)
+  PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
+else
+  AM_CONDITIONAL(USE_X11, false)
+fi
+
+################################################################
+# Strip -export-dynamic from the link lines of various libraries
+################################################################
+
+#
+# pkg-config --libs gmodule includes the "export_dynamic" flag,
+#  but this flag is only meaningful for executables. For libraries
+#  the effect is undefined; what it causes on Linux is that the
+#  export list from -export-symbols-regex is ignored and everything
+#  is exported
+#
+# We are using gmodule-no-export now, but I'm leaving the stripping
+# code in place for now, since pango and atk still require gmodule.
+export SED
+export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+if test -n "$export_dynamic"; then
+  GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
+fi
+
+##################################################
+# GObject introspection
+##################################################
+
+GOBJECT_INTROSPECTION_CHECK([0.9.3])
+
+##################################################
+# Checks for gtk-doc and docbook-tools
+##################################################
+
+GTK_DOC_CHECK([1.11], [--flavour=no-tmpl])
+
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
+AC_ARG_ENABLE(man,
+              [AC_HELP_STRING([--enable-man],
+                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+              enable_man=no)
+
+if test "${enable_man}" != no; then
+  dnl
+  dnl Check for xsltproc
+  dnl
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    enable_man=no
+  fi
+fi
+
+AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+
+
+##################################################
+# Check for -Bsymbolic-functions linker flag used
+# to avoid intra-library PLT jumps, if available.
+##################################################
+
+AC_ARG_ENABLE(Bsymbolic,
+              [AC_HELP_STRING([--disable-Bsymbolic],
+                              [avoid linking with -Bsymbolic])],,
+              [SAVED_LDFLAGS="${LDFLAGS}"
+               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+               LDFLAGS=-Wl,-Bsymbolic-functions
+               AC_TRY_LINK([], [int main (void) { return 0; }],
+                           AC_MSG_RESULT(yes)
+                           enable_Bsymbolic=yes,
+                           AC_MSG_RESULT(no)
+                           enable_Bsymbolic=no)
+               LDFLAGS="${SAVED_LDFLAGS}"])
+
+if test "x${enable_Bsymbolic}" = "xyes"; then
+  GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions
+fi
+
+AC_SUBST(GDK_PIXBUF_LINK_FLAGS)
+
+
+##################################################
+# Output commands
+##################################################
+
+AC_CONFIG_FILES([
+Makefile
+gdk-pixbuf-2.0.pc
+gdk-pixbuf-2.0-uninstalled.pc
+gdk-pixbuf/Makefile
+gdk-pixbuf/gdk_pixbuf.rc
+gdk-pixbuf/gdk-pixbuf-features.h
+gdk-pixbuf/pixops/Makefile
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
+build/win32/vs10/Makefile
+docs/Makefile
+docs/reference/Makefile
+docs/reference/gdk-pixbuf/Makefile
+docs/reference/gdk-pixbuf/version.xml
+po/Makefile.in
+tests/Makefile
+contrib/Makefile
+contrib/gdk-pixbuf-xlib/Makefile
+contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
+config.h.win32
+])
+
+AC_OUTPUT

=== added directory '.pc/gicon-serialization-support.patch/gdk-pixbuf'
=== added file '.pc/gicon-serialization-support.patch/gdk-pixbuf/gdk-pixbuf.c'
--- .pc/gicon-serialization-support.patch/gdk-pixbuf/gdk-pixbuf.c	1970-01-01 00:00:00 +0000
+++ .pc/gicon-serialization-support.patch/gdk-pixbuf/gdk-pixbuf.c	2013-05-17 06:11:25 +0000
@@ -0,0 +1,892 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/* GdkPixbuf library - Basic memory management
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Authors: Mark Crichton <[e-mail]>
+ *          Miguel de Icaza <[e-mail]>
+ *          Federico Mena-Quintero <[e-mail]>
+ *
+ * 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define GDK_PIXBUF_C_COMPILATION
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-features.h"
+#include "gdk-pixbuf-enum-types.h"
+
+/* Include the marshallers */
+#include <glib-object.h>
+#include <gio/gio.h>
+#include "gdk-pixbuf-marshal.c"
+
+/**
+ * SECTION:creating
+ * @Short_description: Creating a pixbuf from image data that is already in memory.
+ * @Title: Image Data in Memory
+ * @See_also: gdk_pixbuf_finalize().
+ * 
+ * The most basic way to create a pixbuf is to wrap an existing pixel
+ * buffer with a #GdkPixbuf structure.  You can use the
+ * gdk_pixbuf_new_from_data() function to do this You need to specify
+ * the destroy notification function that will be called when the
+ * data buffer needs to be freed; this will happen when a #GdkPixbuf
+ * is finalized by the reference counting functions If you have a
+ * chunk of static data compiled into your application, you can pass
+ * in %NULL as the destroy notification function so that the data
+ * will not be freed.
+ * 
+ * 
+ * The gdk_pixbuf_new() function can be used as a convenience to
+ * create a pixbuf with an empty buffer.  This is equivalent to
+ * allocating a data buffer using <function>malloc()</function> and 
+ * then wrapping it with gdk_pixbuf_new_from_data(). The gdk_pixbuf_new() 
+ * function will compute an optimal rowstride so that rendering can be 
+ * performed with an efficient algorithm.
+ * 
+ * 
+ * As a special case, you can use the gdk_pixbuf_new_from_xpm_data()
+ * function to create a pixbuf from inline XPM image data.
+ * 
+ * 
+ * You can also copy an existing pixbuf with the gdk_pixbuf_copy()
+ * function.  This is not the same as just doing a g_object_ref()
+ * on the old pixbuf; the copy function will actually duplicate the
+ * pixel data in memory and create a new #GdkPixbuf structure for it.
+ */
+
+/**
+ * SECTION:refcounting
+ * @Short_description: Functions for reference counting and memory management on pixbufs.
+ * @Title: Reference Counting and Memory Mangement
+ * @See_also: #GdkPixbuf, gdk_pixbuf_new_from_data().
+ * 
+ * #GdkPixbuf structures are reference counted.  This means that an
+ * application can share a single pixbuf among many parts of the
+ * code.  When a piece of the program needs to keep a pointer to a
+ * pixbuf, it should add a reference to it by calling g_object_ref().
+ * When it no longer needs the pixbuf, it should subtract a reference
+ * by calling g_object_unref().  The pixbuf will be destroyed when
+ * its reference count drops to zero.  Newly-created #GdkPixbuf
+ * structures start with a reference count of one.
+ * 
+ * 
+ * <note>
+ * As #GdkPixbuf is derived from #GObject now, gdk_pixbuf_ref() and
+ * gdk_pixbuf_unref() are deprecated in favour of g_object_ref()
+ * and g_object_unref () resp.
+ * </note>
+ * 
+ * <emphasis>Finalizing</emphasis> a pixbuf means to free its pixel
+ * data and to free the #GdkPixbuf structure itself.  Most of the
+ * library functions that create #GdkPixbuf structures create the
+ * pixel data by themselves and define the way it should be freed;
+ * you do not need to worry about those.  The only function that lets
+ * you specify how to free the pixel data is
+ * gdk_pixbuf_new_from_data().  Since you pass it a pre-allocated
+ * pixel buffer, you must also specify a way to free that data.  This
+ * is done with a function of type #GdkPixbufDestroyNotify.  When a
+ * pixbuf created with gdk_pixbuf_new_from_data() is finalized, your
+ * destroy notification function will be called, and it is its
+ * responsibility to free the pixel array.
+ */
+
+static void gdk_pixbuf_finalize     (GObject        *object);
+static void gdk_pixbuf_set_property (GObject        *object,
+				     guint           prop_id,
+				     const GValue   *value,
+				     GParamSpec     *pspec);
+static void gdk_pixbuf_get_property (GObject        *object,
+				     guint           prop_id,
+				     GValue         *value,
+				     GParamSpec     *pspec);
+
+

+enum 
+{
+  PROP_0,
+  PROP_COLORSPACE,
+  PROP_N_CHANNELS,
+  PROP_HAS_ALPHA,
+  PROP_BITS_PER_SAMPLE,
+  PROP_WIDTH,
+  PROP_HEIGHT,
+  PROP_ROWSTRIDE,
+  PROP_PIXELS
+};
+
+static void gdk_pixbuf_icon_iface_init (GIconIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkPixbuf, gdk_pixbuf, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
+                                                gdk_pixbuf_icon_iface_init))
+
+static void 
+gdk_pixbuf_init (GdkPixbuf *pixbuf)
+{
+}
+
+static void
+gdk_pixbuf_class_init (GdkPixbufClass *klass)
+{
+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+        
+        object_class->finalize = gdk_pixbuf_finalize;
+        object_class->set_property = gdk_pixbuf_set_property;
+        object_class->get_property = gdk_pixbuf_get_property;
+
+#define PIXBUF_PARAM_FLAGS G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|\
+                           G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+        /**
+         * GdkPixbuf:n-channels:
+         *
+         * The number of samples per pixel. 
+         * Currently, only 3 or 4 samples per pixel are supported.
+         */
+        g_object_class_install_property (object_class,
+                                         PROP_N_CHANNELS,
+                                         g_param_spec_int ("n-channels",
+                                                           P_("Number of Channels"),
+                                                           P_("The number of samples per pixel"),
+                                                           0,
+                                                           G_MAXINT,
+                                                           3,
+                                                           PIXBUF_PARAM_FLAGS));
+
+        g_object_class_install_property (object_class,
+                                         PROP_COLORSPACE,
+                                         g_param_spec_enum ("colorspace",
+                                                            P_("Colorspace"),
+                                                            P_("The colorspace in which the samples are interpreted"),
+                                                            GDK_TYPE_COLORSPACE,
+                                                            GDK_COLORSPACE_RGB,
+                                                            PIXBUF_PARAM_FLAGS));
+
+        g_object_class_install_property (object_class,
+                                         PROP_HAS_ALPHA,
+                                         g_param_spec_boolean ("has-alpha",
+                                                               P_("Has Alpha"),
+                                                               P_("Whether the pixbuf has an alpha channel"),
+                                                               FALSE,
+                                                               PIXBUF_PARAM_FLAGS));
+
+        /**
+         * GdkPixbuf:bits-per-sample:
+         *
+         * The number of bits per sample. 
+         * Currently only 8 bit per sample are supported.
+         */
+        g_object_class_install_property (object_class,
+                                         PROP_BITS_PER_SAMPLE,
+                                         g_param_spec_int ("bits-per-sample",
+                                                           P_("Bits per Sample"),
+                                                           P_("The number of bits per sample"),
+                                                           1,
+                                                           16,
+                                                           8,
+                                                           PIXBUF_PARAM_FLAGS));
+
+        g_object_class_install_property (object_class,
+                                         PROP_WIDTH,
+                                         g_param_spec_int ("width",
+                                                           P_("Width"),
+                                                           P_("The number of columns of the pixbuf"),
+                                                           1,
+                                                           G_MAXINT,
+                                                           1,
+                                                           PIXBUF_PARAM_FLAGS));
+
+        g_object_class_install_property (object_class,
+                                         PROP_HEIGHT,
+                                         g_param_spec_int ("height",
+                                                           P_("Height"),
+                                                           P_("The number of rows of the pixbuf"),
+                                                           1,
+                                                           G_MAXINT,
+                                                           1,
+                                                           PIXBUF_PARAM_FLAGS));
+
+        /**
+         * GdkPixbuf:rowstride:
+         *
+         * The number of bytes between the start of a row and 
+         * the start of the next row. This number must (obviously)
+         * be at least as large as the width of the pixbuf.
+         */
+        g_object_class_install_property (object_class,
+                                         PROP_ROWSTRIDE,
+                                         g_param_spec_int ("rowstride",
+                                                           P_("Rowstride"),
+                                                           P_("The number of bytes between the start of a row and the start of the next row"),
+                                                           1,
+                                                           G_MAXINT,
+                                                           1,
+                                                           PIXBUF_PARAM_FLAGS));
+
+        g_object_class_install_property (object_class,
+                                         PROP_PIXELS,
+                                         g_param_spec_pointer ("pixels",
+                                                               P_("Pixels"),
+                                                               P_("A pointer to the pixel data of the pixbuf"),
+                                                               PIXBUF_PARAM_FLAGS));
+}
+
+static void
+gdk_pixbuf_finalize (GObject *object)
+{
+        GdkPixbuf *pixbuf = GDK_PIXBUF (object);
+        
+        if (pixbuf->destroy_fn)
+                (* pixbuf->destroy_fn) (pixbuf->pixels, pixbuf->destroy_fn_data);
+        
+        G_OBJECT_CLASS (gdk_pixbuf_parent_class)->finalize (object);
+}
+
+
+/**
+ * gdk_pixbuf_ref: (skip)
+ * @pixbuf: A pixbuf.
+ *
+ * Adds a reference to a pixbuf.
+ *
+ * Return value: The same as the @pixbuf argument.
+ *
+ * Deprecated: 2.0: Use g_object_ref().
+ **/
+GdkPixbuf *
+gdk_pixbuf_ref (GdkPixbuf *pixbuf)
+{
+        return (GdkPixbuf *) g_object_ref (pixbuf);
+}
+
+/**
+ * gdk_pixbuf_unref: (skip)
+ * @pixbuf: A pixbuf.
+ *
+ * Removes a reference from a pixbuf.
+ *
+ * Deprecated: 2.0: Use g_object_unref().
+ **/
+void
+gdk_pixbuf_unref (GdkPixbuf *pixbuf)
+{
+        g_object_unref (pixbuf);
+}
+
+static void
+gdk_pixbuf_icon_iface_init (GIconIface *iface)
+{
+        iface->hash = (guint (*) (GIcon *)) g_direct_hash;
+        iface->equal = (gboolean (*) (GIcon *, GIcon *)) g_direct_equal;
+}
+
+/* Used as the destroy notification function for gdk_pixbuf_new() */
+static void
+free_buffer (guchar *pixels, gpointer data)
+{
+	g_free (pixels);
+}
+
+/**
+ * gdk_pixbuf_new:
+ * @colorspace: Color space for image
+ * @has_alpha: Whether the image should have transparency information
+ * @bits_per_sample: Number of bits per color sample
+ * @width: Width of image in pixels, must be > 0
+ * @height: Height of image in pixels, must be > 0
+ *
+ * Creates a new #GdkPixbuf structure and allocates a buffer for it.  The 
+ * buffer has an optimal rowstride.  Note that the buffer is not cleared;
+ * you will have to fill it completely yourself.
+ *
+ * Return value: A newly-created #GdkPixbuf with a reference count of 1, or 
+ * %NULL if not enough memory could be allocated for the image buffer.
+ **/
+GdkPixbuf *
+gdk_pixbuf_new (GdkColorspace colorspace, 
+                gboolean      has_alpha,
+                int           bits_per_sample,
+                int           width,
+                int           height)
+{
+	guchar *buf;
+	int channels;
+	int rowstride;
+        gsize bytes;
+
+	g_return_val_if_fail (colorspace == GDK_COLORSPACE_RGB, NULL);
+	g_return_val_if_fail (bits_per_sample == 8, NULL);
+	g_return_val_if_fail (width > 0, NULL);
+	g_return_val_if_fail (height > 0, NULL);
+
+	channels = has_alpha ? 4 : 3;
+        rowstride = width * channels;
+        if (rowstride / channels != width || rowstride + 3 < 0) /* overflow */
+                return NULL;
+        
+	/* Always align rows to 32-bit boundaries */
+	rowstride = (rowstride + 3) & ~3;
+
+        bytes = height * rowstride;
+        if (bytes / rowstride !=  height) /* overflow */
+                return NULL;
+            
+	buf = g_try_malloc (bytes);
+	if (!buf)
+		return NULL;
+
+	return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample,
+					 width, height, rowstride,
+					 free_buffer, NULL);
+}
+
+/**
+ * gdk_pixbuf_copy:
+ * @pixbuf: A pixbuf.
+ * 
+ * Creates a new #GdkPixbuf with a copy of the information in the specified
+ * @pixbuf.
+ * 
+ * Return value: (transfer full): A newly-created pixbuf with a reference count of 1, or %NULL if
+ * not enough memory could be allocated.
+ **/
+GdkPixbuf *
+gdk_pixbuf_copy (const GdkPixbuf *pixbuf)
+{
+	guchar *buf;
+	int size;
+
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+	/* Calculate a semi-exact size.  Here we copy with full rowstrides;
+	 * maybe we should copy each row individually with the minimum
+	 * rowstride?
+	 */
+
+	size = gdk_pixbuf_get_byte_length (pixbuf);
+
+	buf = g_try_malloc (size * sizeof (guchar));
+	if (!buf)
+		return NULL;
+
+	memcpy (buf, pixbuf->pixels, size);
+
+	return gdk_pixbuf_new_from_data (buf,
+					 pixbuf->colorspace, pixbuf->has_alpha,
+					 pixbuf->bits_per_sample,
+					 pixbuf->width, pixbuf->height,
+					 pixbuf->rowstride,
+					 free_buffer,
+					 NULL);
+}
+
+/**
+ * gdk_pixbuf_new_subpixbuf:
+ * @src_pixbuf: a #GdkPixbuf
+ * @src_x: X coord in @src_pixbuf
+ * @src_y: Y coord in @src_pixbuf
+ * @width: width of region in @src_pixbuf
+ * @height: height of region in @src_pixbuf
+ * 
+ * Creates a new pixbuf which represents a sub-region of
+ * @src_pixbuf. The new pixbuf shares its pixels with the
+ * original pixbuf, so writing to one affects both.
+ * The new pixbuf holds a reference to @src_pixbuf, so
+ * @src_pixbuf will not be finalized until the new pixbuf
+ * is finalized.
+ * 
+ * Return value: (transfer full): a new pixbuf 
+ **/
+GdkPixbuf*
+gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf,
+                          int        src_x,
+                          int        src_y,
+                          int        width,
+                          int        height)
+{
+        guchar *pixels;
+        GdkPixbuf *sub;
+
+        g_return_val_if_fail (GDK_IS_PIXBUF (src_pixbuf), NULL);
+        g_return_val_if_fail (src_x >= 0 && src_x + width <= src_pixbuf->width, NULL);
+        g_return_val_if_fail (src_y >= 0 && src_y + height <= src_pixbuf->height, NULL);
+
+        pixels = (gdk_pixbuf_get_pixels (src_pixbuf)
+                  + src_y * src_pixbuf->rowstride
+                  + src_x * src_pixbuf->n_channels);
+
+        sub = gdk_pixbuf_new_from_data (pixels,
+                                        src_pixbuf->colorspace,
+                                        src_pixbuf->has_alpha,
+                                        src_pixbuf->bits_per_sample,
+                                        width, height,
+                                        src_pixbuf->rowstride,
+                                        NULL, NULL);
+
+        /* Keep a reference to src_pixbuf */
+        g_object_ref (src_pixbuf);
+  
+        g_object_set_qdata_full (G_OBJECT (sub),
+                                 g_quark_from_static_string ("gdk-pixbuf-subpixbuf-src"),
+                                 src_pixbuf,
+                                 (GDestroyNotify) g_object_unref);
+
+        return sub;
+}
+
+

+
+/* Accessors */
+
+/**
+ * gdk_pixbuf_get_colorspace:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the color space of a pixbuf.
+ *
+ * Return value: Color space.
+ **/
+GdkColorspace
+gdk_pixbuf_get_colorspace (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), GDK_COLORSPACE_RGB);
+
+	return pixbuf->colorspace;
+}
+
+/**
+ * gdk_pixbuf_get_n_channels:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the number of channels of a pixbuf.
+ *
+ * Return value: Number of channels.
+ **/
+int
+gdk_pixbuf_get_n_channels (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+	return pixbuf->n_channels;
+}
+
+/**
+ * gdk_pixbuf_get_has_alpha:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries whether a pixbuf has an alpha channel (opacity information).
+ *
+ * Return value: %TRUE if it has an alpha channel, %FALSE otherwise.
+ **/
+gboolean
+gdk_pixbuf_get_has_alpha (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE);
+
+	return pixbuf->has_alpha ? TRUE : FALSE;
+}
+
+/**
+ * gdk_pixbuf_get_bits_per_sample:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the number of bits per color sample in a pixbuf.
+ *
+ * Return value: Number of bits per color sample.
+ **/
+int
+gdk_pixbuf_get_bits_per_sample (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+	return pixbuf->bits_per_sample;
+}
+
+/**
+ * gdk_pixbuf_get_pixels:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries a pointer to the pixel data of a pixbuf.
+ *
+ * Return value: (array): A pointer to the pixbuf's pixel data.
+ * Please see <xref linkend="image-data"/> for information about how
+ * the pixel data is stored in memory.
+ **/
+guchar *
+gdk_pixbuf_get_pixels (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+	return pixbuf->pixels;
+}
+
+/**
+ * gdk_pixbuf_get_pixels_with_length:
+ * @pixbuf: A pixbuf.
+ * @length: (out): The length of the binary data.
+ *
+ * Queries a pointer to the pixel data of a pixbuf.
+ *
+ * Return value: (array length=length): A pointer to the pixbuf's
+ * pixel data.  Please see <xref linkend="image-data"/>
+ * for information about how the pixel data is stored in
+ * memory.
+ *
+ * Rename to: gdk_pixbuf_get_pixels
+ *
+ * Since: 2.26
+ */
+guchar *
+gdk_pixbuf_get_pixels_with_length (const GdkPixbuf *pixbuf,
+                                   guint           *length)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+        if (length)
+                *length = gdk_pixbuf_get_byte_length (pixbuf);
+
+	return pixbuf->pixels;
+}
+
+/**
+ * gdk_pixbuf_get_width:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the width of a pixbuf.
+ *
+ * Return value: Width in pixels.
+ **/
+int
+gdk_pixbuf_get_width (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+	return pixbuf->width;
+}
+
+/**
+ * gdk_pixbuf_get_height:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the height of a pixbuf.
+ *
+ * Return value: Height in pixels.
+ **/
+int
+gdk_pixbuf_get_height (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+	return pixbuf->height;
+}
+
+/**
+ * gdk_pixbuf_get_rowstride:
+ * @pixbuf: A pixbuf.
+ *
+ * Queries the rowstride of a pixbuf, which is the number of bytes between the start of a row
+ * and the start of the next row.
+ *
+ * Return value: Distance between row starts.
+ **/
+int
+gdk_pixbuf_get_rowstride (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+	return pixbuf->rowstride;
+}
+
+/**
+ * gdk_pixbuf_get_byte_length:
+ * @pixbuf: A pixbuf
+ *
+ * Returns the length of the pixel data, in bytes.
+ *
+ * Return value: The length of the pixel data.
+ *
+ * Since: 2.26
+ */
+gsize
+gdk_pixbuf_get_byte_length (const GdkPixbuf *pixbuf)
+{
+	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), -1);
+
+        return ((pixbuf->height - 1) * pixbuf->rowstride +
+                pixbuf->width * ((pixbuf->n_channels * pixbuf->bits_per_sample + 7) / 8));
+}
+
+

+
+/* General initialization hooks */
+const guint gdk_pixbuf_major_version = GDK_PIXBUF_MAJOR;
+const guint gdk_pixbuf_minor_version = GDK_PIXBUF_MINOR;
+const guint gdk_pixbuf_micro_version = GDK_PIXBUF_MICRO;
+
+const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION;
+
+/* Error quark */
+GQuark
+gdk_pixbuf_error_quark (void)
+{
+  return g_quark_from_static_string ("gdk-pixbuf-error-quark");
+}
+
+/**
+ * gdk_pixbuf_fill:
+ * @pixbuf: a #GdkPixbuf
+ * @pixel: RGBA pixel to clear to
+ *         (0xffffffff is opaque white, 0x00000000 transparent black)
+ *
+ * Clears a pixbuf to the given RGBA value, converting the RGBA value into
+ * the pixbuf's pixel format. The alpha will be ignored if the pixbuf
+ * doesn't have an alpha channel.
+ * 
+ **/
+void
+gdk_pixbuf_fill (GdkPixbuf *pixbuf,
+                 guint32    pixel)
+{
+        guchar *pixels;
+        guint r, g, b, a;
+        guchar *p;
+        guint w, h;
+
+        g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+
+        if (pixbuf->width == 0 || pixbuf->height == 0)
+                return;
+
+        pixels = pixbuf->pixels;
+
+        r = (pixel & 0xff000000) >> 24;
+        g = (pixel & 0x00ff0000) >> 16;
+        b = (pixel & 0x0000ff00) >> 8;
+        a = (pixel & 0x000000ff);
+
+        h = pixbuf->height;
+        
+        while (h--) {
+                w = pixbuf->width;
+                p = pixels;
+
+                switch (pixbuf->n_channels) {
+                case 3:
+                        while (w--) {
+                                p[0] = r;
+                                p[1] = g;
+                                p[2] = b;
+                                p += 3;
+                        }
+                        break;
+                case 4:
+                        while (w--) {
+                                p[0] = r;
+                                p[1] = g;
+                                p[2] = b;
+                                p[3] = a;
+                                p += 4;
+                        }
+                        break;
+                default:
+                        break;
+                }
+                
+                pixels += pixbuf->rowstride;
+        }
+}
+
+

+
+/**
+ * gdk_pixbuf_get_option:
+ * @pixbuf: a #GdkPixbuf
+ * @key: a nul-terminated string.
+ * 
+ * Looks up @key in the list of options that may have been attached to the
+ * @pixbuf when it was loaded, or that may have been attached by another
+ * function using gdk_pixbuf_set_option().
+ *
+ * For instance, the ANI loader provides "Title" and "Artist" options. 
+ * The ICO, XBM, and XPM loaders provide "x_hot" and "y_hot" hot-spot 
+ * options for cursor definitions. The PNG loader provides the tEXt ancillary
+ * chunk key/value pairs as options. Since 2.12, the TIFF and JPEG loaders
+ * return an "orientation" option string that corresponds to the embedded 
+ * TIFF/Exif orientation tag (if present).
+ * 
+ * Return value: the value associated with @key. This is a nul-terminated 
+ * string that should not be freed or %NULL if @key was not found.
+ **/
+const gchar *
+gdk_pixbuf_get_option (GdkPixbuf   *pixbuf,
+                       const gchar *key)
+{
+        gchar **options;
+        gint i;
+
+        g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+        g_return_val_if_fail (key != NULL, NULL);
+  
+        options = g_object_get_qdata (G_OBJECT (pixbuf), 
+                                      g_quark_from_static_string ("gdk_pixbuf_options"));
+        if (options) {
+                for (i = 0; options[2*i]; i++) {
+                        if (strcmp (options[2*i], key) == 0)
+                                return options[2*i+1];
+                }
+        }
+        
+        return NULL;
+}
+
+/**
+ * gdk_pixbuf_set_option:
+ * @pixbuf: a #GdkPixbuf
+ * @key: a nul-terminated string.
+ * @value: a nul-terminated string.
+ * 
+ * Attaches a key/value pair as an option to a #GdkPixbuf. If @key already
+ * exists in the list of options attached to @pixbuf, the new value is 
+ * ignored and %FALSE is returned.
+ *
+ * Return value: %TRUE on success.
+ *
+ * Since: 2.2
+ **/
+gboolean
+gdk_pixbuf_set_option (GdkPixbuf   *pixbuf,
+                       const gchar *key,
+                       const gchar *value)
+{
+        GQuark  quark;
+        gchar **options;
+        gint n = 0;
+ 
+        g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), FALSE);
+        g_return_val_if_fail (key != NULL, FALSE);
+        g_return_val_if_fail (value != NULL, FALSE);
+
+        quark = g_quark_from_static_string ("gdk_pixbuf_options");
+
+        options = g_object_get_qdata (G_OBJECT (pixbuf), quark);
+
+        if (options) {
+                for (n = 0; options[2*n]; n++) {
+                        if (strcmp (options[2*n], key) == 0)
+                                return FALSE;
+                }
+
+                g_object_steal_qdata (G_OBJECT (pixbuf), quark);
+                options = g_renew (gchar *, options, 2*(n+1) + 1);
+        } else {
+                options = g_new (gchar *, 3);
+        }
+        
+        options[2*n]   = g_strdup (key);
+        options[2*n+1] = g_strdup (value);
+        options[2*n+2] = NULL;
+
+        g_object_set_qdata_full (G_OBJECT (pixbuf), quark,
+                                 options, (GDestroyNotify) g_strfreev);
+        
+        return TRUE;
+}
+
+static void
+gdk_pixbuf_set_property (GObject         *object,
+			 guint            prop_id,
+			 const GValue    *value,
+			 GParamSpec      *pspec)
+{
+  GdkPixbuf *pixbuf = GDK_PIXBUF (object);
+
+  switch (prop_id)
+          {
+          case PROP_COLORSPACE:
+                  pixbuf->colorspace = g_value_get_enum (value);
+                  break;
+          case PROP_N_CHANNELS:
+                  pixbuf->n_channels = g_value_get_int (value);
+                  break;
+          case PROP_HAS_ALPHA:
+                  pixbuf->has_alpha = g_value_get_boolean (value);
+                  break;
+          case PROP_BITS_PER_SAMPLE:
+                  pixbuf->bits_per_sample = g_value_get_int (value);
+                  break;
+          case PROP_WIDTH:
+                  pixbuf->width = g_value_get_int (value);
+                  break;
+          case PROP_HEIGHT:
+                  pixbuf->height = g_value_get_int (value);
+                  break;
+          case PROP_ROWSTRIDE:
+                  pixbuf->rowstride = g_value_get_int (value);
+                  break;
+          case PROP_PIXELS:
+                  pixbuf->pixels = (guchar *) g_value_get_pointer (value);
+                  break;
+          default:
+                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                  break;
+          }
+}
+
+static void
+gdk_pixbuf_get_property (GObject         *object,
+			 guint            prop_id,
+			 GValue          *value,
+			 GParamSpec      *pspec)
+{
+  GdkPixbuf *pixbuf = GDK_PIXBUF (object);
+  
+  switch (prop_id)
+          {
+          case PROP_COLORSPACE:
+                  g_value_set_enum (value, gdk_pixbuf_get_colorspace (pixbuf));
+                  break;
+          case PROP_N_CHANNELS:
+                  g_value_set_int (value, gdk_pixbuf_get_n_channels (pixbuf));
+                  break;
+          case PROP_HAS_ALPHA:
+                  g_value_set_boolean (value, gdk_pixbuf_get_has_alpha (pixbuf));
+                  break;
+          case PROP_BITS_PER_SAMPLE:
+                  g_value_set_int (value, gdk_pixbuf_get_bits_per_sample (pixbuf));
+                  break;
+          case PROP_WIDTH:
+                  g_value_set_int (value, gdk_pixbuf_get_width (pixbuf));
+                  break;
+          case PROP_HEIGHT:
+                  g_value_set_int (value, gdk_pixbuf_get_height (pixbuf));
+                  break;
+          case PROP_ROWSTRIDE:
+                  g_value_set_int (value, gdk_pixbuf_get_rowstride (pixbuf));
+                  break;
+          case PROP_PIXELS:
+                  g_value_set_pointer (value, gdk_pixbuf_get_pixels (pixbuf));
+                  break;
+          default:
+                  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                  break;
+          }
+}

=== added directory '.pc/gicon-serialization-support.patch/tests'
=== added file '.pc/gicon-serialization-support.patch/tests/Makefile.am'
--- .pc/gicon-serialization-support.patch/tests/Makefile.am	1970-01-01 00:00:00 +0000
+++ .pc/gicon-serialization-support.patch/tests/Makefile.am	2013-05-17 06:11:25 +0000
@@ -0,0 +1,30 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES =				\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk-pixbuf	\
+	$(GDK_PIXBUF_DEBUG_FLAGS)	\
+	$(GDK_PIXBUF_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
+
+LDADDS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
+	$(GDK_PIXBUF_DEP_LIBS)
+
+noinst_PROGRAMS = \
+	pixbuf-read			\
+	pixbuf-lowmem			\
+	pixbuf-randomly-modified	\
+	pixbuf-random			\
+	pixbuf-threads
+
+pixbuf_read_LDADD = $(LDADDS)
+pixbuf_lowmem_LDADD = $(LDADDS)
+pixbuf_randomly_modified_LDADD = $(LDADDS)
+pixbuf_random_LDADD = $(LDADDS)
+pixbuf_threads_LDADD = $(LDADDS) $(GLIB_LIBS)
+
+
+-include $(top_srcdir)/git.mk

=== added file '.pc/gicon-serialization-support.patch/tests/pixbuf-icon-serialize.c'
=== modified file 'configure.ac'
--- configure.ac	2013-05-13 19:52:09 +0000
+++ configure.ac	2013-05-17 06:11:25 +0000
@@ -26,7 +26,7 @@
 
 
 # required versions of other packages
-m4_define([glib_required_version], [2.34.0])
+m4_define([glib_required_version], [2.37.0])
 
 AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-13 19:52:09 +0000
+++ debian/changelog	2013-05-17 06:11:25 +0000
@@ -1,3 +1,10 @@
+gdk-pixbuf (2.28.1-1ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/gicon-serialization-support.patch:
+    - Add upstream's GdkPixbuf serialization support.
+
+ -- William Hua <[e-mail]>  Fri, 17 May 2013 00:11:11 -0400
+
 gdk-pixbuf (2.28.1-1ubuntu1) saucy; urgency=low
 
   * Resynchronize on Debian, remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-05-13 19:52:09 +0000
+++ debian/control	2013-05-17 06:11:25 +0000
@@ -12,7 +12,7 @@
                debhelper (>= 9),
                autotools-dev,
                gnome-pkg-tools (>= 0.10),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.37.0),
                libx11-dev,
                libpng-dev | libpng12-dev,
                libjpeg-dev,
@@ -81,7 +81,7 @@
          ${shlibs:Depends},
          libgdk-pixbuf2.0-0 (= ${binary:Version}),
          gir1.2-gdkpixbuf-2.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.34.0),
+         libglib2.0-dev (>= 2.37.0),
          libx11-dev,
          libpng12-dev
 Breaks: libgtk2.0-dev (<< 2.21.3),

=== modified file 'debian/control.in'
--- debian/control.in	2013-05-13 19:52:09 +0000
+++ debian/control.in	2013-05-17 06:11:25 +0000
@@ -8,7 +8,7 @@
                debhelper (>= 9),
                autotools-dev,
                gnome-pkg-tools (>= 0.10),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.37.0),
                libx11-dev,
                libpng-dev | libpng12-dev,
                libjpeg-dev,
@@ -77,7 +77,7 @@
          ${shlibs:Depends},
          libgdk-pixbuf2.0-0 (= ${binary:Version}),
          gir1.2-gdkpixbuf-2.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.34.0),
+         libglib2.0-dev (>= 2.37.0),
          libx11-dev,
          libpng12-dev
 Breaks: libgtk2.0-dev (<< 2.21.3),

=== added file 'debian/patches/gicon-serialization-support.patch'
--- debian/patches/gicon-serialization-support.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/gicon-serialization-support.patch	2013-05-17 06:11:25 +0000
@@ -0,0 +1,229 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@
+ 
+ 
+ # required versions of other packages
+-m4_define([glib_required_version], [2.34.0])
++m4_define([glib_required_version], [2.37.0])
+ 
+ AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],
+--- a/gdk-pixbuf/gdk-pixbuf.c
++++ b/gdk-pixbuf/gdk-pixbuf.c
+@@ -135,10 +135,11 @@
+ };
+ 
+ static void gdk_pixbuf_icon_iface_init (GIconIface *iface);
++static void gdk_pixbuf_loadable_icon_iface_init (GLoadableIconIface *iface);
+ 
+ G_DEFINE_TYPE_WITH_CODE (GdkPixbuf, gdk_pixbuf, G_TYPE_OBJECT,
+-                         G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
+-                                                gdk_pixbuf_icon_iface_init))
++                         G_IMPLEMENT_INTERFACE (G_TYPE_ICON, gdk_pixbuf_icon_iface_init)
++                         G_IMPLEMENT_INTERFACE (G_TYPE_LOADABLE_ICON, gdk_pixbuf_loadable_icon_iface_init))
+ 
+ static void 
+ gdk_pixbuf_init (GdkPixbuf *pixbuf)
+@@ -292,11 +293,110 @@
+         g_object_unref (pixbuf);
+ }
+ 
++static GBytes *
++gdk_pixbuf_make_bytes (GdkPixbuf  *pixbuf,
++                       GError    **error)
++{
++  gchar *buffer;
++  gsize size;
++
++  if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &size, "png", error, NULL))
++    return NULL;
++
++  return g_bytes_new_take (buffer, size);
++}
++
++static GVariant *
++gdk_pixbuf_serialize (GIcon *icon)
++{
++  GError *error = NULL;
++  GVariant *result;
++  GBytes *bytes;
++
++  bytes = gdk_pixbuf_make_bytes (GDK_PIXBUF (icon), &error);
++  if (!bytes)
++    {
++      g_critical ("Unable to serialise GdkPixbuf to png (via g_icon_serialize()): %s", error->message);
++      g_error_free (error);
++      return NULL;
++    }
++  result = g_variant_new_from_bytes (G_VARIANT_TYPE_BYTESTRING, bytes, TRUE);
++  g_bytes_unref (bytes);
++
++  return g_variant_new ("(sv)", "bytes", result);
++}
++
++static GInputStream *
++gdk_pixbuf_load (GLoadableIcon  *icon,
++                 int             size,
++                 char          **type,
++                 GCancellable   *cancellable,
++                 GError        **error)
++{
++  GInputStream *stream;
++  GBytes *bytes;
++
++  bytes = gdk_pixbuf_make_bytes (GDK_PIXBUF (icon), error);
++  if (!bytes)
++    return NULL;
++
++  stream = g_memory_input_stream_new_from_bytes (bytes);
++  g_bytes_unref (bytes);
++
++  if (type)
++    *type = g_strdup ("image/png");
++
++  return stream;
++}
++
++static void
++gdk_pixbuf_load_async (GLoadableIcon       *icon,
++                       int                  size,
++                       GCancellable        *cancellable,
++                       GAsyncReadyCallback  callback,
++                       gpointer             user_data)
++{
++  GTask *task;
++
++  task = g_task_new (icon, cancellable, callback, user_data);
++  g_task_return_pointer (task, icon, NULL);
++  g_object_unref (task);
++}
++
++static GInputStream *
++gdk_pixbuf_load_finish (GLoadableIcon  *icon,
++                        GAsyncResult   *res,
++                        char          **type,
++                        GError        **error)
++{
++  g_return_val_if_fail (g_task_is_valid (res, icon), NULL);
++
++  if (!g_task_propagate_pointer (G_TASK (res), error))
++    return NULL;
++
++  return gdk_pixbuf_load (icon, 0, type, NULL, error);
++}
++
++static void
++gdk_pixbuf_loadable_icon_iface_init (GLoadableIconIface *iface)
++{
++  iface->load = gdk_pixbuf_load;
++
++  /* In theory encoding a png could be time-consuming but we're talking
++   * about icons here, so assume it's probably going to be OK and handle
++   * the async variant of the call in-thread instead of having the
++   * default implementation dispatch it to a worker.
++   */
++  iface->load_async = gdk_pixbuf_load_async;
++  iface->load_finish = gdk_pixbuf_load_finish;
++}
++
+ static void
+ gdk_pixbuf_icon_iface_init (GIconIface *iface)
+ {
+         iface->hash = (guint (*) (GIcon *)) g_direct_hash;
+         iface->equal = (gboolean (*) (GIcon *, GIcon *)) g_direct_equal;
++        iface->serialize = gdk_pixbuf_serialize;
+ }
+ 
+ /* Used as the destroy notification function for gdk_pixbuf_new() */
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -6,6 +6,8 @@
+ 	$(GDK_PIXBUF_DEBUG_FLAGS)	\
+ 	$(GDK_PIXBUF_DEP_CFLAGS)
+ 
++AM_CFLAGS = '-DABS_SRCDIR="$(abs_srcdir)"'
++
+ DEPS = \
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
+ 
+@@ -18,13 +20,15 @@
+ 	pixbuf-lowmem			\
+ 	pixbuf-randomly-modified	\
+ 	pixbuf-random			\
+-	pixbuf-threads
++	pixbuf-threads			\
++	pixbuf-icon-serialize
+ 
+ pixbuf_read_LDADD = $(LDADDS)
+ pixbuf_lowmem_LDADD = $(LDADDS)
+ pixbuf_randomly_modified_LDADD = $(LDADDS)
+ pixbuf_random_LDADD = $(LDADDS)
+ pixbuf_threads_LDADD = $(LDADDS) $(GLIB_LIBS)
++pixbuf_icon_serialize_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ 
+ -include $(top_srcdir)/git.mk
+--- /dev/null
++++ b/tests/pixbuf-icon-serialize.c
+@@ -0,0 +1,60 @@
++#include "config.h"
++#include "gdk-pixbuf/gdk-pixbuf.h"
++#include <string.h>
++#include <glib.h>
++
++static void
++test_serialize (void)
++{
++  GError *error = NULL;
++  GdkPixbuf *pixbuf;
++  GdkPixbuf *pixbuf2;
++  GVariant *data;
++  GIcon *icon;
++  GInputStream *stream;
++
++  pixbuf = gdk_pixbuf_new_from_file (ABS_SRCDIR "/test-image.png", &error);
++  g_assert_no_error (error);
++  g_assert (pixbuf != NULL);
++
++  /* turn it into a GVariant */
++  data = g_icon_serialize (G_ICON (pixbuf));
++
++  /* back to a GIcon, but this will be a GBytesIcon, not GdkPixbuf */
++  icon = g_icon_deserialize (data);
++  g_assert (G_IS_BYTES_ICON (icon));
++
++  /* but since that is a GLoadableIcon, we can load it again */
++  stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), 0, NULL, NULL, &error);
++  g_assert_no_error (error);
++  pixbuf2 = gdk_pixbuf_new_from_stream (stream, NULL, &error);
++  g_assert_no_error (error);
++
++  /* make sure that the pixels are the same.
++   * our _serialize() uses png, so this should be perfect.
++   */
++  {
++    guchar *pixels_a, *pixels_b;
++    guint len_a, len_b;
++    pixels_a = gdk_pixbuf_get_pixels_with_length (pixbuf, &len_a);
++    pixels_b = gdk_pixbuf_get_pixels_with_length (pixbuf2, &len_b);
++    g_assert (len_a == len_b);
++    g_assert (memcmp (pixels_a, pixels_b, len_a) == 0);
++  }
++
++  g_object_unref (pixbuf2);
++  g_object_unref (pixbuf);
++  g_object_unref (stream);
++  g_variant_unref (data);
++
++}
++
++int
++main (int argc, char **argv)
++{
++  g_test_init (&argc, &argv, NULL);
++
++  g_test_add_func ("/pixbuf/icon/serialize", test_serialize);
++
++  return g_test_run ();
++}

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-07 19:03:11 +0000
+++ debian/patches/series	2013-05-17 06:11:25 +0000
@@ -0,0 +1,1 @@
+gicon-serialization-support.patch

=== modified file 'gdk-pixbuf/gdk-pixbuf.c'
--- gdk-pixbuf/gdk-pixbuf.c	2012-09-18 17:06:38 +0000
+++ gdk-pixbuf/gdk-pixbuf.c	2013-05-17 06:11:25 +0000
@@ -135,10 +135,11 @@
 };
 
 static void gdk_pixbuf_icon_iface_init (GIconIface *iface);
+static void gdk_pixbuf_loadable_icon_iface_init (GLoadableIconIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GdkPixbuf, gdk_pixbuf, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
-                                                gdk_pixbuf_icon_iface_init))
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ICON, gdk_pixbuf_icon_iface_init)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_LOADABLE_ICON, gdk_pixbuf_loadable_icon_iface_init))
 
 static void 
 gdk_pixbuf_init (GdkPixbuf *pixbuf)
@@ -292,11 +293,110 @@
         g_object_unref (pixbuf);
 }
 
+static GBytes *
+gdk_pixbuf_make_bytes (GdkPixbuf  *pixbuf,
+                       GError    **error)
+{
+  gchar *buffer;
+  gsize size;
+
+  if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &size, "png", error, NULL))
+    return NULL;
+
+  return g_bytes_new_take (buffer, size);
+}
+
+static GVariant *
+gdk_pixbuf_serialize (GIcon *icon)
+{
+  GError *error = NULL;
+  GVariant *result;
+  GBytes *bytes;
+
+  bytes = gdk_pixbuf_make_bytes (GDK_PIXBUF (icon), &error);
+  if (!bytes)
+    {
+      g_critical ("Unable to serialise GdkPixbuf to png (via g_icon_serialize()): %s", error->message);
+      g_error_free (error);
+      return NULL;
+    }
+  result = g_variant_new_from_bytes (G_VARIANT_TYPE_BYTESTRING, bytes, TRUE);
+  g_bytes_unref (bytes);
+
+  return g_variant_new ("(sv)", "bytes", result);
+}
+
+static GInputStream *
+gdk_pixbuf_load (GLoadableIcon  *icon,
+                 int             size,
+                 char          **type,
+                 GCancellable   *cancellable,
+                 GError        **error)
+{
+  GInputStream *stream;
+  GBytes *bytes;
+
+  bytes = gdk_pixbuf_make_bytes (GDK_PIXBUF (icon), error);
+  if (!bytes)
+    return NULL;
+
+  stream = g_memory_input_stream_new_from_bytes (bytes);
+  g_bytes_unref (bytes);
+
+  if (type)
+    *type = g_strdup ("image/png");
+
+  return stream;
+}
+
+static void
+gdk_pixbuf_load_async (GLoadableIcon       *icon,
+                       int                  size,
+                       GCancellable        *cancellable,
+                       GAsyncReadyCallback  callback,
+                       gpointer             user_data)
+{
+  GTask *task;
+
+  task = g_task_new (icon, cancellable, callback, user_data);
+  g_task_return_pointer (task, icon, NULL);
+  g_object_unref (task);
+}
+
+static GInputStream *
+gdk_pixbuf_load_finish (GLoadableIcon  *icon,
+                        GAsyncResult   *res,
+                        char          **type,
+                        GError        **error)
+{
+  g_return_val_if_fail (g_task_is_valid (res, icon), NULL);
+
+  if (!g_task_propagate_pointer (G_TASK (res), error))
+    return NULL;
+
+  return gdk_pixbuf_load (icon, 0, type, NULL, error);
+}
+
+static void
+gdk_pixbuf_loadable_icon_iface_init (GLoadableIconIface *iface)
+{
+  iface->load = gdk_pixbuf_load;
+
+  /* In theory encoding a png could be time-consuming but we're talking
+   * about icons here, so assume it's probably going to be OK and handle
+   * the async variant of the call in-thread instead of having the
+   * default implementation dispatch it to a worker.
+   */
+  iface->load_async = gdk_pixbuf_load_async;
+  iface->load_finish = gdk_pixbuf_load_finish;
+}
+
 static void
 gdk_pixbuf_icon_iface_init (GIconIface *iface)
 {
         iface->hash = (guint (*) (GIcon *)) g_direct_hash;
         iface->equal = (gboolean (*) (GIcon *, GIcon *)) g_direct_equal;
+        iface->serialize = gdk_pixbuf_serialize;
 }
 
 /* Used as the destroy notification function for gdk_pixbuf_new() */

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-07-23 11:26:25 +0000
+++ tests/Makefile.am	2013-05-17 06:11:25 +0000
@@ -6,6 +6,8 @@
 	$(GDK_PIXBUF_DEBUG_FLAGS)	\
 	$(GDK_PIXBUF_DEP_CFLAGS)
 
+AM_CFLAGS = '-DABS_SRCDIR="$(abs_srcdir)"'
+
 DEPS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
 
@@ -18,13 +20,15 @@
 	pixbuf-lowmem			\
 	pixbuf-randomly-modified	\
 	pixbuf-random			\
-	pixbuf-threads
+	pixbuf-threads			\
+	pixbuf-icon-serialize
 
 pixbuf_read_LDADD = $(LDADDS)
 pixbuf_lowmem_LDADD = $(LDADDS)
 pixbuf_randomly_modified_LDADD = $(LDADDS)
 pixbuf_random_LDADD = $(LDADDS)
 pixbuf_threads_LDADD = $(LDADDS) $(GLIB_LIBS)
+pixbuf_icon_serialize_LDADD = $(LDADDS) $(GLIB_LIBS)
 
 
 -include $(top_srcdir)/git.mk

=== added file 'tests/pixbuf-icon-serialize.c'
--- tests/pixbuf-icon-serialize.c	1970-01-01 00:00:00 +0000
+++ tests/pixbuf-icon-serialize.c	2013-05-17 06:11:25 +0000
@@ -0,0 +1,60 @@
+#include "config.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <string.h>
+#include <glib.h>
+
+static void
+test_serialize (void)
+{
+  GError *error = NULL;
+  GdkPixbuf *pixbuf;
+  GdkPixbuf *pixbuf2;
+  GVariant *data;
+  GIcon *icon;
+  GInputStream *stream;
+
+  pixbuf = gdk_pixbuf_new_from_file (ABS_SRCDIR "/test-image.png", &error);
+  g_assert_no_error (error);
+  g_assert (pixbuf != NULL);
+
+  /* turn it into a GVariant */
+  data = g_icon_serialize (G_ICON (pixbuf));
+
+  /* back to a GIcon, but this will be a GBytesIcon, not GdkPixbuf */
+  icon = g_icon_deserialize (data);
+  g_assert (G_IS_BYTES_ICON (icon));
+
+  /* but since that is a GLoadableIcon, we can load it again */
+  stream = g_loadable_icon_load (G_LOADABLE_ICON (icon), 0, NULL, NULL, &error);
+  g_assert_no_error (error);
+  pixbuf2 = gdk_pixbuf_new_from_stream (stream, NULL, &error);
+  g_assert_no_error (error);
+
+  /* make sure that the pixels are the same.
+   * our _serialize() uses png, so this should be perfect.
+   */
+  {
+    guchar *pixels_a, *pixels_b;
+    guint len_a, len_b;
+    pixels_a = gdk_pixbuf_get_pixels_with_length (pixbuf, &len_a);
+    pixels_b = gdk_pixbuf_get_pixels_with_length (pixbuf2, &len_b);
+    g_assert (len_a == len_b);
+    g_assert (memcmp (pixels_a, pixels_b, len_a) == 0);
+  }
+
+  g_object_unref (pixbuf2);
+  g_object_unref (pixbuf);
+  g_object_unref (stream);
+  g_variant_unref (data);
+
+}
+
+int
+main (int argc, char **argv)
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/pixbuf/icon/serialize", test_serialize);
+
+  return g_test_run ();
+}