From 52080dad931c61fa026bcf0f9bc0b3186e20951d Mon Sep 17 00:00:00 2001 From: FeRD (Frank Dana) Date: Feb 12 2020 11:19:49 +0000 Subject: Correct extern patch --- diff --git a/frotz-2.51-extern.patch b/frotz-2.51-extern.patch new file mode 100644 index 0000000..afc8d54 --- /dev/null +++ b/frotz-2.51-extern.patch @@ -0,0 +1,67 @@ +From 100203747295625644b5cbb6b6f01553f55e23ad Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +Date: Wed, 12 Feb 2020 06:08:25 -0500 +Subject: [PATCH] Single definition for f_setup + +--- + src/dumb/dblorb.c | 2 +- + src/dumb/dinit.c | 2 +- + src/dumb/dinput.c | 2 +- + src/dumb/dpic.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/dumb/dblorb.c b/src/dumb/dblorb.c +index 98a62ac..0d1e3a8 100644 +--- a/src/dumb/dblorb.c ++++ b/src/dumb/dblorb.c +@@ -33,7 +33,7 @@ + + #ifndef NO_BLORB + +-f_setup_t f_setup; ++extern f_setup_t f_setup; + + FILE *blorb_fp; + bb_result_t blorb_res; +diff --git a/src/dumb/dinit.c b/src/dumb/dinit.c +index d03568d..76555de 100644 +--- a/src/dumb/dinit.c ++++ b/src/dumb/dinit.c +@@ -23,7 +23,7 @@ + #include "dfrotz.h" + #include "dblorb.h" + +-f_setup_t f_setup; ++extern f_setup_t f_setup; + extern z_header_t z_header; + + static void print_version(void); +diff --git a/src/dumb/dinput.c b/src/dumb/dinput.c +index ede2c92..7e813d8 100644 +--- a/src/dumb/dinput.c ++++ b/src/dumb/dinput.c +@@ -24,7 +24,7 @@ + + #include "dfrotz.h" + +-f_setup_t f_setup; ++extern f_setup_t f_setup; + + static char runtime_usage[] = + "DUMB-FROTZ runtime help:\n" +diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c +index a9ecf28..c1e7ba4 100644 +--- a/src/dumb/dpic.c ++++ b/src/dumb/dpic.c +@@ -22,7 +22,7 @@ + #include "dfrotz.h" + #include "dblorb.h" + +-f_setup_t f_setup; ++extern f_setup_t f_setup; + extern z_header_t z_header; + + +-- +2.24.1 + diff --git a/frotz-2.51-f_setup.patch b/frotz-2.51-f_setup.patch deleted file mode 100644 index afc8d54..0000000 --- a/frotz-2.51-f_setup.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 100203747295625644b5cbb6b6f01553f55e23ad Mon Sep 17 00:00:00 2001 -From: "FeRD (Frank Dana)" -Date: Wed, 12 Feb 2020 06:08:25 -0500 -Subject: [PATCH] Single definition for f_setup - ---- - src/dumb/dblorb.c | 2 +- - src/dumb/dinit.c | 2 +- - src/dumb/dinput.c | 2 +- - src/dumb/dpic.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/dumb/dblorb.c b/src/dumb/dblorb.c -index 98a62ac..0d1e3a8 100644 ---- a/src/dumb/dblorb.c -+++ b/src/dumb/dblorb.c -@@ -33,7 +33,7 @@ - - #ifndef NO_BLORB - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - FILE *blorb_fp; - bb_result_t blorb_res; -diff --git a/src/dumb/dinit.c b/src/dumb/dinit.c -index d03568d..76555de 100644 ---- a/src/dumb/dinit.c -+++ b/src/dumb/dinit.c -@@ -23,7 +23,7 @@ - #include "dfrotz.h" - #include "dblorb.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - extern z_header_t z_header; - - static void print_version(void); -diff --git a/src/dumb/dinput.c b/src/dumb/dinput.c -index ede2c92..7e813d8 100644 ---- a/src/dumb/dinput.c -+++ b/src/dumb/dinput.c -@@ -24,7 +24,7 @@ - - #include "dfrotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static char runtime_usage[] = - "DUMB-FROTZ runtime help:\n" -diff --git a/src/dumb/dpic.c b/src/dumb/dpic.c -index a9ecf28..c1e7ba4 100644 ---- a/src/dumb/dpic.c -+++ b/src/dumb/dpic.c -@@ -22,7 +22,7 @@ - #include "dfrotz.h" - #include "dblorb.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - extern z_header_t z_header; - - --- -2.24.1 - diff --git a/frotz.spec b/frotz.spec index 1bb2e96..26372ea 100644 --- a/frotz.spec +++ b/frotz.spec @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://gitlab.com/DavidGriffith/frotz/ Source0: https://gitlab.com/DavidGriffith/frotz/-/archive/%{version}/frotz-%{version}.tar.bz2 -Patch1: frotz-2.51-f_setup.patch +Patch1: frotz-2.51-extern.patch BuildRequires: gcc BuildRequires: pkgconfig(ao)