From f9e0ef66e677e703197d60afcf162f71094f6c49d73decbc075a58e16256dae3 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 1 Sep 2011 23:49:01 +0000
Subject: [PATCH] Accepting request 80576 from
 home:vuntz:branches:GNOME:Factory

Update to 3.1.16

OBS-URL: https://build.opensuse.org/request/show/80576
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=55
---
 gtk+-3.1.12.tar.bz2         |  3 ---
 gtk+-3.1.16.tar.bz2         |  3 +++
 gtk3-enabledeprecated.patch | 11 -----------
 gtk3.changes                | 28 ++++++++++++++++++++++++++++
 gtk3.spec                   |  7 ++-----
 5 files changed, 33 insertions(+), 19 deletions(-)
 delete mode 100644 gtk+-3.1.12.tar.bz2
 create mode 100644 gtk+-3.1.16.tar.bz2
 delete mode 100644 gtk3-enabledeprecated.patch

diff --git a/gtk+-3.1.12.tar.bz2 b/gtk+-3.1.12.tar.bz2
deleted file mode 100644
index 6fbce0b..0000000
--- a/gtk+-3.1.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aefdfa7222792197aa542a79ae11df16fa600f80454d6feda51309a5ebe015aa
-size 17304192
diff --git a/gtk+-3.1.16.tar.bz2 b/gtk+-3.1.16.tar.bz2
new file mode 100644
index 0000000..df669ca
--- /dev/null
+++ b/gtk+-3.1.16.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c9e5d17ecd85fad30e12f0ac6580232b5549c7c8b6f320fdfaee38e245c3b12
+size 17384944
diff --git a/gtk3-enabledeprecated.patch b/gtk3-enabledeprecated.patch
deleted file mode 100644
index a1ed858..0000000
--- a/gtk3-enabledeprecated.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur gtk+-3.1.12//tests/testtoplevelembed.c gtk+-3.1.12.patched//tests/testtoplevelembed.c
---- gtk+-3.1.12//tests/testtoplevelembed.c	2011-07-28 05:25:56.000000000 +0200
-+++ gtk+-3.1.12.patched//tests/testtoplevelembed.c	2011-08-16 12:22:45.576604909 +0200
-@@ -1,4 +1,7 @@
- #include "config.h"
-+
-+#undef GTK_DISABLE_DEPRECATED
-+
- #include <gtk/gtk.h>
- 
- GtkWidget *notebook;
diff --git a/gtk3.changes b/gtk3.changes
index 38f941d..87e26e4 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Aug 31 09:52:16 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.16:
+  + Make distcheck work again, and fix errors that crept in by lack
+    of a working distcheck.
+  + Bugs fixed: bgo#656223.
+- Remove sed hack in %prep introduced for 3.1.14 since it's now
+  unneeded.
+
+-------------------------------------------------------------------
+Tue Aug 30 13:23:29 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.14:
+  + GtkTreeView: The GtkTreeModelFilter and GtkTreeModelSort
+    implementations have been improved and a comprehensive test
+    suite has been added.
+  + GtkFileChooser: The selected file(s) can now be copied to the
+    clipboard.
+  + Bugs fixed: bgo#656851, bgo#344858, bgo#349502, bgo#621076,
+    bgo#634136, bgo#649588, bgo#650762, bgo#651827, bgo#656986,
+    bgo#657146, bgo#657260, bgo#657359, bgo#657384.
+  + Updated translations.
+- Remove build of tests with a sed hack in %prep due to missing
+  file in this tarball. This hack will get removed with the next
+  release.
+- Drop gtk3-enabledeprecated.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Aug 16 11:26:38 CEST 2011 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index f0a50d0..b1fc31e 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -24,7 +24,7 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        3.1.12
+Version:        3.1.16
 Release:        1
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
@@ -43,12 +43,10 @@ Patch1:         gtk3-path-local.patch
 Patch2:         gtk3-bnc129753-localize-font-style-name.patch
 # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
-# PATCH-FIX-UPSTREAM gtk3-enabledeprecated.patch bgo#656639 dimstar@opensuse.org -- Fix building of testtoplevelembed.c by allowing deprecated symbols
-Patch4:         gtk3-enabledeprecated.patch
 BuildRequires:  fdupes
 BuildRequires:  cups-devel
 BuildRequires:  gnome-patch-translation
-BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(atk) >= 2.1.5
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(colord)
 BuildRequires:  pkgconfig(fontconfig)
@@ -291,7 +289,6 @@ cp -a %{S:1} .
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 gnome-patch-translation-update
 
 %build