configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9de87f990e6d9e48495bd6970a25eb1823d5b2ef
Author: Michael Weghorn <[email protected]>
AuthorDate: Mon Feb 12 10:38:03 2024 +0100
Commit: Taichi Haradaguchi <[email protected]>
CommitDate: Tue Feb 13 23:09:01 2024 +0100
kf6: Add missing include path to fix build
Many thanks to Andreas Sturmlechner for pointing
this out on #libreoffice-dev on 2024-02-12:
> [10:27] <asturm> michaelweghorn: I also had to apply a trivial
> openmandriva patch to get it to build in the first place,
>
https://github.com/gentoo/gentoo/blob/master/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch
Change-Id: If86220e258336d84ffc30fd5da0f5d99dda59aff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163237
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <[email protected]>
(cherry picked from commit 30ec42fad4c0c61de93bea23e9f7d98acc6db0e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163272
Reviewed-by: Taichi Haradaguchi <[email protected]>
diff --git a/configure.ac b/configure.ac
index a5d9287e0808..b7042e9ee312 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13493,7 +13493,7 @@ then
AC_MSG_ERROR([KF6 libraries not found. Please specify the root of
your KF6 installation by exporting KF6DIR before running "configure".])
fi
- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n
-I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO
-I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets
-I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets
-I$qt6_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT
-DQT_NO_VERSION_TAGGING"
+ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n
-I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem
-I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets
-I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore
-I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork
-DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore
-lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets
-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
