gentoo auto-resync : 26:01:2023 - 13:56:06

5 files changed, 33 insertions, 8 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1225619e9513..3f08f3b4051e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b6593dc756e5..86a175a9afc2 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,8 @@
 AUX harfbuzz-5.3.1-meson-freetype-icu.patch 5077 BLAKE2B e8eee50d555f7d12b374885e56d946b6283b2a041c4aa0d42bbb0463eca6a039aaef329ca9900f939dbc8a8797784d4e1719be3717e07c1d101827c11ce7f70d SHA512 5a6e3eb18153b87610c0cd14cefb4decf23183b4bebe439edacd3f61d3cfebb0863727dab395aef8bbd38264bf2e741181d0949c78b89cfdb353eb6fa08586cc
+AUX harfbuzz-6.0.0-gcc-13.patch 1065 BLAKE2B 4ecd58ed029c192035b35f9752b7795c77c0185b2189cd489ba1738a3e4a2b0a69e4f48a957d1d125ac42d6e5733d05b2bdb0cc32eba88166ab8270046650c38 SHA512 47c3033f902bc61edc3990dff0ad6e5c1272e300d93cb8d1724b2b891effed373f20c36b965ad35ed9d028e354a338bd6c8e4605eaffb952bf34522e99fa4fcf
 DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95bf365f56934a2bbb8b35955e8457a90a13b0ad3223d8350012373216083e910f517b34c0dffb09fb218a1f8e9ca48 SHA512 6b0aef2b7445f4a71c324b545414114507d8077dc186366f25140dcd3bedeee67868cfc65c0eef59ed950381a4c101a541900be4995f645377c11754b027b501
 DIST harfbuzz-6.0.0.tar.xz 18952524 BLAKE2B bb08f90cf9540a076ec2fe5498658a0e5f963537ebd98fce271af9070d0fc7178346bf56c600720d433c9e3a403f67ec3ac898abeb1da12697ad22980ecf5204 SHA512 66f8484586b1b334479d739df1d1107172715ce1d2a3c0105375174fa3e201fd69ceb1543c10d6db49b012912e823befc701f00621f7b5f68036eced80d36f65
 EBUILD harfbuzz-5.3.1-r1.ebuild 2638 BLAKE2B 7eb5e51db916d3ba539e257722ebb9f43cf04b3d19c04d3d56284a34e435ac25c957048d23693afa61c2ba902151107ecd851d2c69b3d3faa497cdb20eeb7791 SHA512 1cd308511e362075ef7fc17a82831f41d2ab2bdf2d23911b7d9d5b634f309d3c921e0e6bb1025ed9f99cfe7d70b2e87bba72b7b26be6c06b9c542614d55ef960
-EBUILD harfbuzz-6.0.0.ebuild 2622 BLAKE2B 66c4b4a22bb7c9aecfa8636df986745262e61f15337444342d14f7a0e5229c53401cec89e774fea1f2dbc90ec42a309b36644ddb078944154c3a6a71ba4c8877 SHA512 1826c484baee3d5aa501fa4774d10f089b1caeec2d58d9a37488a0ecc2b8abef5a323fd3318090e5f208927becb057ccd35b8c4358616ae7e1cd7dbf83cef280
-EBUILD harfbuzz-9999.ebuild 2630 BLAKE2B 210fc5fae4a8fec5f2b13d12630c3627d9cedf9bb0e8ec642bba85fba4c8221b86198e73b86735c58df4c08fc36e807b74b6cfa6e63a7467b9d63ab41c057f71 SHA512 a96934358fe7157327869dea6928b4d67d6e307c9fbca36482f14e5c7b7a20c54aceae0ce10b82dc18c910289e8018cb7623d40c3d50baeaf03c72b875c18803
+EBUILD harfbuzz-6.0.0.ebuild 2624 BLAKE2B e8509ea5a4c0b241d908165d6c23cf90d920fbbc1ba45f272607058bf30646feb385f313fe6e358983ac7a71c3f43ac774090ff86179d6c139a3d42f1c65a8cc SHA512 a5c3fdb502ec3b06f12a0e58ce060058f96665908fcfdb50bd268655fa16ee11ce9c6906e09105b628a4f97702cbd5fb5abd4e8a99b9b5a34802c71dd56f9375
+EBUILD harfbuzz-9999.ebuild 2586 BLAKE2B 41c6cd58b571bdc30e58f893164fd011da66c73998cc58c9f9baf02ac67c3b38208ccb51b969709906bc3c8d7b66d3864b03f3f0a5f7f56dbb0150ddaa39b99a SHA512 f0d966650908a55193d23529774349d7ef4e5ff84de3b3347b4d64644be8fd82d31204b5761791a47362dbc2026f71ec4800e400f1fa1fe5096d3388e91d51fe
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch b/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
new file mode 100644
index 000000000000..59536b173f21
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-6.0.0-gcc-13.patch
@@ -0,0 +1,26 @@
+https://github.com/harfbuzz/harfbuzz/commit/7dfa672dac958bdbc7703ab0920e167eaa126754
+
+From 7dfa672dac958bdbc7703ab0920e167eaa126754 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Mon, 16 Jan 2023 19:49:53 +0000
+Subject: [PATCH] test/threads/hb-subset-threads.cc: add missing <cstdio>
+ include
+
+This week's `gcc-13` snapshot cleaned further up it's standard headers
+and exposed missing declaration as a build failure:
+
+    ../test/threads/hb-subset-threads.cc: In function 'void test_operation(operation_t, const char*, const test_input_t&)':
+    ../test/threads/hb-subset-threads.cc:127:3: error: 'printf' was not declared in this scope
+
+    ../test/threads/hb-subset-threads.cc: In function 'int main(int, char**)':
+    ../test/threads/hb-subset-threads.cc:157:19: error: 'atoi' was not declared in this scope
+--- a/test/threads/hb-subset-threads.cc
++++ b/test/threads/hb-subset-threads.cc
+@@ -1,4 +1,6 @@
+ #include <cassert>
++#include <cstdio>
++#include <cstdlib>
+ #include <cstring>
+ #include <thread>
+ #include <condition_variable>
+
diff --git a/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
index 6b4d0b8c3c11..becfa8986312 100644
--- a/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-6.0.0.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	introspection? ( dev-util/glib-utils )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	if ! use debug ; then
@@ -64,9 +68,6 @@ src_prepare() {
 		test/shape/data/in-house/Makefile.sources \
 		|| die
 
-	# bug #618772
-	append-cxxflags -std=c++14
-
 	# bug #790359
 	filter-flags -fexceptions -fthreadsafe-statics
 
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index eb7d1a3728cf..bf572ed0f6ee 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -64,9 +64,6 @@ src_prepare() {
 		test/shape/data/in-house/Makefile.sources \
 		|| die
 
-	# bug #618772
-	append-cxxflags -std=c++14
-
 	# bug #790359
 	filter-flags -fexceptions -fthreadsafe-statics