summaryrefslogtreecommitdiff
path: root/app-office/libreoffice
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/Manifest2
-rw-r--r--app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch58
-rw-r--r--app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch57
3 files changed, 0 insertions, 117 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 914bba925d47..0636be8928db 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,8 +2,6 @@ AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69be
AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb
AUX libreoffice-24.2.7.2-no-std-basic_string-int.patch 5372 BLAKE2B 2ec346b903738cd27ff1207d71b57ffcc48891d80dd7c6ef8f38d35516619569b59849ef4065aeb9a976af9929e47366ffa90d1fa50abc195f6c16785790c7b6 SHA512 d0533ec22550cb69a4536edaed71243c294babbc032f4f3ba616aa7d600f372d103559cb50e90429a584c6375a771d15a5485d4f170ce869e4bd0c8621341321
AUX libreoffice-24.2.7.2-poppler-24.12.patch 1644 BLAKE2B 16aa7985a89bdc91875337127d4bda81377f05f10f3e476ab02d30f55e9ae8de679682e302313811379be66f72a8d509ee205fc694eda40979fd4a34ac481ef3 SHA512 9b845747e9fc6547a2a2af1a94a3ca81f18d569bc01e565d25c30bba9a2de4e972cfd67f5c3b45dc9801137d1d99d381a675db9d81932953fcbeb52f73d4ef12
-AUX libreoffice-24.8-unused-qt5network.patch 3095 BLAKE2B 32c696893de2543c27bd390bcf05506855cad57dd3c568c544f6514ab1e46887625d83ce2f311c436b175332db174b2bcb090837fdc361e4bd4e1f9377f4895f SHA512 47148c0ef291e84bff564ddb0f462d7b88bb07f6a79dbed4cbe4fdaf7168b38a814f9efa2b37604665894c130526054a767975b81b97daf1e2744559dd31f9c5
-AUX libreoffice-24.8-unused-qt6network.patch 3227 BLAKE2B f2fca932af55e949854e3624c281b81b124612edf4fc1d9949e2f494ddd51650eb8aaec78ee07c6895c351ab34e5ad214fffde6b63e03e343d93d69e06ab13cb SHA512 d187359add55a7c6336f9afaccbf2fc51120a45d1bbc29e1bdeac060b46c41c2ebd028efe95f080abf0aabfdae8a7165a35cec94ab18d373444ff2bed0af63d8
AUX libreoffice-25.2-cflags.patch 5975 BLAKE2B 45cf03f511ca9f559af3593157ab56b4b39c158f03fda2a26b189d2bd43efd0c5cf6734862cd3c7b6f437b92159d280cd569e3249c45d907dda9e8fb0d2671c7 SHA512 1b670ab14431b1945807213ff8e059c321ac2f96308889adac355a1c0578e34652e76e6b0019b59aa834dd34b8d1858d04341fdc006dbae4ce8c22dc2a4e78a8
AUX libreoffice-25.2-unused-qt6network.patch 2315 BLAKE2B 4e73a0da320ceed9c87f8e3c0a39031552ba16f78bf8440f1f7d5ba8e0e048208e51eae68e384bcf46c1a45a91ae5cd6b1ab956214f00393832846832281e30e SHA512 29bf3c4c3ccf89d4578ca31a03228c9cf9c87d82f89c94637a7d904eee4617241d5e0f1668dc4927e47d1c6eb787fbfcc5993dab3766d358deff0cbc4529726e
AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
diff --git a/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch b/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch
deleted file mode 100644
index 6aeb3e9e9dac..000000000000
--- a/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 12 Mar 2024 21:40:25 +0100
-Subject: [PATCH] Drop unused QtNetwork dependency, fix KDE terminology
-
-'KDE version' -> 'KDE Frameworks version'
-
-Change-Id: I2e6a912be93d79b251dcf32c20796374c9ca9cf2
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d56df8625f1..9d6b35b747e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13213,7 +13213,7 @@ then
-
- QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING"
- QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-- QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
-+ QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
- if test "$_os" = "Emscripten"; then
- QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
- fi
-@@ -13442,8 +13442,8 @@ then
- AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
- fi
-
-- KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_NO_VERSION_TAGGING"
-- KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
-+ KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -DQT_NO_VERSION_TAGGING"
-+ KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
- KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-
- if test "$USING_X11" = TRUE; then
-@@ -13453,7 +13453,7 @@ then
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
-- AC_MSG_CHECKING([whether KDE is >= 5.0])
-+ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.0])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <kcoreaddons_version.h>
-
-@@ -13461,7 +13461,7 @@ int main(int argc, char **argv) {
- if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
- else return 1;
- }
-- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
-+ ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[])
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
- fi
---
-2.44.0
-
diff --git a/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch b/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch
deleted file mode 100644
index 6006d28686d0..000000000000
--- a/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 12 Mar 2024 21:40:25 +0100
-Subject: [PATCH] Drop unused QtNetwork dependency, fix KDE terminology
-
-'KDE version' -> 'KDE Frameworks version'
-
-Change-Id: I2e6a912be93d79b251dcf32c20796374c9ca9cf2
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d56df8625f1..9d6b35b747e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13667,7 +13667,7 @@ then
-
- QT6_CFLAGS="-I$qt6_incdir -DQT_NO_VERSION_TAGGING"
- QT6_CFLAGS=$(printf '%s' "$QT6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-- QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
-+ QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets"
- if test "$_os" = "Emscripten"; then
- QT6_LIBS="$QT6_LIBS -lQt6BundledPcre2 -lQt6BundledZLIB -L${qt6_platformsdir} -lqwasm -sGL_ENABLE_GET_PROC_ADDRESS"
- else
-@@ -13857,15 +13857,15 @@ 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/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_NO_VERSION_TAGGING"
-- KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
-+ 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 -DQT_NO_VERSION_TAGGING"
-+ KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets"
- KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
- dnl KF6 development version as of 2023-06 uses version number 5.240
-- AC_MSG_CHECKING([whether KDE is >= 5.240])
-+ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.240])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <kcoreaddons_version.h>
-
-@@ -13873,7 +13873,7 @@ int main(int argc, char **argv) {
- if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0;
- else return 1;
- }
-- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
-+ ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[])
- CXXFLAGS=$save_CXXFLAGS
- AC_LANG_POP([C++])
- fi
---
-2.44.0
-