* gnome-documents-check-ntimeoutid.patch

- Drop no longer needed patches:
  * libreoffice-hotfix-disablebrokenshapetest.patch
  * disable-flaky-hsqldb-test.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=553

gnome-documents-check-ntimeoutid.patch

@@ -1,27 +0,0 @@
-From e567ede54e85200f9e412dfa94a0f7b05c27d32f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-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
-

libreoffice-hotfix-disablebrokenshapetest.patch

@@ -1,34 +0,0 @@
-Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-===================================================================
---- libreoffice-5.3.0.0.beta1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1102,29 +1102,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "
-     assertXPath(pXmlDoc, "//w:ind", "start", "1418");
- }
- 
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
--{
--    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
--    if (!pXmlDoc)
--        return;
--    // there should be no flipH and flipV attributes in this case
--    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
--    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
--    // check rotation angle
--    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
--    // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding rountrip error
--                * hard to smooth out due to the use of string compare
--                * instead of number */
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
--#endif
--}
--
- #endif
- 
- CPPUNIT_PLUGIN_IMPLEMENT();

libreoffice.changes

@@ -12,6 +12,10 @@ Wed Nov 29 11:55:23 UTC 2017 - tchvatal@suse.com
   * 0001-This-hunk-breaks-jdk9-build.patch
   * 0002-Detect-libjawt-automatically-on-java9-too.patch
   * java-encoding.patch
+  * gnome-documents-check-ntimeoutid.patch
+- Drop no longer needed patches:
+  * libreoffice-hotfix-disablebrokenshapetest.patch
+  * disable-flaky-hsqldb-test.patch
 
 -------------------------------------------------------------------
 Sat Nov 18 18:42:01 UTC 2017 - tchvatal@suse.com

libreoffice.spec

@@ -77,8 +77,6 @@ Source2006:     http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629
 Source2007:     http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
 # PDFium is bundled everywhere
 Source2008:     %{external_url}/pdfium-3064.tar.bz2
-# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
-Patch0:         disable-flaky-hsqldb-test.patch
 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
 # to avoid BerkleyDB incompatibility with the plain build
 Patch1:         scp2-user-config-suse.diff
@@ -86,9 +84,6 @@ Patch1:         scp2-user-config-suse.diff
 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
 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
@@ -912,15 +907,12 @@ Provides additional %{langname} translations and resources for %{project}. \
 
 %prep
 %setup -q -b1 -b2
-#%patch0 -p1
 # The rename of the configdir is needed only on older than factory for compat
 %if 0%{?suse_version} < 1330
 %patch1
 %endif
 %patch4
 %patch5
-%patch16 -p1
-%patch17 -p1
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)