From 5e70ee57523e4cfbf437879556e37a5368f7710fb52b0c7e7e1a6a1e03ecf6df Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 9 Mar 2022 16:36:09 +0000 Subject: [PATCH] Accepting request 960568 from LibreOffice:7.3 - Refresh fix_gtk_popover_on_3.20.patch OBS-URL: https://build.opensuse.org/request/show/960568 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=997 --- fix_gtk_popover_on_3.20.patch | 23 +++++++++++++---------- libreoffice.changes | 5 +++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/fix_gtk_popover_on_3.20.patch b/fix_gtk_popover_on_3.20.patch index 451508d..30bb12c 100644 --- a/fix_gtk_popover_on_3.20.patch +++ b/fix_gtk_popover_on_3.20.patch @@ -1,11 +1,11 @@ -diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx -index 6b592b3..2fce9eb 100644 ---- a/vcl/unx/gtk3/gtkinst.cxx -+++ b/vcl/unx/gtk3/gtkinst.cxx -@@ -21415,12 +21415,16 @@ public: - gtk_popover_set_relative_to(m_pPopover, pWidget); +Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx +=================================================================== +--- libreoffice-7.3.1.3.orig/vcl/unx/gtk3/gtkinst.cxx ++++ libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx +@@ -22177,7 +22177,11 @@ public: + } #endif - gtk_popover_set_pointing_to(m_pPopover, &aRect); + - gtk_popover_popup(m_pPopover); + // in GTK 3.22 you can just call gtk_popover_popup() to get it to show with transitions, + // but on SLE-12-SP5 we just have GTK 3.20, so enable transitions and show it to get the @@ -14,10 +14,13 @@ index 6b592b3..2fce9eb 100644 + gtk_widget_show(GTK_WIDGET(m_pPopover)); } - virtual void popdown() override - { + #if !GTK_CHECK_VERSION(4, 0, 0) +@@ -22218,7 +22222,7 @@ public: + } + #endif + - gtk_popover_popdown(m_pPopover); + gtk_widget_hide(GTK_WIDGET(m_pPopover)); } - virtual ~GtkInstancePopover() override + void PopdownAndFlushClosedSignal() diff --git a/libreoffice.changes b/libreoffice.changes index 5ae3899..be6e4ab 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 9 16:33:59 UTC 2022 - Danilo Spinella + +- Refresh fix_gtk_popover_on_3.20.patch + ------------------------------------------------------------------- Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie