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