From 24cde8584dc5f0e716033a089fe3479dc7f04de7 Mon Sep 17 00:00:00 2001
From: Steve McKay <steve@b.abbies.us>
Date: Sat, 17 Aug 2019 12:41:59 -0400
Subject: [PATCH 1/3] Remove undeclared and unused variable

Variable is written but not read and breaks the build
---
 recipes/sdl/redox.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes/sdl/redox.patch b/recipes/sdl/redox.patch
index 5e0d15148..45f32ff9e 100644
--- a/recipes/sdl/redox.patch
+++ b/recipes/sdl/redox.patch
@@ -380,7 +380,7 @@ diff -ruwN source/src/thread/pthread/SDL_systhread.c source-new/src/thread/pthre
 diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orbital/SDL_orbitalevents.c
 --- source/src/video/orbital/SDL_orbitalevents.c	1969-12-31 17:00:00.000000000 -0700
 +++ source-new/src/video/orbital/SDL_orbitalevents.c	2019-08-12 14:51:38.427129083 -0600
-@@ -0,0 +1,242 @@
+@@ -0,0 +1,240 @@
 +/*
 +    SDL - Simple DirectMedia Layer
 +    Copyright (C) 1997-2012 Sam Lantinga
@@ -462,8 +462,6 @@ diff -ruwN source/src/video/orbital/SDL_orbitalevents.c source-new/src/video/orb
 +    void* event_iter = orb_window_events(this->hidden->window);
 +    OrbEventOption oeo = orb_events_next(event_iter);
 +    while (oeo.tag != OrbEventOption_None) {
-+        found_event = true;
-+
 +        switch (oeo.tag) {
 +            case OrbEventOption_Key:
 +                keysym.unicode = oeo.key.character;

From 8e10e1504d03518c22741475bb3160115c531ba8 Mon Sep 17 00:00:00 2001
From: samuela <skainsworth@gmail.com>
Date: Wed, 8 Jan 2020 19:44:24 +0000
Subject: [PATCH 2/3] Workaround for homebrew gettext when building xz.

---
 recipes/xz/recipe.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh
index 8e483f20b..1d86fb00f 100644
--- a/recipes/xz/recipe.sh
+++ b/recipes/xz/recipe.sh
@@ -14,7 +14,12 @@ function recipe_update {
 function recipe_build {
     export CFLAGS="-static"
 
-    ./autogen.sh
+    # autogen.sh requires autopoint which is provided by the gettext homebrew
+    # formula on macOS. Unfortunately, homebrew does not install it into PATH
+    # because macOS provides the BSD gettext library. So we make sure to include
+    # it in PATH.
+    PATH="/usr/local/opt/gettext/bin:$PATH" ./autogen.sh
+
     chmod +w build-aux/config.sub
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
     ./configure \

From b16fe2e832595fa450b2f85e49e187d3facf3607 Mon Sep 17 00:00:00 2001
From: samuela <skainsworth@gmail.com>
Date: Mon, 20 Jan 2020 17:52:18 +0000
Subject: [PATCH 3/3] Only change the path when on macOS

---
 recipes/xz/recipe.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh
index 1d86fb00f..b82f82407 100644
--- a/recipes/xz/recipe.sh
+++ b/recipes/xz/recipe.sh
@@ -13,12 +13,16 @@ function recipe_update {
 
 function recipe_build {
     export CFLAGS="-static"
-
+    
     # autogen.sh requires autopoint which is provided by the gettext homebrew
     # formula on macOS. Unfortunately, homebrew does not install it into PATH
     # because macOS provides the BSD gettext library. So we make sure to include
-    # it in PATH.
-    PATH="/usr/local/opt/gettext/bin:$PATH" ./autogen.sh
+    # it in PATH, preceding the default BSD version.
+    if [[ "$(uname)" == "Darwin" ]]; then
+        export PATH="/usr/local/opt/gettext/bin:$PATH"
+    fi
+
+    ./autogen.sh
 
     chmod +w build-aux/config.sub
     wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub