From 8423be25938f79d6eff613f29a73e48ac30fcfd1 Mon Sep 17 00:00:00 2001
From: Dan MacDonald <allcoms@gmail.com>
Date: Sun, 8 Dec 2019 17:49:54 +0000
Subject: [PATCH] Ports: Update nesalizer port to use Serenity fork

---
 Ports/nesalizer/package.sh                    |  5 ++-
 Ports/nesalizer/patches/Makefile-fix.patch    | 33 -------------------
 .../nesalizer/patches/disable-backtrace.patch | 28 ----------------
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 Ports/nesalizer/patches/Makefile-fix.patch
 delete mode 100644 Ports/nesalizer/patches/disable-backtrace.patch

diff --git a/Ports/nesalizer/package.sh b/Ports/nesalizer/package.sh
index 0b414f3f37..5c810a8768 100755
--- a/Ports/nesalizer/package.sh
+++ b/Ports/nesalizer/package.sh
@@ -1,7 +1,6 @@
 #!/bin/bash ../.port_include.sh
 port=nesalizer
-version=git
+version=master
 curlopts="-L"
-workdir=nesalizer-master
-files="https://github.com/ulfalizer/nesalizer/archive/master.tar.gz nesalizer-master.tar.gz"
+files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip"
 depends=SDL2
diff --git a/Ports/nesalizer/patches/Makefile-fix.patch b/Ports/nesalizer/patches/Makefile-fix.patch
deleted file mode 100644
index b6812f6793..0000000000
--- a/Ports/nesalizer/patches/Makefile-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./Makefile	2016-09-18 10:02:04.000000000 +0100
-+++ ./Makefile-serenity	2019-11-04 13:43:24.842907912 +0000
-@@ -58,7 +58,7 @@
- objects     = $(c_objects) $(cpp_objects)
- deps        = $(addprefix $(BUILD_DIR)/,$(c_sources:=.d) $(cpp_sources:=.d))
- 
--LDLIBS := $(shell sdl2-config --libs) -lrt
-+LDLIBS := -L$(SERENITY_ROOT)/Root/lib -lSDL2 -lgui -lipc -ldraw -lcore -lpthread
- 
- ifeq ($(INCLUDE_DEBUGGER),1)
-     LDLIBS += -lreadline
-@@ -105,12 +105,12 @@
- endif
- 
- ifneq ($(findstring debug,$(CONF)),)
--    compile_flags += -ggdb
-+    compile_flags += -ggdb -fno-rtti
- endif
- ifneq ($(findstring release,$(CONF)),)
-     # Including -Ofast when linking (by including $(optimizations)) gives a
-     # different binary size. Might be worth investigating why.
--    compile_flags += $(optimizations) -DOPTIMIZING
-+    compile_flags += $(optimizations) -DOPTIMIZING -fno-rtti
-     link_flags    += $(optimizations) -fuse-linker-plugin
- endif
- 
-@@ -175,3 +175,6 @@
- 
- .PHONY: clean
- clean: ; $(q)-rm -rf $(BUILD_DIR)
-+
-+install:
-+	install $(BUILD_DIR)/${EXECUTABLE} ${DESTDIR}/bin/${EXECUTABLE}
diff --git a/Ports/nesalizer/patches/disable-backtrace.patch b/Ports/nesalizer/patches/disable-backtrace.patch
deleted file mode 100644
index 52cbc2a38a..0000000000
--- a/Ports/nesalizer/patches/disable-backtrace.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./src/common.cpp	2016-09-18 10:02:04.000000000 +0100
-+++ ./src/common-serenity.cpp	2019-11-02 16:58:54.509792761 +0000
-@@ -1,6 +1,6 @@
- #include "common.h"
- 
--#include <execinfo.h>
-+// #include <execinfo.h>
- #include <signal.h>
- 
- //
-@@ -96,7 +96,7 @@
- static void fatal_signal_handler(int sig) {
-     // Use non-async-signal-safe functions. Likely to work in practice.
- 
--    static void *backtrace_buffer[100];
-+    /*static void *backtrace_buffer[100];
-     static char addr2line_cmd_buf[100];
- 
-     fprintf(stderr, "caught fatal signal '%s'. Backtrace:\n\n", strsignal(sig));
-@@ -124,7 +124,7 @@
-             abort();
-         }
- 
--    abort();
-+    abort();*/
- }
- 
- static void install_fatal_signal_handler(int sig) {