This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository zoom-player.
commit a72ebbb08401c2c1ce387b2d68752a57ee99bb88 Author: Stephen Kitt <[email protected]> Date: Tue Sep 5 21:28:45 2017 +0200 Build with GCC 7 --- debian/changelog | 7 ++++++ debian/copyright | 2 +- debian/patches/series | 1 + debian/patches/static-inline.patch | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2b6d2a..1f99aee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zoom-player (1.1.5~dfsg-4) UNRELEASED; urgency=medium + + * Add upstream patch to declare inline functions correctly, allowing the + project to build with GCC 7. Closes: #853718. + + -- Stephen Kitt <[email protected]> Tue, 05 Sep 2017 17:13:16 +0200 + zoom-player (1.1.5~dfsg-3) unstable; urgency=medium * Only install relevant files for the manual (HTML files and images), diff --git a/debian/copyright b/debian/copyright index 0a79c7a..8ce2d56 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,7 +16,7 @@ Copyright: 2000-2011 Andrew Hunter License: GPL-2.0+ Files: debian/* -Copyright: 2016 Stephen Kitt +Copyright: 2016-2017 Stephen Kitt License: GPl-2.0+ Files: diff --git a/debian/patches/series b/debian/patches/series index 99cdc98..bf1b6e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ acinclude.patch restore-return.patch xft-pkg-config.patch enable-antialiasing.patch +static-inline.patch diff --git a/debian/patches/static-inline.patch b/debian/patches/static-inline.patch new file mode 100644 index 0000000..4e5190e --- /dev/null +++ b/debian/patches/static-inline.patch @@ -0,0 +1,45 @@ +commit 6b0ad57dd2c125c9126e9b7913560ad25709a36f +Author: Andrew Hunter <[email protected]> +Date: Sat Mar 3 16:31:35 2012 +0000 + + Inline functions need to be marked as static in order to compile with LLVM + +diff --git a/src/interp.c b/src/interp.c +index a5fa8fe..3d446fa 100644 +--- a/src/interp.c ++++ b/src/interp.c +@@ -232,7 +232,7 @@ ZFrame* call_routine(ZDWord* pc, ZStack* stack, ZDWord start) + return newframe; + } + +-inline void store(ZStack* stack, int var, ZWord value) ++static inline void store(ZStack* stack, int var, ZWord value) + { + #ifdef DEBUG + printf_debug("Storing %i in Variable #%x\n", value, var); +@@ -253,7 +253,7 @@ inline void store(ZStack* stack, int var, ZWord value) + } + } + +-inline void store_nopush(ZStack* stack, int var, ZWord value) ++static inline void store_nopush(ZStack* stack, int var, ZWord value) + { + #ifdef DEBUG + printf_debug("Storing %i in Variable #%x\n", value, var); +diff --git a/src/tokenise.c b/src/tokenise.c +index 5925169..fb442d0 100644 +--- a/src/tokenise.c ++++ b/src/tokenise.c +@@ -154,9 +154,9 @@ ZDictionary* dictionary_cache(const ZUWord dict_pos) + + int cache = 1; + +-inline ZUWord lookup_word(unsigned int* word, +- int wordlen, +- ZUWord dct) ++static inline ZUWord lookup_word(unsigned int* word, ++ int wordlen, ++ ZUWord dct) + { + ZByte packed[12]; + int zscii_len; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/zoom-player.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
