| 1 |
commit: 3fae1aff9ce351bf561bb18cd9332b200d76b7d6 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 03:52:24 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 03:52:24 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fae1aff |
| 7 |
|
| 8 |
app-office/libreoffice: fix build w/ gcc 13 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/892523 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/libreoffice-7.4.4.2-gcc-13.patch | 82 ++++++++++++++++++++++ |
| 14 |
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 1 + |
| 15 |
2 files changed, 83 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..e27637416db4 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch |
| 22 |
@@ -0,0 +1,82 @@ |
| 23 |
+https://bugs.gentoo.org/892523 |
| 24 |
+https://gerrit.libreoffice.org/c/core/+/141833 |
| 25 |
+https://gerrit.libreoffice.org/c/core/+/145552 |
| 26 |
+https://github.com/LibreOffice/core/commit/3e009159cd1801507f6e965444a7dade5497f89a |
| 27 |
+https://github.com/LibreOffice/core/commit/5877c6b118c99c9ec807a111471bfd67720a5086 |
| 28 |
+ |
| 29 |
+From 3e009159cd1801507f6e965444a7dade5497f89a Mon Sep 17 00:00:00 2001 |
| 30 |
+From: Stephan Bergmann <sbergman@××××××.com> |
| 31 |
+Date: Wed, 26 Oct 2022 08:06:01 +0200 |
| 32 |
+Subject: [PATCH] external/skia: Missing include |
| 33 |
+ |
| 34 |
+...at least when building with Visual Studio 2022 Preview 17.4.0, |
| 35 |
+ |
| 36 |
+> In file included from workdir/UnpackedTarball/skia/src/core/SkKeyHelpers.cpp:14: |
| 37 |
+> workdir/UnpackedTarball/skia\src/core/SkShaderCodeDictionary.h(45,43): error: no type named 'string' in namespace 'std' |
| 38 |
+> using GenerateGlueCodeForEntry = std::string (*)(const std::string& resultName, |
| 39 |
+> ~~~~~^ |
| 40 |
+ |
| 41 |
+etc. |
| 42 |
+ |
| 43 |
+Change-Id: Idd8dafb4e57e04088ee60954ecfa601cc7588e55 |
| 44 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141833 |
| 45 |
+Tested-by: Jenkins |
| 46 |
+Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
| 47 |
+--- a/external/skia/UnpackedTarball_skia.mk |
| 48 |
++++ b/external/skia/UnpackedTarball_skia.mk |
| 49 |
+@@ -38,6 +38,7 @@ skia_patches := \ |
| 50 |
+ allow-no-es2restrictions.patch.1 \ |
| 51 |
+ vk_mem_alloc.patch.1 \ |
| 52 |
+ tdf148624.patch.1 \ |
| 53 |
++ missing-include.patch.0 \ |
| 54 |
+ |
| 55 |
+ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) |
| 56 |
+ |
| 57 |
+--- /dev/null |
| 58 |
++++ b/external/skia/missing-include.patch.0 |
| 59 |
+@@ -0,0 +1,10 @@ |
| 60 |
++--- src/core/SkShaderCodeDictionary.h |
| 61 |
+++++ src/core/SkShaderCodeDictionary.h |
| 62 |
++@@ -9,6 +9,7 @@ |
| 63 |
++ #define SkShaderCodeDictionary_DEFINED |
| 64 |
++ |
| 65 |
++ #include <array> |
| 66 |
+++#include <string> |
| 67 |
++ #include <unordered_map> |
| 68 |
++ #include <vector> |
| 69 |
++ #include "include/core/SkSpan.h" |
| 70 |
+ |
| 71 |
+From 5877c6b118c99c9ec807a111471bfd67720a5086 Mon Sep 17 00:00:00 2001 |
| 72 |
+From: Stephan Bergmann <sbergman@××××××.com> |
| 73 |
+Date: Mon, 16 Jan 2023 08:16:00 +0100 |
| 74 |
+Subject: [PATCH] external/skia: Missing include |
| 75 |
+ |
| 76 |
+> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp:27: |
| 77 |
+> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:35: |
| 78 |
+> workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h:2817:9: error: use of undeclared identifier 'snprintf' |
| 79 |
+> snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num)); |
| 80 |
+> ^ |
| 81 |
+ |
| 82 |
+etc. |
| 83 |
+ |
| 84 |
+Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9 |
| 85 |
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552 |
| 86 |
+Tested-by: Jenkins |
| 87 |
+Reviewed-by: Stephan Bergmann <sbergman@××××××.com> |
| 88 |
+--- a/external/skia/missing-include.patch.0 |
| 89 |
++++ b/external/skia/missing-include.patch.0 |
| 90 |
+@@ -8,3 +8,13 @@ |
| 91 |
+ #include <unordered_map> |
| 92 |
+ #include <vector> |
| 93 |
+ #include "include/core/SkSpan.h" |
| 94 |
++--- third_party/vulkanmemoryallocator/include/vk_mem_alloc.h |
| 95 |
+++++ third_party/vulkanmemoryallocator/include/vk_mem_alloc.h |
| 96 |
++@@ -2570,6 +2570,7 @@ |
| 97 |
++ #include <cstring> |
| 98 |
++ #include <utility> |
| 99 |
++ #include <type_traits> |
| 100 |
+++#include <stdio.h> |
| 101 |
++ |
| 102 |
++ #ifdef _MSC_VER |
| 103 |
++ #include <intrin.h> // For functions like __popcnt, _BitScanForward etc. |
| 104 |
+ |
| 105 |
|
| 106 |
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild |
| 107 |
index 9e8e362925ae..c470475c8bda 100644 |
| 108 |
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild |
| 109 |
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild |
| 110 |
@@ -298,6 +298,7 @@ PATCHES=( |
| 111 |
"${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch" |
| 112 |
"${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch" |
| 113 |
"${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch" |
| 114 |
+ "${FILESDIR}/${PN}-7.4.4.2-gcc-13.patch" |
| 115 |
) |
| 116 |
|
| 117 |
S="${WORKDIR}/${PN}-${MY_PV}" |
Archives