From 83af1b7bf31dcaae6296fbb47d6a55671c5c2916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 21 Sep 2016 11:47:00 +0100 Subject: [PATCH] Related: rhbz#1362451 apply patch --- ...ted-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch | 8 ++++---- libreoffice.spec | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch b/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch index e432416..0fd195d 100644 --- a/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch +++ b/0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch @@ -1,4 +1,4 @@ -From 8a382d4ad190cf07cbd6b1fd6b903975134b0cf1 Mon Sep 17 00:00:00 2001 +From a0e049ba62adc036f42973807d528ce27c8647cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 1 Sep 2016 15:50:20 +0100 Subject: [PATCH] Related: rhbz#1362451 avoid recursive ownerchanged handling @@ -10,7 +10,7 @@ Change-Id: Id9c12b7ce6458348890d7c7ff7fdb2cd37c4601c 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index 7c04b1d..7148882 100644 +index 10c5c7f..7202b46 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -364,6 +364,29 @@ namespace @@ -74,13 +74,13 @@ index 7c04b1d..7148882 100644 - guint info, - gpointer user_data_or_owner) - { -- VclGtkClipboard* pThis = static_cast(user_data_or_owner); +- VclGtkClipboard* pThis = reinterpret_cast(user_data_or_owner); - pThis->ClipboardGet(clipboard, selection_data, info); - } - - void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner) - { -- VclGtkClipboard* pThis = static_cast(user_data_or_owner); +- VclGtkClipboard* pThis = reinterpret_cast(user_data_or_owner); - pThis->ClipboardClear(clipboard); - } - diff --git a/libreoffice.spec b/libreoffice.spec index 5139cef..859eac7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -245,6 +245,7 @@ Patch14: 0001-Resolves-rhbz-1373933-gtk-3.21-emits-a-lot-more-styl.patch Patch15: 0001-Related-rhbz-1373933-gtk3-emits-a-lot-of-style-updat.patch Patch16: 0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch Patch17: 0001-Resolves-tdf-102293-triple-click-results-in-visually.patch +Patch18: 0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch %if 0%{?rhel} # not upstreamed @@ -2300,6 +2301,9 @@ done %endif %changelog +* Wed Sep 21 2016 Caolán McNamara - 1:5.2.2.1-5 +- Related: rhbz#1362451 apply patch + * Tue Sep 20 2016 Caolán McNamara - 1:5.2.2.1-4 - Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange