rpms / gtk3

Clone
Source Code
GIT

#4 Update to 3.24.7
Closed 5 years ago by kalev. Opened 5 years ago by vstinner.
rpms/ vstinner/gtk3 update3.24.7  into  f29

file added
+42 
@@ -0,0 +1,42 @@ 
 

+ From a8bbcf33ecf162528e9b48e609f1131a8e52f072 Mon Sep 17 00:00:00 2001
 

+ From: Kalev Lember <klember@redhat.com>
 

+ Date: Tue, 12 Mar 2019 21:50:04 +0100
 

+ Subject: [PATCH] window: Undo runtime gtk_window_present deprecation warnings
 

+ 

+ Now that gtk_window_present is no longer deprecated, remove the runtime
 

+ warnings as well.
 

+ ---
 

+  gtk/gtkwindow.c | 10 ----------
 

+  1 file changed, 10 deletions(-)
 

+ 

+ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
 

+ index b65e0fe8c8..874b053d57 100644
 

+ --- a/gtk/gtkwindow.c
 

+ +++ b/gtk/gtkwindow.c
 

+ @@ -10527,7 +10527,6 @@ gtk_window_present_with_time (GtkWindow *window,
 

+    GtkWindowPrivate *priv;
 

+    GtkWidget *widget;
 

+    GdkWindow *gdk_window;
 

+ -  static gsize warned_current_time = FALSE;
 

+  

+    g_return_if_fail (GTK_IS_WINDOW (window));
 

+  

+ @@ -10545,15 +10544,6 @@ gtk_window_present_with_time (GtkWindow *window,
 

+        /* Translate a timestamp of GDK_CURRENT_TIME appropriately */
 

+        if (timestamp == GDK_CURRENT_TIME)
 

+          {
 

+ -	  if (g_once_init_enter (&warned_current_time))
 

+ -	    {
 

+ -	      gboolean warned = TRUE;
 

+ -	      g_warning ("gtk_window_present_with_time() should not be called with 0, or "
 

+ -			 "GDK_CURRENT_TIME as a timestamp, the timestamp should instead be "
 

+ -			 "gathered at the time the user initiated the request for the window "
 

+ -			 "to be shown");
 

+ -	      g_once_init_leave (&warned_current_time, warned);
 

+ -	    }
 

+  #ifdef GDK_WINDOWING_X11
 

+  	  if (GDK_IS_X11_WINDOW(gdk_window))
 

+  	    {
 

+ -- 

+ 2.21.0
 

+

file removed
-80 
@@ -1,80 +0,0 @@ 
 

- From e84016cd173900bb3d79affd6c61733e6dad26c0 Mon Sep 17 00:00:00 2001
 

- From: Samuel Thibault <samuel.thibault@ens-lyon.org>
 

- Date: Fri, 4 Jan 2019 16:55:17 +0100
 

- Subject: [PATCH] Revert "gdk: deactivate/activate surface on keyboard grabs"
 

- 

- This reverts commits f23bfc6b6966b910aa43a441141ec2b9fec14427. and
 

- c926b28d965dbae90b17d404d2c6d1e031a6f006.
 

- 

- This reintroduces #85, but see discussion in
 

- https://gitlab.gnome.org/GNOME/gtk/merge_requests/433 for the unforeseen
 

- invasive consequences of these commits.
 

- ---
 

-  gdk/x11/gdkdevicemanager-core-x11.c | 8 ++++----
 

-  gdk/x11/gdkeventsource.c            | 8 ++++----
 

-  2 files changed, 8 insertions(+), 8 deletions(-)
 

- 

- diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
 

- index 806225e826..350a79b03f 100644
 

- --- a/gdk/x11/gdkdevicemanager-core-x11.c
 

- +++ b/gdk/x11/gdkdevicemanager-core-x11.c
 

- @@ -29,8 +29,8 @@
 

-  #include "gdkkeysyms.h"
 

-  

-  

- -#define APPEARS_FOCUSED(toplevel)                           \
 

- -  ((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
 

- +#define HAS_FOCUS(toplevel)                           \
 

- +  ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
 

-  

-  static void    gdk_x11_device_manager_core_finalize    (GObject *object);
 

-  static void    gdk_x11_device_manager_core_constructed (GObject *object);
 

- @@ -842,7 +842,7 @@ _gdk_device_manager_core_handle_focus (GdkWindow *window,
 

-    if (toplevel->focus_window == original)
 

-      return;
 

-  

- -  had_focus = APPEARS_FOCUSED (toplevel);
 

- +  had_focus = HAS_FOCUS (toplevel);
 

-    x11_screen = GDK_X11_SCREEN (gdk_window_get_screen (window));
 

-  

-    switch (detail)
 

- @@ -904,7 +904,7 @@ _gdk_device_manager_core_handle_focus (GdkWindow *window,
 

-        break;
 

-      }
 

-  

- -  if (APPEARS_FOCUSED (toplevel) != had_focus)
 

- +  if (HAS_FOCUS (toplevel) != had_focus)
 

-      {
 

-        GdkEvent *event;
 

-  

- diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
 

- index e0ce59663c..774d10c528 100644
 

- --- a/gdk/x11/gdkeventsource.c
 

- +++ b/gdk/x11/gdkeventsource.c
 

- @@ -32,8 +32,8 @@ static gboolean gdk_event_source_dispatch (GSource     *source,
 

-                                             gpointer     user_data);
 

-  static void     gdk_event_source_finalize (GSource     *source);
 

-  

- -#define APPEARS_FOCUSED(toplevel)                           \
 

- -  ((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
 

- +#define HAS_FOCUS(toplevel)                           \
 

- +  ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
 

-  

-  struct _GdkEventSource
 

-  {
 

- @@ -148,10 +148,10 @@ handle_focus_change (GdkEventCrossing *event)
 

-    if (!event->focus || toplevel->has_focus_window)
 

-      return;
 

-  

- -  had_focus = APPEARS_FOCUSED (toplevel);
 

- +  had_focus = HAS_FOCUS (toplevel);
 

-    toplevel->has_pointer_focus = focus_in;
 

-  

- -  if (APPEARS_FOCUSED (toplevel) != had_focus)
 

- +  if (HAS_FOCUS (toplevel) != had_focus)
 

-      {
 

-        GdkEvent *focus_event;
 

-  

- -- 

- 2.18.1
 

-

file modified
+8 -3 
@@ -20,15 +20,16 @@ 
 

  %global __provides_exclude_from ^%{_libdir}/gtk-3.0
 

  

  Name: gtk3
 

- Version: 3.24.1
 

- Release: 2%{?dist}
 

+ Version: 3.24.7
 

+ Release: 3%{?dist}
 

  Summary: GTK+ graphical user interface library
 

  

  License: LGPLv2+
 

  URL: http://www.gtk.org
 

  Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz
 

  

- Patch0: accessible-window-events.patch
 

+ # https://gitlab.gnome.org/GNOME/gtk/merge_requests/632
 

+ Patch0: 0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch
 

  

  BuildRequires: pkgconfig(atk) >= %{atk_version}
 

  BuildRequires: pkgconfig(atk-bridge-2.0)
 
@@ -320,6 +321,10 @@ 
 

  %{_datadir}/installed-tests/
 

  

  %changelog
 

+ * Wed Apr 03 2019 Victor Stinner <vstinner@redhat.com> - 3.24.7-3
 

+ - Update to 3.24.7
 

+ - Undo runtime gtk_window_present deprecation warnings
 

+ 

  * Thu Feb 07 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.24.1-2
 

  - Revert changes that broke accessible window-related events

Undo runtime gtk_window_present deprecation warnings:
https://gitlab.gnome.org/GNOME/gtk/merge_requests/632

Co-Authored-By: Kalev Lember klember@redhat.com

rebased onto e9c7565
5 years ago

I don't think 3.24.7 is suitable for F29, sorry. The new release changes the theme and that's a GNOME 3.32 (F30) feature.

Pull-Request has been closed by kalev
5 years ago

This PR is related to https://bugzilla.redhat.com/show_bug.cgi?id=1695521

I don't think 3.24.7 is suitable for F29, sorry. The new release changes the theme and that's a GNOME 3.32 (F30) feature.

Would it be possible to at least the fix?

Sure, can you do a PR with the patch backported, please?

Sure, can you do a PR with the patch backported, please?

Done: https://src.fedoraproject.org/rpms/gtk3/pull-request/5
Changes Summary 3
+42
file added
0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch
-80
file removed
accessible-window-events.patch
+8 -3
file changed
gtk3.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.