rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Related: rhbz#1362451 apply patch

Browse Source
f41
Caolán McNamara 8 years ago
parent 7146e88183
commit 83af1b7bf3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
0001-Related-rhbz-1362451-avoid-recursive-ownerchanged-ha.patch
Unescape View File

@ -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?= <caolanm@redhat.com> From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 1 Sep 2016 15:50:20 +0100 Date: Thu, 1 Sep 2016 15:50:20 +0100
Subject: [PATCH] Related: rhbz#1362451 avoid recursive ownerchanged handling Subject: [PATCH] Related: rhbz#1362451 avoid recursive ownerchanged handling
@ -10,7 +10,7 @@ Change-Id: Id9c12b7ce6458348890d7c7ff7fdb2cd37c4601c
1 file changed, 32 insertions(+), 23 deletions(-) 1 file changed, 32 insertions(+), 23 deletions(-)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx 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 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -364,6 +364,29 @@ namespace @@ -364,6 +364,29 @@ namespace
@ -74,13 +74,13 @@ index 7c04b1d..7148882 100644
- guint info, - guint info,
- gpointer user_data_or_owner) - gpointer user_data_or_owner)
- { - {
- VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner); - VclGtkClipboard* pThis = reinterpret_cast<VclGtkClipboard*>(user_data_or_owner);
- pThis->ClipboardGet(clipboard, selection_data, info); - pThis->ClipboardGet(clipboard, selection_data, info);
- } - }
- -
- void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner) - void ClipboardClearFunc(GtkClipboard *clipboard, gpointer user_data_or_owner)
- { - {
- VclGtkClipboard* pThis = static_cast<VclGtkClipboard*>(user_data_or_owner); - VclGtkClipboard* pThis = reinterpret_cast<VclGtkClipboard*>(user_data_or_owner);
- pThis->ClipboardClear(clipboard); - pThis->ClipboardClear(clipboard);
- } - }
- -

4
libreoffice.spec
Unescape View File

@ -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 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 Patch16: 0001-Related-rhbz-1353069-don-t-clear-XATTR_FILL-from-sty.patch
Patch17: 0001-Resolves-tdf-102293-triple-click-results-in-visually.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} %if 0%{?rhel}
# not upstreamed # not upstreamed
@ -2300,6 +2301,9 @@ done
%endif %endif
%changelog %changelog
* Wed Sep 21 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.2.1-5
- Related: rhbz#1362451 apply patch
* Tue Sep 20 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.2.1-4 * Tue Sep 20 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.2.1-4
- Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange - Related: rhbz#1362451 avoid recursive ownerchanged signal during ownerchange

Write Preview
Loading…
Cancel
Save