From 214ffd13b80f0107277dff8be9a2fa904b3a23da Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 17 May 2025 20:26:02 +0200 Subject: [PATCH] app-office/libreoffice: Drop upstreamed patch See also: https://gerrit.libreoffice.org/c/core/+/185370 Upstream commit 013ea821a5fac77bf0e0361d9d63dbcb54c8a42c Signed-off-by: Andreas Sturmlechner --- app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild | 2 +- app-office/libreoffice/libreoffice-25.2.3.2.ebuild | 4 +--- app-office/libreoffice/libreoffice-25.2.9999.ebuild | 2 +- app-office/libreoffice/libreoffice-9999.ebuild | 3 --- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild index 45acaaa8c0ba7..8591e7ca84b02 100644 --- a/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild @@ -301,7 +301,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" - # TODO: upstream + # git master "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" diff --git a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild index a1deddb4d64ee..9de17cf5a9a29 100644 --- a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild @@ -310,14 +310,12 @@ PATCHES=( "${FILESDIR}/${PN}-24.2-qtdetect.patch" "${FILESDIR}/${PN}-25.2-cflags.patch" - # TODO: upstream - "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" - # add qt6 backend as possible fallback for gtk-based desktop environments: # https://bugs.gentoo.org/950170 "${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch" # git master: + "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" "${FILESDIR}/${P}-poppler-25.05.patch" ) diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.9999.ebuild index 545b86c9f74dc..2bf4d7c93275a 100644 --- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild @@ -293,7 +293,7 @@ PATCHES=( "${FILESDIR}/${PN}-24.2-qtdetect.patch" "${FILESDIR}/${PN}-25.2-cflags.patch" - # TODO: upstream + # git master "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" # add qt6 backend as possible fallback for gtk-based desktop environments: diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 8826430b1a2df..e23a10ac4e40a 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -284,9 +284,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-24.2-qtdetect.patch" "${FILESDIR}/${PN}-25.2-cflags.patch" - - # TODO: upstream - "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" ) _check_reqs() {