mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
37 lines
2.2 KiB
Diff
37 lines
2.2 KiB
Diff
|
From e42b2827b5d392479791632877fc00b6add0307d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Weghorn <m.weghorn@posteo.de>
|
||
|
|
Date: Mon, 12 Feb 2024 10:38:03 +0100
|
||
|
|
Subject: 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 <m.weghorn@posteo.de>
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index e6c35380e91d..6440f1f734dc 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -13499,7 +13499,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")
|
||
|
|
|
||
|
|
--
|
||
|
|
cgit v1.2.3
|
||
|
|
|