- Remove merged patches:

* java112.patch
  * kde5-detection.patch
  * kde5-font-width.patch

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

java112.patch

@@ -1,13 +0,0 @@
-Index: libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk
-===================================================================
---- libreoffice-6.2.0.3.orig/odk/CustomTarget_javadoc.mk
-+++ libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk
-@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d
- 		$(call gb_Jar_get_target,ridl)
- 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
- 	$(call gb_Helper_abbreviate_dirs,\
--		$(JAVADOC) -J-Xmx120m -use -splitindex \
-+		$(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use -splitindex \
- 		-windowtitle "Java UNO Runtime Reference" \
- 		-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
- 		-tag attention:a:"Attention:" \

kde5-detection.patch

@@ -1,58 +0,0 @@
-From 998d18077615b28bca7b411528c8a1c11665e173 Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Tue, 29 Jan 2019 08:18:15 +0100
-Subject: [PATCH] tdf#123011 Detect kde5 desktop in Plasma Wayland session
-
-Both env variables 'KDE_FULL_SESSION' and 'KDE_SESSION_VERSION'
-are set in both X11 and Wayland sessions for Plasma 5 (kde5),
-s.a. https://userbase.kde.org/KDE_System_Administration/Environment_Variables,
-so drop the alternative X-specific check.
-
-Move the check for a kde5 upward, so that kde5 is actually detected
-in a Plasma 5 Wayland session, rather than falling back to
-assuming GNOME.
-
-Change-Id: Ieb5b47272f375ceed4d44a2ccc5b517222ae86b9
----
-
-diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-index e7cb9b9..9f65b16 100644
---- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-@@ -191,14 +191,11 @@
-     return false;
- }
- 
--static bool is_kde5_desktop( Display* pDisplay )
-+static bool is_kde5_desktop()
- {
-     static const char * pFullVersion = getenv( "KDE_FULL_SESSION" );
-     static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" );
-     if ( pFullVersion && pSessionVersion && strcmp(pSessionVersion, "5") == 0)
--        return true;
--
--    if ( KDEVersion( pDisplay ) == 5 )
-         return true;
- 
-     return false;
-@@ -280,6 +277,9 @@
-         ret = DESKTOP_LXQT;
-     else
-     {
-+        if ( is_kde5_desktop() )
-+            return DESKTOP_KDE5;
-+
-         // tdf#121275 if we still can't tell, and WAYLAND_DISPLAY
-         // is set, default to gtk3
-         const char* pWaylandStr = getenv("WAYLAND_DISPLAY");
-@@ -328,9 +328,7 @@
- 
-         XErrorHandler pOldHdl = XSetErrorHandler( autodect_error_handler );
- 
--        if ( is_kde5_desktop( pDisplay ) )
--            ret = DESKTOP_KDE5;
--        else if ( is_kde4_desktop( pDisplay ) )
-+        if ( is_kde4_desktop( pDisplay ) )
-             ret = DESKTOP_KDE4;
-         else if ( is_gnome_desktop( pDisplay ) )
-             ret = DESKTOP_GNOME;

kde5-font-width.patch

@@ -1,29 +0,0 @@
-From 0bdfb521f8a16be634b073d45d07c34b51f8e5e4 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Tue, 29 Jan 2019 11:35:55 +0100
-Subject: [PATCH] KDE5 map QFont::stretch() == 0 to WIDTH_DONTKNOW
-
-From the Qt5 documentation: "QFont::AnyStretch / 0: Accept any
-stretch matched using the other QFont properties (added in Qt
-5.8)". So this maps 0 to LO's WIDTH_DONTKNOW, which fixes the
-too narrow font selection in the KDE5 backend, when applying the
-KDE5 font setting to LO.
-
-Change-Id: I5f1a62d6c314c0766b540869c49c72bc3f6821c3
----
-
-diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
-index ec4a7ff..d3a1396 100644
---- a/vcl/unx/kde5/KDE5SalFrame.cxx
-+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
-@@ -85,7 +85,9 @@
- 
-     // set width
-     int nStretch = rQFont.stretch();
--    if (nStretch <= QFont::UltraCondensed)
-+    if (nStretch == 0) // QFont::AnyStretch since Qt 5.8
-+        aInfo.m_eWidth = WIDTH_DONTKNOW;
-+    else if (nStretch <= QFont::UltraCondensed)
-         aInfo.m_eWidth = WIDTH_ULTRA_CONDENSED;
-     else if (nStretch <= QFont::ExtraCondensed)
-         aInfo.m_eWidth = WIDTH_EXTRA_CONDENSED;

libreoffice.changes

@@ -5,6 +5,10 @@ Fri Feb 22 09:53:08 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
   * Fixes focus issue wrt bsc#1123455
   * More stability fixes
   * Additional fixes for the KDE wrapper
+- Remove merged patches:
+  * java112.patch
+  * kde5-detection.patch
+  * kde5-font-width.patch
 
 -------------------------------------------------------------------
 Fri Jan 25 09:12:12 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

libreoffice.spec

@@ -99,10 +99,7 @@ Patch1:         scp2-user-config-suse.diff
 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
 Patch2:         nlpsolver-no-broken-help.diff
 Patch3:         mediawiki-no-broken-help.diff
-Patch4:         java112.patch
 Patch5:         old-boost.patch
-Patch6:         kde5-detection.patch
-Patch7:         kde5-font-width.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -963,9 +960,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %endif # Leap 42/SLE-12
 %patch2
 %patch3
-%patch4 -p1
-%patch6 -p1
-%patch7 -p1
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)