From e578f0ac3e9b39a446c806fbb1cbcf9fc4f9ad20 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 Feb 2015 19:33:07 -0500
Subject: [PATCH] Drop upstreamed patch

---
 0001-Ignore-gdk-pixbuf-deprecations.patch | 27 -----------------------
 gtk2.spec                                 |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 0001-Ignore-gdk-pixbuf-deprecations.patch

diff --git a/0001-Ignore-gdk-pixbuf-deprecations.patch b/0001-Ignore-gdk-pixbuf-deprecations.patch
deleted file mode 100644
index 58b94e6..0000000
--- a/0001-Ignore-gdk-pixbuf-deprecations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5bafcca63f8d065461c311f1ab768e7d0d290813 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 22 Oct 2014 22:10:56 -0400
-Subject: [PATCH] Ignore gdk-pixbuf deprecations
-
-We're not going to start updating the 2.24 branch to newer
-gdk-pixbuf APIs, so ignore deprecations.
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 85f0454..9e5c4f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -621,8 +621,6 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th
-   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
- fi
- 
--CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
--
- 
- dnl
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
--- 
-2.2.0
-
diff --git a/gtk2.spec b/gtk2.spec
index 697aba6..b825ca8 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -35,7 +35,6 @@ Patch2: icon-padding.patch
 Patch8: tooltip-positioning.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-Patch16: 0001-Ignore-gdk-pixbuf-deprecations.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -149,7 +148,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch2 -p1 -b .icon-padding
 %patch8 -p1 -b .tooltip-positioning
 %patch15 -p1 -b .window-dragging
-%patch16 -p1 -b .gdk-pixbuf-deprecations
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;