diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-10 18:45:26 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-10 18:45:26 +0000 |
commit | f50d60b8eb707b56133e594376e993b98e726b5d (patch) | |
tree | be9f0c658e4e0ace79af92f89becddd06c01c772 /app-office/libreoffice/files | |
parent | 84e395ce722d1f39cf3ef1467b23eda9c2462017 (diff) |
gentoo auto-resync : 10:03:2024 - 18:45:26
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r-- | app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch | 13 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch | 61 |
2 files changed, 0 insertions, 74 deletions
diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch deleted file mode 100644 index 7fefb4a51f7b..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2-kf6-buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Source: https://raw.githubusercontent.com/OpenMandrivaAssociation/libreoffice/master/libreoffice-24.2-kf6-buildfix.patch - ---- a/configure.ac -+++ b/configure.ac -@@ -13465,7 +13465,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") - diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch deleted file mode 100644 index 2a4952d7e7cc..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -From ec69b448f4b6296edb6b28ced5ecb710be82438b Mon Sep 17 00:00:00 2001 -From: Michael Weghorn <m.weghorn@posteo.de> -Date: Tue, 13 Feb 2024 16:25:35 +0100 -Subject: [PATCH] scp2: Take ENABLE_{KF,QT}6 into account - -The qt6 and kf6 VCL plugins are also part -of the kde install set, so take -`ENABLE_QT6` and `ENABLE_KF6` into -account when deciding whether to install -it. - -This makes packaging these VCL plugins work -when building with `--enable-qt6` and/or -`--enable-kf6`, but without `--enable-qt5` -and `--enable-kf5`. - -Command that can be used for testing: - - make DESTDIR=/tmp/dummy distro-pack-install -o build -o check - -(Then, check whether the "installation" in /tmp/dummy -contains the VCL plugins as expected.) - -Thanks to Andreas Sturmlechner for reporting -the issue on IRC #libreoffice-dev on 2024-02-12. - -Change-Id: Ieea67468e3388f8b7b66f53221574c6225516b44 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163313 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> ---- - scp2/InstallScript_setup_osl.mk | 2 +- - scp2/Module_scp2.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk -index 6f7b58204225e..cf69165c1b60f 100644 ---- a/scp2/InstallScript_setup_osl.mk -+++ b/scp2/InstallScript_setup_osl.mk -@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\ - scp2/gnome \ - ) \ -- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\ -+ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\ - scp2/kde \ - ) \ - $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ -diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk -index 25ae8167df561..651413fa2c17e 100644 ---- a/scp2/Module_scp2.mk -+++ b/scp2/Module_scp2.mk -@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\ - InstallModule_gnome \ - ) \ -- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\ -+ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\ - InstallModule_kde \ - ) \ - )) |