- fix kde5 headers detection, rel 4

diff --git a/kf5-detect.patch b/kf5-detect.patch
new file mode 100644 (file)
index 0000000..b8fa952
--- /dev/null
+++ b/kf5-detect.patch
@@ -0,0 +1,23 @@
+--- libreoffice-7.2.0.3/configure.ac~  2021-08-10 19:27:48.000000000 +0200
++++ libreoffice-7.2.0.3/configure.ac   2022-03-29 13:09:30.740802677 +0200
+@@ -12759,7 +12759,8 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include_old="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 
+@@ -12774,6 +12775,10 @@
+     AC_MSG_CHECKING([for KF5 headers])
+     kf5_incdir="no"
+     for kf5_check in $kf5_incdirs; do
++        if test -r "$kf5_check/$kf5_test_include_old"; then
++            kf5_incdir="$kf5_check/KF5"
++            break
++        fi
+         if test -r "$kf5_check/$kf5_test_include"; then
+             kf5_incdir="$kf5_check/KF5"
+             break

diff --git a/libreoffice.spec b/libreoffice.spec
index 7e0a9f7c9b4805793f3093ef6fff418cecfb257c..f51cf16d18f99d64d9dd2a636ed21ecdcf94136f 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -63,7 +63,7 @@ Summary:      LibreOffice - powerful office suite
 Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
 Name:          libreoffice
 Version:       %{major_ver}.3
-Release:       3
+Release:       4
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
@@ -110,7 +110,7 @@ Source34:   skia-freetype2.11.patch
 Patch0:                disable-failing-test.patch
 Patch1:                pld-skia-patches.patch
 Patch2:                bison3.8.patch
-
+Patch3:                kf5-detect.patch
 URL:           http://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
 %{?with_firebird:BuildRequires:        Firebird-devel >= 3.0.0.0}
@@ -2858,6 +2858,7 @@ oraz narzędzie ui-previewer do sprawdzania wyglądu okien dialogowych.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir