Accepting request 93008 from home:dimstar:branches:GNOME:Factory
Upadte to 3.3.4 OBS-URL: https://build.opensuse.org/request/show/93008 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=68
This commit is contained in:
Git OBS Bridge
parent
d44a67282b
commit
0a4a37f3cd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b77720327cc8a6f91145da0a27f1b13f7f2777dcc2d8e6f2b25ed45765ca5b2d
|
||||
size 17397770
|
||||
3
gtk+-3.3.4.tar.bz2
Normal file
3
gtk+-3.3.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76f08e8aae8ab18865593163c2ee0b694b9618a81536fd56c76ddf124a0df669
|
||||
size 17402387
|
||||
@ -1,7 +1,7 @@
|
||||
Index: gtk+-2.90.6/gtk/gtkfontsel.c
|
||||
===================================================================
|
||||
--- gtk+-2.90.6.orig/gtk/gtkfontsel.c
|
||||
+++ gtk+-2.90.6/gtk/gtkfontsel.c
|
||||
--- gtk+-2.90.6.orig/gtk/deprecated/gtkfontsel.c
|
||||
+++ gtk+-2.90.6/gtk/deprecated/gtkfontsel.c
|
||||
@@ -130,6 +130,8 @@ struct _GtkFontSelectionDialogPrivate
|
||||
#define FONT_STYLE_LIST_WIDTH 170
|
||||
#define FONT_SIZE_LIST_WIDTH 60
|
||||
|
||||
@ -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)
|
||||
41
gtk3.changes
41
gtk3.changes
@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 08:38:28 UTC 2011 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.3.4:
|
||||
+ The beagle search backend has been dropped
|
||||
+ Stop using GDK/GTK_DISABLE_DEPRECATED guards for deprecated
|
||||
functions; instead use function attributes
|
||||
+ Make GtkCellRendererAccel support naked keyvals, so it can
|
||||
be used in gnome-control-center
|
||||
+ GDK changes
|
||||
- Make the Mod1 == Alt assumption official
|
||||
- The Broadway backend has initial support for V7+ websockets
|
||||
+ GtkApplication no longer uses gtk_main internally
|
||||
+ GtkNotebook now destroys its action widgets, instead of leaking them
|
||||
+ Theming improvements:
|
||||
- Background images can now be tiled instead of stretched,
|
||||
using the background-repeat CSS property
|
||||
- Unfocused windows can be themed differently, using
|
||||
the 'window-unfocused' state flag
|
||||
+ Accessibility improvements:
|
||||
- Much better treeview performance
|
||||
- Completely ignore invisible columns in treeviews
|
||||
- Many a11y/treeview-related crashes fixed
|
||||
- Combo box keybindings are reported again
|
||||
- Textview respects display lines again
|
||||
+ OS X improvements
|
||||
+ Win32 improvements
|
||||
+ Bugs fixed: bgo#84314, bgo#142874, bgo#169811, bgo#171456,
|
||||
bgo#324254, bgo#516822, bgo#542777, bgo#552041, bgo#603559,
|
||||
bgo#604156, bgo#606727, bgo#612359, bgo#616544, bgo#628049,
|
||||
bgo#631384, bgo#647460, bgo#652239, bgo#658841, bgo#658842,
|
||||
bgo#659151, bgo#659257, bgo#661858, bgo#661859, bgo#661997,
|
||||
bgo#662160, bgo#662628, bgo#662670, bgo#662691, bgo#662755,
|
||||
bgo#662839, bgo#662870, bgo#662953, bgo#663073, bgo#663138,
|
||||
bgo#663182, bgo#663345, bgo#663396, bgo#663522, bgo#663605,
|
||||
bgo#663694, bgo#663761, bgo#663825, bgo#663856, bgo#663994,
|
||||
bgo#664021, bgo#664027, bgo#664132.
|
||||
- Drop gtk3-immodule-fallback.patch: fixed upstream.
|
||||
- Rebase gtk3-bnc130159-bgo319483-async-font-selection.patch:
|
||||
fontsel has been deprecated.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 29 09:03:57 UTC 2011 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
Name: gtk3
|
||||
%define _name gtk+
|
||||
Version: 3.3.2
|
||||
Version: 3.3.4
|
||||
Release: 1
|
||||
License: LGPLv2.1+
|
||||
Summary: The GTK+ toolkit library (version 3)
|
||||
@ -41,8 +41,6 @@ Patch0: gtk3-GTK_PATH64.patch
|
||||
Patch1: gtk3-path-local.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-FEATURE-UPSTREAM gtk3-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
|
||||
Patch4: gtk3-immodule-fallback.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: pkgconfig(atk) >= 2.1.5
|
||||
@ -286,7 +284,6 @@ cp -a %{S:1} .
|
||||
%endif
|
||||
%patch1 -p0
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user