From 184fea5fc1d4d2d7caf692154597482f77084845 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 10 Apr 2021 17:45:50 +0200 Subject: [PATCH] Ports: Fix building the frotz port --- Ports/frotz/package.sh | 2 +- Ports/frotz/patches/frotz.patch | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 Ports/frotz/patches/frotz.patch diff --git a/Ports/frotz/package.sh b/Ports/frotz/package.sh index 630bcb50b9..6b0ba602cd 100755 --- a/Ports/frotz/package.sh +++ b/Ports/frotz/package.sh @@ -8,7 +8,7 @@ depends="ncurses" build() { run make \ PKG_CONFIG_CURSES=no \ - CURSES_CFLAGS="-I${SERENITY_ROOT}/Build/Root/usr/local/include/ncurses" \ + CURSES_CFLAGS="-I${SERENITY_ROOT}/Build/i686/Root/usr/local/include/ncurses" \ CURSES_LDFLAGS="-lncurses -ltinfo" \ CURSES=ncurses \ USE_UTF8=no \ diff --git a/Ports/frotz/patches/frotz.patch b/Ports/frotz/patches/frotz.patch deleted file mode 100644 index a0693a5a0a..0000000000 --- a/Ports/frotz/patches/frotz.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur frotz-master/Makefile frotz-master.serenity/Makefile ---- frotz-master/Makefile 2020-04-09 00:48:12.000000000 -0400 -+++ frotz-master.serenity/Makefile 2020-04-18 15:58:39.000000000 -0400 -@@ -235,9 +235,9 @@ - GIT_HASH_SHORT = $(shell git rev-parse --short HEAD) - GIT_DATE = $(shell git show -s --format=%ci) - else --GIT_HASH = "$16e70d08f8a1aa1a4ebca1117ab84ba180809708$" --GIT_HASH_SHORT = "$16e70d0$" --GIT_DATE = "$2020-04-08 21:48:12 -0700$" -+GIT_HASH = 16e70d08f8a1aa1a4ebca1117ab84ba180809708 -+GIT_HASH_SHORT = 16e70d0 -+GIT_DATE = 2020-04-08 21:48:12 -0700 - endif - export CFLAGS -