Accepting request 955602 from home:cgiboudeaux:branches:LibreOffice:Factory

- Add upstream change to fix KDE Frameworks detection (boo#1196017)
  * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch

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

0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch

@@ -0,0 +1,57 @@
+From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Wed, 16 Feb 2022 13:38:47 +0100
+Subject: [PATCH] configure.ac: Update kf5 include/lib check to work with KF5
+ >= 5.91
+
+The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
+subdirectory in kcoreaddons commit
+
+    commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
+    Author: Ahmad Samir <a.samirh78@gmail.com>
+    Date:   Sat Jan 15 14:14:13 2022 +0200
+
+        Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
+
+        Instead of /usr/include/KF5/kcoreaddons_version.h.
+
+        For more details see:
+        https://invent.kde.org/frameworks/kservice/-/merge_requests/79
+
+        GIT_SILENT
+
+Adapt the KF5 check to check for the 'KFileWidget' header and
+the 'libKF5KIOFileWidgets.so' library instead.
+This is more exact anyway, since we require KIOFileWidgets,
+and the previous check didn't ensure that.
+(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
+configure would previously pass, but the build fail.)
+
+[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
+
+Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6acb3107cea3..4e84f9a33980 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13017,8 +13017,8 @@ then
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
+-    kf5_test_library="libKF5CoreAddons.so"
++    kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
++    kf5_test_library="libKF5KIOFileWidgets.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 
+     dnl kf5 KDE4 support compatibility installed
+-- 
+2.35.1
+

libreoffice.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 17 10:10:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add upstream change to fix KDE Frameworks detection (boo#1196017)
+  * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
+
 -------------------------------------------------------------------
 Fri Feb 14 10:22:01 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
 

libreoffice.spec

@@ -104,6 +104,8 @@ Patch3:         mediawiki-no-broken-help.diff
 Patch6:         gcc11-fix-error.patch
 Patch9:         fix_math_desktop_file.patch
 Patch10:        fix_gtk_popover_on_3.20.patch
+# PATCH-FIX-UPSTREAM boo#1196017 Fix KDE Frameworks 5.91 detection
+Patch11:        0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
 # Build with java 8
 Patch101:       0001-Revert-java-9-changes.patch
 # try to save space by using hardlinks
@@ -1006,6 +1008,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch3
 %patch6 -p1
 %patch9 -p1
+%patch11 -p1
 %if 0%{?suse_version} < 1500
 %patch10 -p1
 %patch101 -p1
@@ -1573,11 +1576,17 @@ exit 0
 %files -f file-lists/sdk_doc_list.txt sdk-doc
 
 %files calc-extensions
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/extensions
 %{_libdir}/%{name}/share/extensions/ConvertTextToNumber
 %{_libdir}/%{name}/share/extensions/nlpsolver
 %{_libdir}/%{name}/share/extensions/numbertext
 
 %files writer-extensions
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/share
+%dir %{_libdir}/%{name}/share/extensions
 %{_libdir}/%{name}/share/extensions/wiki-publisher
 
 %files icon-themes