From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDED315800F for ; Wed, 1 Feb 2023 13:22:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45762E0876; Wed, 1 Feb 2023 13:22:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BE7DE0876 for ; Wed, 1 Feb 2023 13:22:31 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52D873409C8 for ; Wed, 1 Feb 2023 13:22:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B637B531 for ; Wed, 1 Feb 2023 13:22:28 +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: <1675257739.fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch app-office/libreoffice/libreoffice-7.4.4.2.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe X-VCS-Branch: master Date: Wed, 1 Feb 2023 13:22:28 +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: 3b2d7e38-fa18-41f4-a05c-5829af6509fa X-Archives-Hash: adbc6d8f9740516a60822ccf0f78cbfd commit: fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 1 13:21:01 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 13:22:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd22f8ab app-office/libreoffice: Revert "fix build w/ gcc 13" Apparently breaks build with USE=vulkan. This reverts commit 3fae1aff9ce351bf561bb18cd9332b200d76b7d6. Bug: https://bugs.gentoo.org/892523 Closes: https://bugs.gentoo.org/892800 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-7.4.4.2-gcc-13.patch | 82 ---------------------- app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 1 - 2 files changed, 83 deletions(-) diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch b/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch deleted file mode 100644 index e27637416db4..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/892523 -https://gerrit.libreoffice.org/c/core/+/141833 -https://gerrit.libreoffice.org/c/core/+/145552 -https://github.com/LibreOffice/core/commit/3e009159cd1801507f6e965444a7dade5497f89a -https://github.com/LibreOffice/core/commit/5877c6b118c99c9ec807a111471bfd67720a5086 - -From 3e009159cd1801507f6e965444a7dade5497f89a Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Wed, 26 Oct 2022 08:06:01 +0200 -Subject: [PATCH] external/skia: Missing include - -...at least when building with Visual Studio 2022 Preview 17.4.0, - -> In file included from workdir/UnpackedTarball/skia/src/core/SkKeyHelpers.cpp:14: -> workdir/UnpackedTarball/skia\src/core/SkShaderCodeDictionary.h(45,43): error: no type named 'string' in namespace 'std' -> using GenerateGlueCodeForEntry = std::string (*)(const std::string& resultName, -> ~~~~~^ - -etc. - -Change-Id: Idd8dafb4e57e04088ee60954ecfa601cc7588e55 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141833 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- a/external/skia/UnpackedTarball_skia.mk -+++ b/external/skia/UnpackedTarball_skia.mk -@@ -38,6 +38,7 @@ skia_patches := \ - allow-no-es2restrictions.patch.1 \ - vk_mem_alloc.patch.1 \ - tdf148624.patch.1 \ -+ missing-include.patch.0 \ - - $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) - ---- /dev/null -+++ b/external/skia/missing-include.patch.0 -@@ -0,0 +1,10 @@ -+--- src/core/SkShaderCodeDictionary.h -++++ src/core/SkShaderCodeDictionary.h -+@@ -9,6 +9,7 @@ -+ #define SkShaderCodeDictionary_DEFINED -+ -+ #include -++#include -+ #include -+ #include -+ #include "include/core/SkSpan.h" - -From 5877c6b118c99c9ec807a111471bfd67720a5086 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 16 Jan 2023 08:16:00 +0100 -Subject: [PATCH] external/skia: Missing include - -> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp:27: -> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:35: -> workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h:2817:9: error: use of undeclared identifier 'snprintf' -> snprintf(outStr, strLen, "%u", static_cast(num)); -> ^ - -etc. - -Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- a/external/skia/missing-include.patch.0 -+++ b/external/skia/missing-include.patch.0 -@@ -8,3 +8,13 @@ - #include - #include - #include "include/core/SkSpan.h" -+--- third_party/vulkanmemoryallocator/include/vk_mem_alloc.h -++++ third_party/vulkanmemoryallocator/include/vk_mem_alloc.h -+@@ -2570,6 +2570,7 @@ -+ #include -+ #include -+ #include -++#include -+ -+ #ifdef _MSC_VER -+ #include // For functions like __popcnt, _BitScanForward etc. - diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild index c470475c8bda..9e8e362925ae 100644 --- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild @@ -298,7 +298,6 @@ PATCHES=( "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch" "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch" "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch" - "${FILESDIR}/${PN}-7.4.4.2-gcc-13.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"