This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix.
commit 835ba3b6e4b16ae22769f6709523d6072837852d Author: Peter Pentchev <[email protected]> Date: Thu Dec 17 17:52:39 2015 +0200 Fix the conflicting load_file() declarations. Closes: #749635 Reported by: Michael Tautschnig <[email protected]> --- debian/changelog | 3 +++ debian/patches/declare-load-file.patch | 49 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 53 insertions(+) diff --git a/debian/changelog b/debian/changelog index b0a289b..103fe4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ fenix (0.92a.dfsg1-12) UNRELEASED; urgency=medium * Convert the copyright file to the 1.0 machine-readable format and add my debian/* copyright notice. * Enable Large File Support. + * Add the declare-load-file patch to fix the conflicting declarations + of load_file() in the fxc source. Closes: #749635. + Reported by: Michael Tautschnig <[email protected]> -- Peter Pentchev <[email protected]> Thu, 17 Dec 2015 16:11:53 +0200 diff --git a/debian/patches/declare-load-file.patch b/debian/patches/declare-load-file.patch new file mode 100644 index 0000000..f48c1af --- /dev/null +++ b/debian/patches/declare-load-file.patch @@ -0,0 +1,49 @@ +Description: Fix the conflicting declarations of load_file(). +Debian-Bug: https://bugs.debian.org/749635 +Forwarded: no +Author: Peter Pentchev <[email protected]> +Last-Update: 2015-12-17 + +--- a/fxc/inc/fxc.h ++++ b/fxc/inc/fxc.h +@@ -141,6 +141,10 @@ + + extern void div_init() ; + ++#ifdef BUILDING_FXC ++int load_file (char * filename); ++#endif ++ + #include "offsets.h" + #include "pslang.h" + +--- a/fxc/src/main.c ++++ b/fxc/src/main.c +@@ -46,6 +46,7 @@ + #define _(String) String + #endif + ++#define BUILDING_FXC + #include "fxc.h" + + #define FXC_VERSION "FXC " VERSION " (" __DATE__ " " __TIME__ ")" +--- a/fxc/src/token.c ++++ b/fxc/src/token.c +@@ -37,6 +37,7 @@ + #define _(String) String + #endif + ++#define BUILDING_FXC + #include "fxc.h" + #include "messages.c" + +@@ -568,9 +569,6 @@ + fprintf (stderr, ")\n") ; + } + +-extern void load_file (const char * filename) ; +- +- + void token_next () + { + static char buffer[1024] ; diff --git a/debian/patches/series b/debian/patches/series index e3cd2f8..5274251 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,3 +30,4 @@ libgif.patch fix_ftbfs_libpng1.5.patch giflib5.diff cflags-env.patch +declare-load-file.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
