diff options
author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2022-05-16 19:21:55 +0430 |
---|---|---|
committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2022-05-19 20:17:10 +0430 |
commit | 288818eb29ff22b47318f9d91581c08758653027 (patch) | |
tree | d9328a861b387e36c0aaa535f9bd81f3fd33eabf /Ports/npiet/patches | |
parent | e16272eacd05dd608583ebfa226c77a26d8cfbcb (diff) | |
download | serenity-288818eb29ff22b47318f9d91581c08758653027.zip |
Ports: Update npiet's patches to use git patches
Diffstat (limited to 'Ports/npiet/patches')
-rw-r--r-- | Ports/npiet/patches/0001-Don-t-build-the-html-target-by-default.patch | 25 | ||||
-rw-r--r-- | Ports/npiet/patches/0002-Remove-a-malloc.h-include.patch | 25 | ||||
-rw-r--r-- | Ports/npiet/patches/ReadMe.md | 12 | ||||
-rw-r--r-- | Ports/npiet/patches/npiet.patch | 24 |
4 files changed, 62 insertions, 24 deletions
diff --git a/Ports/npiet/patches/0001-Don-t-build-the-html-target-by-default.patch b/Ports/npiet/patches/0001-Don-t-build-the-html-target-by-default.patch new file mode 100644 index 0000000000..6f184d2e2b --- /dev/null +++ b/Ports/npiet/patches/0001-Don-t-build-the-html-target-by-default.patch @@ -0,0 +1,25 @@ +From 725d6d5a3abd45a61b863f424fb230f009f4c832 Mon Sep 17 00:00:00 2001 +From: Noah Rosamilia <ivoahivoah@gmail.com> +Date: Thu, 6 Jan 2022 18:28:55 -0500 +Subject: [PATCH 1/2] Don't build the html target by default + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index e49616a..8d03935 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -67,7 +67,7 @@ CFLAGS = $(FLAGS) $(PROF) $(CYG) $(WARN) $(DEFS) $(LIBDIRPATH) + ## + ## How to build the target: + ## +-all: npiet npiet-foogol html ++all: npiet npiet-foogol + + npiet: npiet.o + $(CC) $(LDFLAGS) $(PROF) -o npiet npiet.o $(LIBS) +-- +2.36.1 + diff --git a/Ports/npiet/patches/0002-Remove-a-malloc.h-include.patch b/Ports/npiet/patches/0002-Remove-a-malloc.h-include.patch new file mode 100644 index 0000000000..d829bd1a20 --- /dev/null +++ b/Ports/npiet/patches/0002-Remove-a-malloc.h-include.patch @@ -0,0 +1,25 @@ +From 105eed290d94b22a172c87e23d518d27c131c5b7 Mon Sep 17 00:00:00 2001 +From: Noah Rosamilia <ivoahivoah@gmail.com> +Date: Thu, 6 Jan 2022 18:28:55 -0500 +Subject: [PATCH 2/2] Remove a 'malloc.h' include + +--- + npiet-foogol.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/npiet-foogol.c b/npiet-foogol.c +index 4d9174a..70fc2cd 100644 +--- a/npiet-foogol.c ++++ b/npiet-foogol.c +@@ -108,7 +108,7 @@ char *version = "v1.3"; + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <malloc.h> ++// #include <malloc.h> + #include <limits.h> + #include <time.h> + +-- +2.36.1 + diff --git a/Ports/npiet/patches/ReadMe.md b/Ports/npiet/patches/ReadMe.md new file mode 100644 index 0000000000..4f47494e56 --- /dev/null +++ b/Ports/npiet/patches/ReadMe.md @@ -0,0 +1,12 @@ +# Patches for npiet on SerenityOS + +## `0001-Don-t-build-the-html-target-by-default.patch` + +Don't build the html target by default + + +## `0002-Remove-a-malloc.h-include.patch` + +Remove a 'malloc.h' include + + diff --git a/Ports/npiet/patches/npiet.patch b/Ports/npiet/patches/npiet.patch deleted file mode 100644 index bb09f57c0e..0000000000 --- a/Ports/npiet/patches/npiet.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN npiet-1.3f/Makefile.in npiet-1.3f.patched/Makefile.in ---- npiet-1.3f/Makefile.in 2014-12-04 15:59:51.000000000 -0500 -+++ npiet-1.3f.patched/Makefile.in 2022-01-05 13:40:37.959967837 -0500 -@@ -67,7 +67,7 @@ - ## - ## How to build the target: - ## --all: npiet npiet-foogol html -+all: npiet npiet-foogol - - npiet: npiet.o - $(CC) $(LDFLAGS) $(PROF) -o npiet npiet.o $(LIBS) -diff -ruN npiet-1.3f/npiet-foogol.c npiet-1.3f.patched/npiet-foogol.c ---- npiet-1.3f/npiet-foogol.c 2020-08-09 09:18:46.000000000 -0400 -+++ npiet-1.3f.patched/npiet-foogol.c 2022-01-05 13:39:49.922931168 -0500 -@@ -108,7 +108,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <malloc.h> -+// #include <malloc.h> - #include <limits.h> - #include <time.h> - |