gentoo auto-resync : 01:02:2023 - 15:05:01

4 files changed, 1 insertions, 85 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d6761403149c..c5d3411457d4 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 46cca0970470..3cb1efec0408 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,7 +4,6 @@ AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf
 AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019
 AUX libreoffice-7.3.7.2-boost-1.81-locale.patch 1687 BLAKE2B 2d95ddf84c7a2b1eb69da311ac0bc7bdac67ec48173d20a375563455411501b783805f6f8d7e71dc8b3e9b8dc166e5bde96260e26ca57c0333a9c4c5f9a09661 SHA512 4fc2f01f890809f4e118744d7d6dc484f124b980b7699753acf6597c390e4457aac2a32bb720d4ac3afcbb9776b472c27b9c13ebd9aadec2c354a9ee0108e854
 AUX libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch 2221 BLAKE2B c0b719247e58ae9270c420d3f3d4c34ac71ab67cfdcf2e766c6b7420c4919e486fb123c816a0651ad71c71662c155159fb4855934402f0959a3e5394ef818376 SHA512 26bf310f333e862eb91241e0f7b30fea031f29a4a1dfb74b5bfc0a2a9799f80c8a4d550fdcb22d674b4c5bb87618968892d7aa30ed2f0d30ce837c11707bac43
-AUX libreoffice-7.4.4.2-gcc-13.patch 3119 BLAKE2B c78c2d639927e3530088c0103fff714e456ea6b6d4e7477ef70533d2b89b1c23b99046985c0ff47764656150e13bbda9aef95c64ea0277cfd614e4fdb6c9cdd2 SHA512 f9b65463271e55c7a7fc759fb2f8752ad2dccf7fa0acc6cb98ae5fca70c888655d7be46a3d37a9a83fd1ab4b04c2756c8246164167d1dc2bad98cfc50924e295
 AUX libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch 1344 BLAKE2B 463964af9f5480e8038d1d860ac3184da611a2fde3c5a4ba9bacb61d8d676d336aedae65471054d0d01e0524fd7021bc513e8e1a44126e310817dbcda419a626 SHA512 77baae50517f3cefe9edcedfb9438e3b988a1430dc85ac18d0d7e4a15296ff7500b2b0d9db4a2c1d7e383afc2711afe862044c33ad05fa3764a72de0b10e1835
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
@@ -37,7 +36,7 @@ DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.7.2.ebuild 19417 BLAKE2B bbd99b5c0c4c280c9de913dff6602c31ec7d81a1363d429bbd375dd9ac4748094641efef88457c4d5e56b0db8f9dcbd0c8aa91d000c685bde9de94cbb085146c SHA512 790260a38b0ab16363724921169acfaa0b6666acbfe4f7550c238ae5f165e9a6817b9c03e3eb8c6c764674c5b594eb455b530a42a514b4bd17502b7bd61af4bf
-EBUILD libreoffice-7.4.4.2.ebuild 19470 BLAKE2B a044f839a04ed0d2c335459ec40de9171eee1bef4fc32ffd7d013a7426f7ac58ac61a99aa7883081d8b5266cd728f68985e878e0bced1e42fc7faec74e465425 SHA512 74ad9fc853cfb820ec45a17ccf414b99efe980df065fbca1d03c5f4b5b84f141644d813dd4b921c6360f96b4fbc3ab97f3f122192cea5e6cc34d1ac8a1e13992
+EBUILD libreoffice-7.4.4.2.ebuild 19428 BLAKE2B c3d382a2891bf7962c9b367b549ad10c546d933629ea5392d1c668b2cbf0195bae78e85fdf288c5404959cbf228c6d16afc0d2f1189a07c35c66aaefa3485192 SHA512 c2a3356e2b1cffc9c63fdbedc28a7e8898362a8eb3b42c30e93a4609415f76ddfc669440681b8ca7dc48e88c76723ceb58ba00ef26613d6c7a9fad620112268f
 EBUILD libreoffice-7.4.9999.ebuild 19376 BLAKE2B a2142c4633b377af1e4399b7702bb83a543114a2441ae72559e301a19f0aebef8e39779cda203121fc6772a76a1f35337bd43581404716eea3cc70874679ab77 SHA512 973405f613dc71eedd0bd5509ec511c43e6e184a78532554954a1f9cc0f342bea6752d03f85dbbcc2be17bc69891eb38a7cc217a3a2cd32d7a7052fa14cff973
 EBUILD libreoffice-9999.ebuild 19257 BLAKE2B aaf76ee1ac6f05b86fe9c5c16e9952495c3989c7de25ed625f76f61a5635e32f8fdba5264fa7da6afcb27eafefc101ddc79bd3cc9125527e48a1e58eeb514e9e SHA512 e4fff9637eedcc87926ea47903c00583ace2c903e9cf09181ea1964a8ca7375942262970efc82a06aaad153f716c6cfef3e7d3726a86a597173d04f6ee8306e9
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
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 <sbergman@redhat.com>
-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 <sbergman@redhat.com>
---- 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 <array>
-++#include <string>
-+ #include <unordered_map>
-+ #include <vector>
-+ #include "include/core/SkSpan.h"
-
-From 5877c6b118c99c9ec807a111471bfd67720a5086 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-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<unsigned int>(num));
->         ^
-
-etc.
-
-Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---- a/external/skia/missing-include.patch.0
-+++ b/external/skia/missing-include.patch.0
-@@ -8,3 +8,13 @@
-  #include <unordered_map>
-  #include <vector>
-  #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 <cstring>
-+ #include <utility>
-+ #include <type_traits>
-++#include <stdio.h>
-+ 
-+ #ifdef _MSC_VER
-+     #include <intrin.h> // 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}"