public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/woff2/files/, media-libs/woff2/
Date: Sat,  3 Aug 2024 02:58:23 +0000 (UTC)	[thread overview]
Message-ID: <1722653422.b341eb04555e08004865595997fbc96518c99906.sam@gentoo> (raw)

commit:     b341eb04555e08004865595997fbc96518c99906
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 02:50:22 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug  3 02:50:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b341eb04

media-libs/woff2: fix build w/ gcc-15

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/woff2/files/woff2-1.0.2-gcc15.patch | 33 ++++++++++++++++++++++++++
 media-libs/woff2/woff2-1.0.2-r6.ebuild         |  1 +
 2 files changed, 34 insertions(+)

diff --git a/media-libs/woff2/files/woff2-1.0.2-gcc15.patch b/media-libs/woff2/files/woff2-1.0.2-gcc15.patch
new file mode 100644
index 000000000000..a8030e471aa2
--- /dev/null
+++ b/media-libs/woff2/files/woff2-1.0.2-gcc15.patch
@@ -0,0 +1,33 @@
+https://github.com/google/woff2/pull/176
+
+From 3905a7d9bc349786b458a71587a6176b241e682f Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Fri, 2 Aug 2024 22:12:03 +0100
+Subject: [PATCH] include/woff2/output.h: add missing <stdint.h> include
+
+Without the change `woff2` build fails on upcoming `gcc-15` as:
+
+    In file included from src/woff2_out.cc:9:
+    include/woff2/output.h:73:25: error: expected ')' before '*' token
+       73 |   WOFF2MemoryOut(uint8_t* buf, size_t buf_size);
+          |                 ~       ^
+          |                         )
+    include/woff2/output.h:79:3: error: 'uint8_t' does not name a type
+       79 |   uint8_t* buf_;
+          |   ^~~~~~~
+    include/woff2/output.h:16:1: note: 'uint8_t' is defined in header '<cstdint>';
+      this is probably fixable by adding '#include <cstdint>'
+       15 | #include <string>
+      +++ |+#include <cstdint>
+       16 |
+--- a/include/woff2/output.h
++++ b/include/woff2/output.h
+@@ -12,6 +12,7 @@
+ #include <algorithm>
+ #include <cstring>
+ #include <memory>
++#include <stdint.h>
+ #include <string>
+ 
+ namespace woff2 {
+

diff --git a/media-libs/woff2/woff2-1.0.2-r6.ebuild b/media-libs/woff2/woff2-1.0.2-r6.ebuild
index f104cb69f87d..b0f52cd42fca 100644
--- a/media-libs/woff2/woff2-1.0.2-r6.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r6.ebuild
@@ -20,6 +20,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-aliasing.patch
+	"${FILESDIR}"/${PN}-1.0.2-gcc15.patch
 )
 
 src_configure() {


             reply	other threads:[~2024-08-03  2:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-03  2:58 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-16 10:28 [gentoo-commits] repo/gentoo:master commit in: media-libs/woff2/files/, media-libs/woff2/ Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1722653422.b341eb04555e08004865595997fbc96518c99906.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox