From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96DF5158287 for ; Sat, 17 May 2025 18:29:25 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 725C934316E for ; Sat, 17 May 2025 18:29:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 751E21103DD; Sat, 17 May 2025 18:29:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 67D661103DD for ; Sat, 17 May 2025 18:29:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1341F34316E for ; Sat, 17 May 2025 18:29:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A50EC19F6 for ; Sat, 17 May 2025 18:29:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1747506493.214ffd13b80f0107277dff8be9a2fa904b3a23da.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-24.2.7.2-r2.ebuild app-office/libreoffice/libreoffice-25.2.3.2.ebuild app-office/libreoffice/libreoffice-25.2.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 214ffd13b80f0107277dff8be9a2fa904b3a23da X-VCS-Branch: master Date: Sat, 17 May 2025 18:29:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da19aa47-96f6-4594-a4a1-fb2b910e37a3 X-Archives-Hash: 4012427833af7790dcf996b09312a75e commit: 214ffd13b80f0107277dff8be9a2fa904b3a23da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 17 18:26:02 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 17 18:28:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214ffd13 app-office/libreoffice: Drop upstreamed patch See also: https://gerrit.libreoffice.org/c/core/+/185370 Upstream commit 013ea821a5fac77bf0e0361d9d63dbcb54c8a42c Signed-off-by: Andreas Sturmlechner gentoo.org> 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 45acaaa8c0ba..8591e7ca84b0 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 a1deddb4d64e..9de17cf5a9a2 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 545b86c9f74d..2bf4d7c93275 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 8826430b1a2d..e23a10ac4e40 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() {