pool/gtk2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 127965 from home:Zaitor:branches:GNOME:Factory

Browse Source 
Update to ver 2.24.11

OBS-URL: https://build.opensuse.org/request/show/127965
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=170
This commit is contained in:
Dominique Leuenberger 2012-07-16 20:39:35 +00:00 committed by Git OBS Bridge
parent be4cf78b3c
commit 4fd994f2be
5 changed files with 24 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-2.24.10.tar.xz
View File

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

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

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

81
gtk2-immodule-fallback.patch
View File

@ -1,81 +0,0 @@
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 593a868..c5bd139 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -648,6 +648,26 @@ match_locale (const gchar *locale,
return 0;
}
+static const gchar *
+lookup_immodule (gchar **immodules_list)
+{
+ while (immodules_list && *immodules_list)
+ {
+ if (g_strcmp0 (*immodules_list, SIMPLE_ID) == 0)
+ return SIMPLE_ID;
+ else
+ {
+ GtkIMModule *module;
+ module = g_hash_table_lookup (contexts_hash, *immodules_list);
+ if (module)
+ return module->contexts[0]->context_id;
+ }
+ immodules_list++;
+ }
+
+ return NULL;
+}
+
/**
* _gtk_im_module_get_default_context_id:
* @client_window: a window
@@ -664,7 +684,7 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
const gchar *context_id = NULL;
gint best_goodness = 0;
gint i;
- gchar *tmp_locale, *tmp;
+ gchar *tmp_locale, *tmp, **immodules;
const gchar *envvar;
GdkScreen *screen;
GtkSettings *settings;
@@ -672,11 +692,16 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
if (!contexts_hash)
gtk_im_module_initialize ();
- envvar = g_getenv ("GTK_IM_MODULE");
- if (envvar &&
- (strcmp (envvar, SIMPLE_ID) == 0 ||
- g_hash_table_lookup (contexts_hash, envvar)))
- return envvar;
+ envvar = g_getenv("GTK_IM_MODULE");
+ if (envvar)
+ {
+ immodules = g_strsplit(envvar, ":", 0);
+ context_id = lookup_immodule(immodules);
+ g_strfreev(immodules);
+
+ if (context_id)
+ return context_id;
+ }
/* Check if the certain immodule is set in XSETTINGS.
*/
@@ -687,15 +712,9 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
if (tmp)
{
- if (strcmp (tmp, SIMPLE_ID) == 0)
- context_id = SIMPLE_ID;
- else
- {
- GtkIMModule *module;
- module = g_hash_table_lookup (contexts_hash, tmp);
- if (module)
- context_id = module->contexts[0]->context_id;
- }
+ immodules = g_strsplit(tmp, ":", 0);
+ context_id = lookup_immodule(immodules);
+ g_strfreev(immodules);
g_free (tmp);
if (context_id)

19
gtk2.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sun Jul 15 21:53:55 UTC 2012 - zaitor@opensuse.org
- Update to version 2.24.11:
+ X11: Use _NET_WM_STATE_HIDDEN for iconification when supported.
+ Win32: Don't drash when installed in a top-level directory.
+ Quartz:
- Make function keys work.
- Fix the build on OS X 10.7.
- Fix manual resizing of windows.
- Handle some key events better (such as dead tilde).
+ Bugs fixed: bgo#603559, bgo#640308, bgo#643131, bgo#655065,
bgo#667155, bgo#670093, bgo#670400, bgo#672125, bgo#674556,
bgo#675421, bgo#675835, bgo#676362.
+ Iconview: fix autoscroll.
+ Printing: fix the build with cups 1.6.
+ Updated translations.
- Drop gtk2-immodule-fallback.patch, fixed upstream.
-------------------------------------------------------------------
Sun Feb 19 16:21:52 UTC 2012 - dimstar@opensuse.org

7
gtk2.spec
View File

@ -21,7 +21,7 @@
Name: gtk2
%define _name gtk+
Version: 2.24.10
Version: 2.24.11
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)
@ -37,8 +37,6 @@ Source5: macros.gtk2
Patch0: gtk2-window-dragging.patch
# PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this.
Patch8: gtk64.patch
# PATCH-FEATURE-UPSTREAM gtk2-immodule-fallback.patch bgo#603559 bnc#723382 vuntz@opensuse.org -- Make it possible to specify fallback im modules in GTK_IM_MODULE; useful in case a module doesn't exist for both gtk2 and gtk3
Patch21: gtk2-immodule-fallback.patch
# PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI
Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
# PATCH-FIX-OPENSUSE bugzilla-131498-allow-xim-for-all-languages.patch bnc131498 mfabian@novell.com - Allow all languages to be run with the X Input Method
@ -230,8 +228,8 @@ Group: System/Libraries
Requires: %{name} = %{version}
Requires(post): %{name}-tools
Requires(postun): %{name}-tools
Provides: locale(%{name}:ko)
Provides: locale(%{name}:ja)
Provides: locale(%{name}:ko)
Provides: locale(%{name}:th)
Provides: locale(%{name}:zh)
@ -325,7 +323,6 @@ cp -a %{S:2} .
# WARNING: This patch does not patch not installed demos and tests.
%patch8 -p1
%endif
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1