Accepting request 158389 from GNOME:Next

Push GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/158389
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=183
This commit is contained in:
Dominique Leuenberger 2013-03-13 22:52:13 +00:00 committed by Git OBS Bridge
parent 3b0691ef4d
commit 0ba30609c4
5 changed files with 55 additions and 20 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac
size 13258752

3
gtk+-2.24.17.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415
size 13288028

View File

@ -13,21 +13,11 @@ This patch cannot be upstreamed as is:
Note that the patch it does not provide solution for bi-arch path clash:
http://bugzilla.gnome.org/show_bug.cgi?id=153848
--- configure.in
+++ configure.in
@@ -1485,7 +1485,8 @@
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
AC_SUBST(GDK_DEP_CFLAGS)
-
+LIB=`echo $libdir | sed 's:.*/::'`
+AC_DEFINE_UNQUOTED([LIB],["$LIB"],[Platform dependent tail of libdir.])
########################################
# Check for Accessibility Toolkit flags
--- gtk/gtkmodules.c
Index: gtk/gtkmodules.c
===================================================================
--- gtk/gtkmodules.c.orig
+++ gtk/gtkmodules.c
@@ -60,6 +60,7 @@
@@ -60,6 +60,7 @@ get_module_path (void)
gchar *home_gtk_dir = NULL;
gchar *module_path;
gchar *default_dir;
@ -35,7 +25,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=153848
static gchar **result = NULL;
if (result)
@@ -73,25 +74,32 @@
@@ -73,25 +74,32 @@ get_module_path (void)
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
if (exe_prefix)
@ -72,3 +62,17 @@ http://bugzilla.gnome.org/show_bug.cgi?id=153848
result = pango_split_file_list (module_path);
g_free (module_path);
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1340,7 +1340,8 @@ AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
AC_SUBST(GDK_DEP_CFLAGS)
-
+LIB=`echo $libdir | sed 's:.*/::'`
+AC_DEFINE_UNQUOTED([LIB],["$LIB"],[Platform dependent tail of libdir.])
########################################
# Check for Accessibility Toolkit flags

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Mon Mar 4 17:22:41 UTC 2013 - dimstar@opensuse.org
- Update to version 2.24.17:
+ GtkFileChooserButton fixes:
- Don't emit file-set signal when the change is not the result
of a user action.
- Don't ever use gtk_file_chooser_get_files.
- Ensure internal consistency when clearing a model.
+ Bugs fixed: bgo#690247, bgo#692955, bgo#694742.
-------------------------------------------------------------------
Mon Feb 18 20:36:33 UTC 2013 - dimstar@opensuse.org
- Update to version 2.24.16:
+ Make GtkItemFactory produce GtkSeparatorMenuItems (bgo#694077).
+ GtkFileChooserButton doesn't handle closing its dialog
correctly Reliably stop spinning when a GtkSpinButton is hidden
(bgo#645065).
-------------------------------------------------------------------
Mon Feb 11 07:26:51 UTC 2013 - dimstar@opensuse.org
- Update to version 2.24.15:
+ Fix scrolling in insensitive modal dialogs.
+ Bugs fixed: bgo#626499, bgo#656565, bgo#664640, bgo#669808,
bgo#674556, bgo#679883, bgo#683511, bgo#689810, bgo#689982,
bgo#690788, bgo#692099, bgo#692554, bgo#692810.
+ Updated translations.
- Rebase gtk-path-local.patch.
-------------------------------------------------------------------
Sun Dec 9 17:29:17 UTC 2012 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gtk2
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
Name: gtk2
%define _name gtk+
Version: 2.24.14
Version: 2.24.17
Release: 0
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
Summary: The GTK+ toolkit library (version 2)