From cf008a5ab888eda202455af6574d6f82d0d5c55a3e4421f39a9cee9a94406715 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 15 Dec 2010 14:44:48 +0000
Subject: [PATCH] Accepting request 55797 from
 home:dimstar:branches:GNOME:Factory

thanks, will fix a few things that are wrong wrt theming

OBS-URL: https://build.opensuse.org/request/show/55797
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=24
---
 gtk+-2.91.5.tar.bz2 |  3 ---
 gtk+-2.91.6.tar.bz2 |  3 +++
 gtk3.changes        | 22 ++++++++++++++++++++++
 gtk3.spec           | 17 ++++++++++++-----
 4 files changed, 37 insertions(+), 8 deletions(-)
 delete mode 100644 gtk+-2.91.5.tar.bz2
 create mode 100644 gtk+-2.91.6.tar.bz2

diff --git a/gtk+-2.91.5.tar.bz2 b/gtk+-2.91.5.tar.bz2
deleted file mode 100644
index ad6758d..0000000
--- a/gtk+-2.91.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3893a158682e4954e31847c5f4aaa1b1f0ff259cff8d141f8ed8a58121e2cc21
-size 16380309
diff --git a/gtk+-2.91.6.tar.bz2 b/gtk+-2.91.6.tar.bz2
new file mode 100644
index 0000000..62af8cb
--- /dev/null
+++ b/gtk+-2.91.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57b0d8dc6e3d43967f19edb9f3706608260b6122a7d3eef66a28025400fa0af7
+size 16795155
diff --git a/gtk3.changes b/gtk3.changes
index e97ba1a..d8f5d26 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sat Dec 11 23:58:35 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.91.6:
+  + Deprecations, cleanups and API changes
+  + GtkComboBox has gained an 'active id' property that is
+    intended for easy binding to settings
+  + GtkAppChooser: A new family of widgets that allow choosing
+    an application to open a file. This is strongly based on
+    the corresponding nautilus dialog, which it is replacing.
+  + The GtkStyleContext branch has been merged, changing the APIs
+    that are used to do themed drawing, and the theme engine
+    interfaces. Among the new classes are GtkStyleContext
+    (replacing GtkStyle) and GtkCssProvider (replacing the gtkrc
+    parser). The migration guide contains a chapter about porting
+    from GtkStyle to GtkStyleContext.
+  + Bugs fixed: bgo#549720, bgo#582557, bgo#619148, bgo#636060,
+    bgo#636129, bgo#636388, bgo#636511
+  + Updated translations.
+- Pixmap engine has been removed and will be replaced with a pixbuf
+  engine.
+
 -------------------------------------------------------------------
 Tue Nov 30 09:48:47 CET 2010 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index e6238b3..feccde9 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk3 (Version 2.91.5)
+# spec file for package gtk3 (Version 2.91.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands
@@ -22,9 +22,10 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        2.91.5
+Version:        2.91.6
 Release:        1
 # FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions.
+# FIXME: Check if CFLAGS workaround in build section is still needed (bgo#637143)
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Url:            http://www.gtk.org/
@@ -277,6 +278,8 @@ cp -a %{S:1} .
 gnome-patch-translation-update
 
 %build
+# FIXME: Workaround for bgo#637143 -- Implicit declaration of functions.
+export CFLAGS="%{optflags} -DGTK_COMPILATION"
 %configure \
         --disable-static \
         --enable-man \
@@ -284,11 +287,14 @@ gnome-patch-translation-update
         --enable-introspection
 # building of gobject-introspection seems to fail with -j 'n>1' (see bgo#624304)
 #%{__make} %{?_smp_mflags}
-%{__make}
+%{__make} V=1
 
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -delete -print
+%if 0%{?suse_version} <= 1130  
+%{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*  
+%endif
 %find_lang gtk30
 %find_lang gtk30-properties
 install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/gtkrc
@@ -408,8 +414,9 @@ fi
 %dir %{_sysconfdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}
-%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/engines
-%{_libdir}/gtk-3.0/%{gtk_binary_version}/engines/libpixmap.so
+# FIXME: libpixmap was removed in favour of libpixbuf, which does not yet exist.
+#%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/engines
+#%{_libdir}/gtk-3.0/%{gtk_binary_version}/engines/libpixbuf.so
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cedilla.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cyrillic-translit.so