diff --git a/gtk3-revert-kp_decimal_handling.patch b/gtk3-revert-kp_decimal_handling.patch new file mode 100644 index 0000000..7d06de0 --- /dev/null +++ b/gtk3-revert-kp_decimal_handling.patch @@ -0,0 +1,62 @@ +From 4eb333801b517c58b896d82dcd129768e76d0e0e Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Fri, 8 Jan 2016 08:59:02 -0500 +Subject: [PATCH] Revert "Translate GDK_KEY_KP_Decimal according to locale" + +This reverts commit 7c7fde136e1fd1197df1881a3bbd975c4cb1c01a. + +Too much controversy for this minor improvement. +See https://bugzilla.gnome.org/show_bug.cgi?id=756751 +--- + gdk/gdkkeyuni.c | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c +index ea28010..d770737 100644 +--- a/gdk/gdkkeyuni.c ++++ b/gdk/gdkkeyuni.c +@@ -27,7 +27,6 @@ + #include "gdkkeys.h" + #include "gdktypes.h" + +-#include + + /* Thanks to Markus G. Kuhn for the ksysym<->Unicode + * mapping functions, from the xterm sources. +@@ -873,23 +872,6 @@ static const struct { + #endif + }; + +-static gunichar +-get_decimal_point (void) +-{ +- struct lconv *locale_data; +- const gchar *decimal_point; +- gunichar ret; +- +- locale_data = localeconv (); +- decimal_point = locale_data->decimal_point; +- +- ret = g_utf8_get_char_validated (decimal_point, -1); +- if (ret != (gunichar)-2 && ret != (gunichar)-1) +- return ret; +- +- return (gunichar) '.'; +-} +- + /** + * gdk_keyval_to_unicode: + * @keyval: a GDK key symbol +@@ -917,9 +899,6 @@ gdk_keyval_to_unicode (guint keyval) + if ((keyval & 0xff000000) == 0x01000000) + return keyval & 0x00ffffff; + +- if (keyval == 0xffae) +- return (guint32) get_decimal_point (); +- + /* binary search in table */ + while (max >= min) { + mid = (min + max) / 2; +-- +2.6.2 + diff --git a/gtk3.changes b/gtk3.changes index 846b98b..d2b2d1e 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 16 09:08:26 UTC 2016 - fcrozat@suse.com + +- Add patch gtk3-revert-kp_decimal_handling.patch: revert + kp_decimal locale-based handling (already reverted upstream) + (bgo#756751). + ------------------------------------------------------------------- Thu Jan 28 12:25:00 UTC 2016 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 44f0edb..86a4a8f 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -47,6 +47,8 @@ Patch1: gtk3-path-local.patch ## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains. # 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-revert-kp_decimal_handling.patch bgo#756751 fcrozat@suse.com -- Revert local-based kp_decimal handling +Patch4: gtk3-revert-kp_decimal_handling.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -338,6 +340,7 @@ cp -a %{S:1} . %patch1 -p0 ## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains. #%%patch3 -p1 +%patch4 -p1 %build # Needed for patch1