From 0bb51c4b0f62d9de1db4c06a0d8877c5814c9e50 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Sun, 30 Apr 2023 15:52:39 -0500
Subject: [PATCH 1/5] sway: fix for gcc 13

---
 wayland/sway/build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wayland/sway/build b/wayland/sway/build
index 891ecb55..42188807 100755
--- a/wayland/sway/build
+++ b/wayland/sway/build
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
+# Fix for GCC 13.
+export CFLAGS="$CFLAGS -Wno-error=switch"
+
 # Default background color.
 sed 's/0.25f, 0.25f, 0.25f/0.929, 0.870, 0.678/' \
     sway/desktop/render.c > _

From 52fdd489b4fcf8e3bc9ae85e315e166def96af6d Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Sun, 30 Apr 2023 15:53:03 -0500
Subject: [PATCH 2/5] gcc: 13.1.0

---
 core/gcc/checksums | 2 +-
 core/gcc/sources   | 2 +-
 core/gcc/version   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/gcc/checksums b/core/gcc/checksums
index 3357fe05..458c0726 100644
--- a/core/gcc/checksums
+++ b/core/gcc/checksums
@@ -1,2 +1,2 @@
-8d9298d5678dff96f77438dd4766341f9c81c5daf95b9efcaaffa462ff83b67e46
+265bb02f18c6ffb017d5acf80b7cf03ada7f0013143fa99ad89513c1cd02075f35
 0930e07dc2c5bf1172f3fd003a1be7abc3c0c420ce5bd76bc2e514c63800adcb72
diff --git a/core/gcc/sources b/core/gcc/sources
index 8c2faaf8..f634cc81 100644
--- a/core/gcc/sources
+++ b/core/gcc/sources
@@ -1,2 +1,2 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/gcc-12.2.0.tar.xz
+https://gcc.gnu.org/pub/gcc/releases/gcc-13.1.0/gcc-13.1.0.tar.xz
 files/c99
diff --git a/core/gcc/version b/core/gcc/version
index 243af9ea..3432ff40 100644
--- a/core/gcc/version
+++ b/core/gcc/version
@@ -1 +1 @@
-12.2.0 2
+13.1.0 1

From 7ed6cf7336b19ac96a4e9c41b79d895ee7cd0de1 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Sun, 30 Apr 2023 17:46:13 -0500
Subject: [PATCH 3/5] nodejs: fix for gcc-13

---
 extra/nodejs/build                |  2 ++
 extra/nodejs/checksums            |  1 +
 extra/nodejs/patches/gcc-13.patch | 44 +++++++++++++++++++++++++++++++
 extra/nodejs/sources              |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 extra/nodejs/patches/gcc-13.patch

diff --git a/extra/nodejs/build b/extra/nodejs/build
index b15d5815..b96885da 100755
--- a/extra/nodejs/build
+++ b/extra/nodejs/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+patch -p1 < gcc-13.patch
+
 # Fix build when libatomic.so does not exist in the system.
 # This may be provided by compiler-rt which requires no additional
 # linker flags to be used.
diff --git a/extra/nodejs/checksums b/extra/nodejs/checksums
index 13abbf7d..ee544177 100644
--- a/extra/nodejs/checksums
+++ b/extra/nodejs/checksums
@@ -1 +1,2 @@
 bc59c0d2867daed8f814a084fd45c6b4108bc23a078b5306ec88928320d218f887
+58325e9f67df55c410451510a8e29c9a091b824599f38229503908e3d345ee849b
diff --git a/extra/nodejs/patches/gcc-13.patch b/extra/nodejs/patches/gcc-13.patch
new file mode 100644
index 00000000..e2044215
--- /dev/null
+++ b/extra/nodejs/patches/gcc-13.patch
@@ -0,0 +1,44 @@
+From 0164c09d4025df2bd1a42f14de29166aa0e7ac7a Mon Sep 17 00:00:00 2001
+From: Richard Lau <rlau@redhat.com>
+Date: Wed, 26 Apr 2023 15:46:00 -0400
+Subject: [PATCH] deps: V8: cherry-pick c5ab3e4f0c5a
+
+Original commit message:
+
+    libstdc++: fix incomplete type in v8::internal::is_subtype<T, U>
+
+    Using std::convertible with incomplete types is UB. However, till
+    GCC 12 it was accepted and std::convertible returned false.
+    This fails now for e.g. v8::internal::WasmArray. Use
+    std::disjunction and std::conjunction instead which are short-
+    circuiting, because std::is_base_of<T, T> is already true.
+
+    Bug: chromium:957519
+    Change-Id: Ia26643dbdf0fb00d5586c71ae6b18e8d0f3cf96e
+    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4394663
+    Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+    Reviewed-by: Clemens Backes <clemensb@chromium.org>
+    Cr-Commit-Position: refs/heads/main@{#86904}
+
+Refs: https://github.com/v8/v8/commit/c5ab3e4f0c5a3ce880941184ef8447c27cd19a93
+---
+ common.gypi                 | 2 +-
+ deps/v8/src/codegen/tnode.h | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/deps/v8/src/codegen/tnode.h b/deps/v8/src/codegen/tnode.h
+index cd7bd8db98c24..7629e89ad693f 100644
+--- a/deps/v8/src/codegen/tnode.h
++++ b/deps/v8/src/codegen/tnode.h
+@@ -269,8 +269,9 @@ using BuiltinPtr = Smi;
+ template <class T, class U>
+ struct is_subtype {
+   static const bool value =
+-      std::is_base_of<U, T>::value || (std::is_same<U, MaybeObject>::value &&
+-                                       std::is_convertible<T, Object>::value);
++      std::disjunction<std::is_base_of<U, T>,
++                       std::conjunction<std::is_same<U, MaybeObject>,
++                                        std::is_convertible<T, Object>>>::value;
+ };
+ template <class T1, class T2, class U>
+ struct is_subtype<UnionT<T1, T2>, U> {
diff --git a/extra/nodejs/sources b/extra/nodejs/sources
index e6d1f4b6..f6be7029 100644
--- a/extra/nodejs/sources
+++ b/extra/nodejs/sources
@@ -1 +1,2 @@
 https://nodejs.org/download/release/v20.0.0/node-v20.0.0.tar.xz
+patches/gcc-13.patch

From 1211b2790f1c28a68cd0f7a0da452da6d305aef6 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Mon, 1 May 2023 19:26:13 -0500
Subject: [PATCH 4/5] b3sum, kiss: switch to blake3

---
 core/b3sum/checksums | 2 +-
 core/kiss/checksums  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/b3sum/checksums b/core/b3sum/checksums
index 72b35461..f3e83f53 100644
--- a/core/b3sum/checksums
+++ b/core/b3sum/checksums
@@ -1 +1 @@
-1550a39951a2d38829ba1116289cdcd7cbace24a42257bfc2b2c05737d3b23e1
+3a78d3bbb0e553359035da0c5ce9a2eaadcc658d412dc12f9075caa1bbd74c5e2a
diff --git a/core/kiss/checksums b/core/kiss/checksums
index 18f58603..658590b8 100644
--- a/core/kiss/checksums
+++ b/core/kiss/checksums
@@ -1,2 +1,2 @@
-212608597bc75d866673eefe7746aa4bafa8d244ff47a5a0d13161656287a918
-efca06d0a52037c732007f33f99cd368a836b5f9fec3ae314cfd73182f337c01
+766bbc0008632839cf475cd3714f1d73d871b26f358e16409ac5e9a63c37a52297
+d2216d1d703f39deaa8133f6fe6dd1370e4d6a273925a635e530dab4fe71203ff2

From 8a9e20b250cf813ab98b7a3f377e44646dd809c0 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Mon, 1 May 2023 19:26:40 -0500
Subject: [PATCH 5/5] binutils: don't look for zstd

---
 core/binutils/build       | 3 ++-
 testing/firefox/checksums | 2 +-
 testing/firefox/sources   | 2 +-
 testing/firefox/version   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/binutils/build b/core/binutils/build
index 95e0e155..9d267c36 100755
--- a/core/binutils/build
+++ b/core/binutils/build
@@ -25,7 +25,8 @@ export PATH="$PATH:$PWD"
     --disable-gprof \
     --disable-gprofng \
     --with-mmap \
-    --with-system-zlib
+    --with-system-zlib \
+    --without-zstd
 
 make configure-host
 make tooldir=/usr
diff --git a/testing/firefox/checksums b/testing/firefox/checksums
index a85c6bbc..7a2e71e8 100644
--- a/testing/firefox/checksums
+++ b/testing/firefox/checksums
@@ -1,4 +1,4 @@
-db5ba4cf4c77a500572a910ca6553f76e4301a4d363d9492087631998ef43b6ed9
+a8aa6ca676851c2cf28396610644f61215c0d2473c1a34b0da95d198804eef9326
 be44c4a1e76704bd9e0fa713f00b88e9897150eda359c3bf58c30461d9cf56e3c8
 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc
 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8
diff --git a/testing/firefox/sources b/testing/firefox/sources
index f2256608..fe332881 100644
--- a/testing/firefox/sources
+++ b/testing/firefox/sources
@@ -1,4 +1,4 @@
-https://ftp.mozilla.org/pub/firefox/releases/113.0b4/source/firefox-113.0b4.source.tar.xz
+https://ftp.mozilla.org/pub/firefox/releases/113.0b9/source/firefox-113.0b9.source.tar.xz
 patches/fix-linux-header.patch
 patches/musl-sandbox.patch
 patches/no-atk.patch
diff --git a/testing/firefox/version b/testing/firefox/version
index e852ccd7..3c1fe420 100644
--- a/testing/firefox/version
+++ b/testing/firefox/version
@@ -1 +1 @@
-113.0b4 1
+113.0b9 1