[arch-commits] Commit in libreoffice-fresh/trunk (2 files)

[Andreas Radke]

    Date: Friday, February 18, 2022 @ 10:58:35
  Author: andyrtr
Revision: 437668

upgpkg: libreoffice-fresh 7.3.0-5: fix build with KF5 >= 5.91

Added:
  libreoffice-fresh/trunk/0002_update_kf5_include_lib_check.patch
Modified:
  libreoffice-fresh/trunk/PKGBUILD

-----------------------------------------+
 0002_update_kf5_include_lib_check.patch |   56 ++++++++++++++++++++++++++++++
 PKGBUILD                                |    8 +++-
 2 files changed, 63 insertions(+), 1 deletion(-)

Added: 0002_update_kf5_include_lib_check.patch
===================================================================
--- 0002_update_kf5_include_lib_check.patch	                        (rev 0)
+++ 0002_update_kf5_include_lib_check.patch	2022-02-18 10:58:35 UTC (rev 437668)
@@ -0,0 +1,56 @@
+From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn at posteo.de>
+Date: Wed, 16 Feb 2022 13:38:47 +0100
+Subject: 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 at 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 at 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
+-- 
+cgit v1.2.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-18 10:56:20 UTC (rev 437667)
+++ PKGBUILD	2022-02-18 10:58:35 UTC (rev 437668)
@@ -12,7 +12,7 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=7.3.0.3
 pkgver=7.3.0
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -61,6 +61,7 @@
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	0001_drop_the_SolarMutex_before_QApplication.patch
+	0002_update_kf5_include_lib_check.patch
 	soffice-template.desktop.in 
 	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -110,6 +111,7 @@
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
+            '1cc5aeac9b8e91786701727d97b58039afc3db3dbc7977a3651d3263240798b3'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
             'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
@@ -136,6 +138,10 @@
 	# fix crash on start - FS#73471
 	patch -Np1 -i "${srcdir}"/0001_drop_the_SolarMutex_before_QApplication.patch
 
+	# fix kf5 chances
+	# https://cgit.freedesktop.org/libreoffice/core/commit/?id=5fd5e42bf28a7910321c6b6d76257e7386839fbc
+	patch -Np1 -i "${srcdir}"/0002_update_kf5_include_lib_check.patch
+
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in