diff options
| author | Kalev Lember <klember@redhat.com> | 2019-03-14 07:59:51 +0100 |
|---|---|---|
| committer | Kalev Lember <klember@redhat.com> | 2019-03-14 08:00:45 +0100 |
| commit | 0f81815fbecf606b971812a175099729bb517be4 (patch) | |
| tree | 98ca53865bdecbc32d2063df300d99dcc2635dbd | |
| parent | Update to 3.24.7 (diff) | |
| download | gtk3-classic-build-gtk3-0f81815fbecf606b971812a175099729bb517be4.tar.gz gtk3-classic-build-gtk3-0f81815fbecf606b971812a175099729bb517be4.tar.bz2 gtk3-classic-build-gtk3-0f81815fbecf606b971812a175099729bb517be4.zip | |
Undo runtime gtk_window_present deprecation warnings
https://gitlab.gnome.org/GNOME/gtk/merge_requests/632
| -rw-r--r-- | 0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch | 42 | ||||
| -rw-r--r-- | gtk3.spec | 8 |
2 files changed, 49 insertions, 1 deletions
diff --git a/0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch b/0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch new file mode 100644 index 0000000..a00e822 --- /dev/null +++ b/0001-window-Undo-runtime-gtk_window_present-deprecation-w.patch @@ -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 + @@ -21,13 +21,16 @@ Name: gtk3 Version: 3.24.7 -Release: 1%{?dist} +Release: 2%{?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 +# 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) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -318,6 +321,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || : %{_datadir}/installed-tests/ %changelog +* Thu Mar 14 2019 Kalev Lember <klember@redhat.com> - 3.24.7-2 +- Undo runtime gtk_window_present deprecation warnings + * Tue Mar 12 2019 Kalev Lember <klember@redhat.com> - 3.24.7-1 - Update to 3.24.7 |