* debian/patches/005_xpmico.patch:

- Removed, this check is not needed as HeaderSize can't overflow because
    IconCount will be at most 16 bits, and that multiplied by 16 is not
    enough to overflow an integer. (Checked with upstream)
* debian/patches/001_static-linking-dont-query-immodules.patch,
  debian/patches/002_static-linking-dont-build-perf.patch:
  - Add headers.

debian/changelog

@@ -10,6 +10,13 @@ gtk+2.0 (2.17.8-1) UNRELEASED; urgency=low
     - Remove conflicts and replaces no longer needed for packages in stable.
   * debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch:
     - Removed, GtkFileSelection is deprecated.
+  * debian/patches/005_xpmico.patch:
+    - Removed, this check is not needed as HeaderSize can't overflow because
+      IconCount will be at most 16 bits, and that multiplied by 16 is not
+      enough to overflow an integer. (Checked with upstream)
+  * debian/patches/001_static-linking-dont-query-immodules.patch,
+    debian/patches/002_static-linking-dont-build-perf.patch:
+    - Add headers.
   * debian/patches/*
     - Refreshed.
 

debian/patches/001_static-linking-dont-query-immodules.patch

@@ -1,3 +1,7 @@
+Description: Don't query immodules for the local tree when cross-compiling or
+             when --disable-shared was given
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
+
 --- a/configure.in
 +++ b/configure.in
 @@ -157,6 +157,7 @@

debian/patches/002_static-linking-dont-build-perf.patch

@@ -1,3 +1,6 @@
+Description: don't build perf measurement tools in static builds
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
+
 Index: gtk+-2.14.7/Makefile.am
 ===================================================================
 --- gtk+-2.14.7.orig/Makefile.am	2009-01-07 17:33:57.000000000 +0100

debian/patches/005_xpmico.patch

@@ -1,17 +0,0 @@
---- a/gdk-pixbuf/io-ico.c
-+++ b/gdk-pixbuf/io-ico.c
-@@ -231,6 +231,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) {

debian/patches/series

@@ -1,7 +1,6 @@
 001_static-linking-dont-query-immodules.patch
 002_static-linking-dont-build-perf.patch
 003_gdk.pc_privates.patch
-005_xpmico.patch
 009_gtk-export-filechooser.patch
 010_gdkpixbuf_-lm.patch
 015_default-fallback-icon-theme.patch