From a18327f63d1b7c35f97cce6b0023096f63a1d249 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Feb 2019 15:36:45 +0000 Subject: x11-libs/gtk+:{2,3} : version bump --- .../files/3.24.4-more-gtkswitch-fallback.patch | 34 ++++++++++++++++++ ...+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch | 13 ------- .../files/gtk+-2.24.31-fix-gtkentry-beep.patch | 42 ---------------------- 3 files changed, 34 insertions(+), 55 deletions(-) create mode 100644 x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch (limited to 'x11-libs/gtk+/files') diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch new file mode 100644 index 00000000..629a2d75 --- /dev/null +++ b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch @@ -0,0 +1,34 @@ +From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 23 Jan 2019 12:02:27 -0500 +Subject: [PATCH] switch: Avoid problems with glyph availability + +If none of the glyphs we want are available, fall +back to using empty strings here, rather than causing +critical warnings. +--- + gtk/gtkswitch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c +index 1d42f572a9..4c49e243ed 100644 +--- a/gtk/gtkswitch.c ++++ b/gtk/gtkswitch.c +@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self) + 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; + +-- +2.17.0 + diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch deleted file mode 100644 index b2a33155..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk+-2.24.31/gtk/gtk.symbols.orig 2018-03-18 15:17:39.296719190 -0000 -+++ gtk+-2.24.31/gtk/gtk.symbols 2018-03-18 15:17:57.490053094 -0000 -@@ -2498,8 +2498,8 @@ - #endif - #endif - --#if IN_HEADER(__gtk_marshal_MARSHAL_H__) --#if IN_FILE(__gtk_marshal_MARSHAL_C__) -+#if IN_HEADER(__gtk_marshal_MARSHAL_H__) || IN_HEADER(__GTK_MARSHAL_MARSHAL_H__) -+#if IN_FILE(__gtk_marshal_MARSHAL_C__) || IN_FILE(__GTK_MARSHAL_MARSHAL_C__) - #ifndef GTK_DISABLE_DEPRECATED - gtk_marshal_BOOLEAN__POINTER - gtk_marshal_BOOLEAN__POINTER_INT_INT diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch deleted file mode 100644 index 1d09721b..00000000 --- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch +++ /dev/null @@ -1,42 +0,0 @@ -From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Wed, 5 Oct 2016 12:20:14 -0400 -Subject: [PATCH] entry: Fix a corner case of overwrite mode - -We currently beep when a character is appended at the end in -overwrite mode. That is obviously not right. Patch based on -a patch by Ian MacDonald. - -https://bugzilla.gnome.org/show_bug.cgi?id=772389 ---- - gtk/gtkentry.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c -index b522039..bc33754 100644 ---- a/gtk/gtkentry.c -+++ b/gtk/gtkentry.c -@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry, - GtkEditable *editable = GTK_EDITABLE (entry); - gint tmp_pos; - gboolean old_need_im_reset; -+ guint text_length; - - old_need_im_reset = entry->need_im_reset; - entry->need_im_reset = FALSE; -@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry, - else - { - if (entry->overwrite_mode) -- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ { -+ text_length = gtk_entry_buffer_get_length (get_buffer (entry)); -+ if (entry->current_pos < text_length) -+ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); -+ } - } - - tmp_pos = entry->current_pos; --- -2.10.0 - -- cgit v1.2.3