From f52546e89b4e4f8361d67df4099caffeb27ea023ba3234f89f61d8215f27d1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 22 Jan 2019 08:43:43 +0000 Subject: [PATCH] Accepting request 667654 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/667654 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=342 --- gtk+-3.24.3.tar.xz | 3 - gtk+-3.24.4.tar.xz | 3 + gtk3-Add-fallbacks-GtkSwitch-labels.patch | 72 ----------------------- gtk3.changes | 13 ++++ gtk3.spec | 5 +- 5 files changed, 17 insertions(+), 79 deletions(-) delete mode 100644 gtk+-3.24.3.tar.xz create mode 100644 gtk+-3.24.4.tar.xz delete mode 100644 gtk3-Add-fallbacks-GtkSwitch-labels.patch diff --git a/gtk+-3.24.3.tar.xz b/gtk+-3.24.3.tar.xz deleted file mode 100644 index e1ab240..0000000 --- a/gtk+-3.24.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5708fa534d964b1fb9a69d15758729d51b9a438471d4612dc153f595904803bd -size 21099144 diff --git a/gtk+-3.24.4.tar.xz b/gtk+-3.24.4.tar.xz new file mode 100644 index 0000000..e4eea51 --- /dev/null +++ b/gtk+-3.24.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d84f59ff02a87cc90c9df4a572a13eca4e3506e2bf511e2b9cbdb4526fa0cb9c +size 21102236 diff --git a/gtk3-Add-fallbacks-GtkSwitch-labels.patch b/gtk3-Add-fallbacks-GtkSwitch-labels.patch deleted file mode 100644 index 038cd1f..0000000 --- a/gtk3-Add-fallbacks-GtkSwitch-labels.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ed39721aa7435860f46da69998cf6cac4ae7e735 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 15 Jan 2019 15:22:09 +0000 -Subject: [PATCH] Add fallbacks for GtkSwitch state labels - -While the IEC power symbols have been part of Unicode since version 9.0, -released in 2016, not every font supports them. - -We can use the old symbols as a fallback, as they seem to have the -better coverage, if not the best appearance. ---- - gtk/gtkswitch.c | 41 +++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c -index bf63f34fd2..1d42f572a9 100644 ---- a/gtk/gtkswitch.c -+++ b/gtk/gtkswitch.c -@@ -298,11 +298,48 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) - { - GtkSwitchPrivate *priv = self->priv; - -+ /* Glyphs for the ON state, in descending order of preference */ -+ const char *on_glyphs[] = { -+ "⏽", /* U+23FD POWER ON SYMBOL */ -+ "❙", /* U+2759 MEDIUM VERTICAL BAR */ -+ }; -+ -+ /* Glyphs for the OFF state, in descending order of preference */ -+ const char *off_glyphs[] = { -+ "⭘", /* U+2B58 HEAVY CIRCLE */ -+ "○", /* U+25CB WHITE CIRCLE */ -+ }; -+ int i; -+ - g_clear_object (&priv->on_layout); -- priv->on_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⏽"); -+ -+ for (i = 0; i < G_N_ELEMENTS (on_glyphs); i++) -+ { -+ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), on_glyphs[i]); -+ -+ if (pango_layout_get_unknown_glyphs_count (layout) == 0) -+ { -+ priv->on_layout = layout; -+ break; -+ } -+ -+ g_object_unref (layout); -+ } - - g_clear_object (&priv->off_layout); -- priv->off_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "⭘"); -+ -+ for (i = 0; i < G_N_ELEMENTS (off_glyphs); i++) -+ { -+ PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), off_glyphs[i]); -+ -+ if (pango_layout_get_unknown_glyphs_count (layout) == 0) -+ { -+ priv->off_layout = layout; -+ break; -+ } -+ -+ g_object_unref (layout); -+ } - } - - static void --- -2.18.1 - diff --git a/gtk3.changes b/gtk3.changes index e691aea..2f22c1e 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jan 21 15:48:19 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.24.4: + + Support gtk_file_chooser_set_filter in GtkFileChooserNative. + + Bugs fixed: + - wayland: Fix long combobox positioning. + - about dialog: Activate all links in the same way. + - switch: Add fallbacks for symbols. + - spinbutton: Fix background color. + + Updated translations. +- Drop gtk3-Add-fallbacks-GtkSwitch-labels.patch: Fixed upstream. + ------------------------------------------------------------------- Fri Jan 18 06:18:01 UTC 2019 - bjorn.lie@gmail.com diff --git a/gtk3.spec b/gtk3.spec index b669192..0f6a3ed 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -22,7 +22,7 @@ %define _name gtk+ %bcond_without broadway Name: gtk3 -Version: 3.24.3 +Version: 3.24.4 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later @@ -40,8 +40,6 @@ Patch0: gtk3-GTK_PATH64.patch Patch1: gtk3-revert-forced-xftdpi.patch # PATCH-FIX-UPSTREAM gtk3-boo1121456-a11y-export.patch boo#1121456 mgorse@suse.com -- export gtk_cell_accessible_parent_get_(row|column)_header_cells functions. Patch2: gtk3-boo1121456-a11y-export.patch -# PATCH-FIX-UPSTREAM gtk3-Add-fallbacks-GtkSwitch-labels.patch -- Add fallbacks for GtkSwitch state labels -Patch3: gtk3-Add-fallbacks-GtkSwitch-labels.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -373,7 +371,6 @@ cp -a %{SOURCE1} . %endif %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %configure \