Accepting request 406283 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/406283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2016-07-21 05:41:20 +00:00 committed by Git OBS Bridge
commit 34d8fc5bec
3 changed files with 41 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From 46cdb44fdd7466f0d524eeb4eec6c504fd64208b Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 14 Apr 2016 11:05:00 +0200
Subject: GtkWindow: Ensure the toplevel is realized before realizing popovers
Otherwise those get a NULL parent window, which is toplevel-y enough
to disembody the popover.
https://bugzilla.gnome.org/show_bug.cgi?id=764060
---
gtk/gtkwindow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b19a643..7a3d13c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -12291,7 +12291,8 @@ _gtk_window_set_popover_position (GtkWindow *window,
data->rect = *rect;
data->pos = pos;
- if (gtk_widget_is_visible (popover) && !data->window)
+ if (gtk_widget_is_visible (popover) && !data->window &&
+ gtk_widget_get_realized (GTK_WIDGET (window)))
{
popover_realize (popover, data, window);
popover_map (popover, data);
--
cgit v0.12

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 4 08:18:05 UTC 2016 - badshah400@gmail.com
- Add gtk3-gtkwindow-realize-toplevel-before-popover.patch:
GtkWindow: Ensure the toplevel is realized before realizing
popovers; patch taken from upstream master (bgo#764060).
-------------------------------------------------------------------
Mon May 23 15:05:32 UTC 2016 - zaitor@opensuse.org

View File

@ -44,6 +44,8 @@ Source99: baselibs.conf
Patch0: gtk3-GTK_PATH64.patch
# PATCH-FIX-OPENSUSE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch1: gtk3-path-local.patch
# PATCH-FIX-UPSTREAM gtk3-gtkwindow-realize-toplevel-before-popover.patch bgo#764060 badshah400@gmail.com -- GtkWindow: Ensure the toplevel is realized before realizing popovers
Patch2: gtk3-gtkwindow-realize-toplevel-before-popover.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -334,6 +336,7 @@ cp -a %{S:1} .
%patch0 -p1
%endif
%patch1 -p0
%patch2 -p1
%build
# Needed for patch1