From 6f45d15a9cd454f15a722a6acd01028ee5abd679def35b2d668b61fccb971c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 7 Aug 2017 09:40:45 +0000 Subject: [PATCH] Accepting request 514831 from home:mgorse:branches:LibreOffice:Factory - Add gnome-documents-check-ntimeoutid.patch: fix intermittent crash opening files from gnome-documents (bsc#1047714). OBS-URL: https://build.opensuse.org/request/show/514831 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=521 --- gnome-documents-check-ntimeoutid.patch | 27 ++++++++++++++++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 gnome-documents-check-ntimeoutid.patch diff --git a/gnome-documents-check-ntimeoutid.patch b/gnome-documents-check-ntimeoutid.patch new file mode 100644 index 0000000..4f8d42d --- /dev/null +++ b/gnome-documents-check-ntimeoutid.patch @@ -0,0 +1,27 @@ +From e567ede54e85200f9e412dfa94a0f7b05c27d32f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 14 Jun 2017 21:18:22 +0100 +Subject: [PATCH] Related: rhbz#1444437 check if m_nTimeoutId is valid + +Change-Id: I80d850d23ab0e95bb4b105efa5a1ae1e59933a95 +--- + libreofficekit/source/gtk/lokdocview.cxx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx +index a59d72bcc374..ceda8160c9dd 100644 +--- a/libreofficekit/source/gtk/lokdocview.cxx ++++ b/libreofficekit/source/gtk/lokdocview.cxx +@@ -246,7 +246,8 @@ struct LOKDocViewPrivateImpl + + ~LOKDocViewPrivateImpl() + { +- g_source_remove(m_nTimeoutId); ++ if (m_nTimeoutId) ++ g_source_remove(m_nTimeoutId); + } + }; + +-- +2.12.3 + diff --git a/libreoffice.changes b/libreoffice.changes index 3766d40..5acb80a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 4 19:16:58 UTC 2017 - mgorse@suse.com + +- Add gnome-documents-check-ntimeoutid.patch: fix intermittent + crash opening files from gnome-documents (bsc#1047714). + ------------------------------------------------------------------- Mon Jul 24 09:02:16 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 315200d..b3e2929 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -81,6 +81,7 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch +Patch17: gnome-documents-check-ntimeoutid.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -911,6 +912,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch16 -p1 +%patch17 -p1 %patch990 -p1 # Do not generate doxygen timestamp