diff -Nru warzone2100-3.3.0/debian/changelog warzone2100-3.3.0/debian/changelog --- warzone2100-3.3.0/debian/changelog 2020-03-09 13:24:48.000000000 +0000 +++ warzone2100-3.3.0/debian/changelog 2020-10-16 22:11:13.000000000 +0000 @@ -1,3 +1,25 @@ +warzone2100 (3.3.0-4) unstable; urgency=medium + + * Team upload. + * Remove wkhtmltopdf from Build-Depends and explain how to build the + pdf documentation from source in README.source. + This is currently necessary to prevent a FTBFS on mipsel. However the pdf + documentation can be rebuilt on all other supported architectures and the + same guide is also already available in html. + + -- Markus Koschany Sat, 17 Oct 2020 00:11:13 +0200 + +warzone2100 (3.3.0-3) unstable; urgency=medium + + * Team upload. + * Add wkhtmltopdf.patch and grant wkhtmltopdf access to local files in order + to prevent a FTBFS. (Closes: #971194) + * Switch to debhelper-compat = 13. + * Declare compliance with Debian Policy 4.5.0. + * Install the appdata file. + + -- Markus Koschany Tue, 06 Oct 2020 22:57:35 +0200 + warzone2100 (3.3.0-2) unstable; urgency=medium * Build-depend on libharfbuzz-dev Closes: #953351 diff -Nru warzone2100-3.3.0/debian/compat warzone2100-3.3.0/debian/compat --- warzone2100-3.3.0/debian/compat 2019-06-26 04:49:41.000000000 +0000 +++ warzone2100-3.3.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru warzone2100-3.3.0/debian/control warzone2100-3.3.0/debian/control --- warzone2100-3.3.0/debian/control 2020-03-09 13:24:48.000000000 +0000 +++ warzone2100-3.3.0/debian/control 2020-10-16 22:11:13.000000000 +0000 @@ -10,7 +10,7 @@ asciidoc, automake1.11, bison, - debhelper (>= 11), + debhelper-compat (= 13), docbook-xml, docbook-xsl, flex (>= 2.5.33~), @@ -38,12 +38,11 @@ libxrandr-dev, pkg-config, unzip, - wkhtmltopdf, xauth, xsltproc, xvfb, zip -Standards-Version: 4.1.3 +Standards-Version: 4.5.0 Homepage: http://www.wz2100.net/ Vcs-Git: https://salsa.debian.org/games-team/warzone2100.git Vcs-Browser: https://salsa.debian.org/games-team/warzone2100 diff -Nru warzone2100-3.3.0/debian/copyright warzone2100-3.3.0/debian/copyright --- warzone2100-3.3.0/debian/copyright 2019-06-26 04:49:41.000000000 +0000 +++ warzone2100-3.3.0/debian/copyright 2020-10-16 22:11:13.000000000 +0000 @@ -8,6 +8,11 @@ 2005-2013, Warzone 2100 Project License: GPL-2+ +Files: icons/warzone2100.appdata.xml +Copyright: Warzone 2100 Project +License: CC0-1.0 + See /usr/share/common-licenses/CC0-1.0 for more information. + Files: debian/* Copyright: 2006-2007 Linas Žvirblis <0x0007@gmail.com> 2007-2012 Paul Wise diff -Nru warzone2100-3.3.0/debian/patches/add-needed-const.patch warzone2100-3.3.0/debian/patches/add-needed-const.patch --- warzone2100-3.3.0/debian/patches/add-needed-const.patch 2020-02-29 09:59:02.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/add-needed-const.patch 2020-10-16 22:11:13.000000000 +0000 @@ -8,10 +8,10 @@ lib/script/chat_parser.ypp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: warzone2100-3.3.0/lib/script/chat_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/chat_lexer.lpp -+++ warzone2100-3.3.0/lib/script/chat_lexer.lpp +diff --git a/lib/script/chat_lexer.lpp b/lib/script/chat_lexer.lpp +index dab1ddf..4e06675 100644 +--- a/lib/script/chat_lexer.lpp ++++ b/lib/script/chat_lexer.lpp @@ -203,7 +203,7 @@ static SDWORD playerIndex; %% @@ -21,11 +21,11 @@ { pInputBuffer = pBuffer; pEndBuffer = pBuffer + size; -Index: warzone2100-3.3.0/lib/script/chat_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/chat_parser.ypp -+++ warzone2100-3.3.0/lib/script/chat_parser.ypp -@@ -727,7 +727,7 @@ R_WAIT_FOR_ME: _T_WAIT R_EOD / +diff --git a/lib/script/chat_parser.ypp b/lib/script/chat_parser.ypp +index 2b71b22..8d28a05 100644 +--- a/lib/script/chat_parser.ypp ++++ b/lib/script/chat_parser.ypp +@@ -727,7 +727,7 @@ R_WAIT_FOR_ME: _T_WAIT R_EOD /* wait */ %% /* Initialize Bison and start chat processing */ diff -Nru warzone2100-3.3.0/debian/patches/fix-yacc.patch warzone2100-3.3.0/debian/patches/fix-yacc.patch --- warzone2100-3.3.0/debian/patches/fix-yacc.patch 2020-02-29 09:58:54.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/fix-yacc.patch 2020-10-16 22:11:13.000000000 +0000 @@ -14,10 +14,10 @@ src/scriptvals_parser.ypp | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) -Index: warzone2100-3.3.0/lib/framework/resource_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/resource_parser.ypp -+++ warzone2100-3.3.0/lib/framework/resource_parser.ypp +diff --git a/lib/framework/resource_parser.ypp b/lib/framework/resource_parser.ypp +index b4ed68a..c32b57d 100644 +--- a/lib/framework/resource_parser.ypp ++++ b/lib/framework/resource_parser.ypp @@ -48,7 +48,7 @@ void yyerror(const char* msg) %} @@ -27,11 +27,11 @@ %union { char *sval; -Index: warzone2100-3.3.0/lib/framework/strres_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/strres_lexer.lpp -+++ warzone2100-3.3.0/lib/framework/strres_lexer.lpp -@@ -105,7 +105,7 @@ extern void strres_set_debug(int bdebug) +diff --git a/lib/framework/strres_lexer.lpp b/lib/framework/strres_lexer.lpp +index 447841c..ca2eb8c 100644 +--- a/lib/framework/strres_lexer.lpp ++++ b/lib/framework/strres_lexer.lpp +@@ -105,7 +105,7 @@ extern void strres_set_debug(int bdebug); /* Match quoted text */ \" { BEGIN QUOTE; } \" { BEGIN 0; } @@ -40,10 +40,10 @@ [^\"\n]* { strres_lval.sval = strdup(yytext); return QTEXT_T; -Index: warzone2100-3.3.0/lib/framework/strres_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/strres_parser.ypp -+++ warzone2100-3.3.0/lib/framework/strres_parser.ypp +diff --git a/lib/framework/strres_parser.ypp b/lib/framework/strres_parser.ypp +index 0e1204e..649524f 100644 +--- a/lib/framework/strres_parser.ypp ++++ b/lib/framework/strres_parser.ypp @@ -32,19 +32,18 @@ extern int strres_lex(void); extern int strres_get_lineno(void); extern char* strres_get_text(void); @@ -70,10 +70,10 @@ %union { char *sval; -Index: warzone2100-3.3.0/lib/framework/strresly.h -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/strresly.h -+++ warzone2100-3.3.0/lib/framework/strresly.h +diff --git a/lib/framework/strresly.h b/lib/framework/strresly.h +index 06640fc..481befc 100644 +--- a/lib/framework/strresly.h ++++ b/lib/framework/strresly.h @@ -29,12 +29,12 @@ void strres_set_extra(YY_EXTRA_TYPE user_defined); @@ -89,10 +89,10 @@ /* Store a string */ WZ_DECL_NONNULL(1, 2, 3) bool strresStoreString(struct STR_RES *psRes, const char *pID, const char *pString); -Index: warzone2100-3.3.0/lib/gamelib/audp_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/gamelib/audp_parser.ypp -+++ warzone2100-3.3.0/lib/gamelib/audp_parser.ypp +diff --git a/lib/gamelib/audp_parser.ypp b/lib/gamelib/audp_parser.ypp +index 90d3b8d..343b744 100644 +--- a/lib/gamelib/audp_parser.ypp ++++ b/lib/gamelib/audp_parser.ypp @@ -35,7 +35,7 @@ void yyerror(const char* fmt); %} @@ -102,10 +102,10 @@ %union { float fval; -Index: warzone2100-3.3.0/lib/script/chat_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/chat_parser.ypp -+++ warzone2100-3.3.0/lib/script/chat_parser.ypp +diff --git a/lib/script/chat_parser.ypp b/lib/script/chat_parser.ypp +index df19115..2b71b22 100644 +--- a/lib/script/chat_parser.ypp ++++ b/lib/script/chat_parser.ypp @@ -173,7 +173,7 @@ static void yyerror(const char* msg); %} @@ -115,11 +115,11 @@ %union { int32_t bval; -Index: warzone2100-3.3.0/lib/script/script_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/script_parser.ypp -+++ warzone2100-3.3.0/lib/script/script_parser.ypp -@@ -1554,7 +1554,7 @@ static CODE_ERROR scriptCodeVarRef(VAR_S +diff --git a/lib/script/script_parser.ypp b/lib/script/script_parser.ypp +index 0302fc1..f161b72 100644 +--- a/lib/script/script_parser.ypp ++++ b/lib/script/script_parser.ypp +@@ -1554,7 +1554,7 @@ static CODE_ERROR scriptCodeVarRef(VAR_SYMBOL *psVariable, // The object variab %} @@ -128,11 +128,11 @@ %union { /* Types returned by the lexer */ -Index: warzone2100-3.3.0/src/scriptvals_parser.ypp -=================================================================== ---- warzone2100-3.3.0.orig/src/scriptvals_parser.ypp -+++ warzone2100-3.3.0/src/scriptvals_parser.ypp -@@ -113,7 +113,7 @@ static bool scrvCheckArrayIndex(SDWORD b +diff --git a/src/scriptvals_parser.ypp b/src/scriptvals_parser.ypp +index cee4f40..03c6fc1 100644 +--- a/src/scriptvals_parser.ypp ++++ b/src/scriptvals_parser.ypp +@@ -113,7 +113,7 @@ static bool scrvCheckArrayIndex(SDWORD base, ARRAY_INDEXES *psIndexes, UDWORD *p %} diff -Nru warzone2100-3.3.0/debian/patches/fromjson.patch warzone2100-3.3.0/debian/patches/fromjson.patch --- warzone2100-3.3.0/debian/patches/fromjson.patch 2020-03-01 11:23:23.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/fromjson.patch 2020-10-16 22:11:13.000000000 +0000 @@ -1,8 +1,17 @@ -Index: warzone2100-3.3.0/po/Makefile.in.in +From: Debian Games Team +Date: Tue, 6 Oct 2020 21:25:16 +0200 +Subject: fromjson + =================================================================== ---- warzone2100-3.3.0.orig/po/Makefile.in.in -+++ warzone2100-3.3.0/po/Makefile.in.in -@@ -75,6 +75,9 @@ DISTFILES = $(DISTFILES.common) Makevars +--- + po/Makefile.in.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/po/Makefile.in.in b/po/Makefile.in.in +index 01768e8..d40729d 100644 +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -75,6 +75,9 @@ DISTFILES = $(DISTFILES.common) Makevars POTFILES.in update-po.sh parseJson.py \ $(POFILES) $(GMOFILES) \ $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) @@ -12,7 +21,7 @@ POTFILES = \ CATALOGS = @CATALOGS@ -@@ -334,7 +337,7 @@ info dvi ps pdf html tags TAGS ctags CTA +@@ -334,7 +337,7 @@ info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: rm -f remove-potcdate.sed rm -f stamp-poT diff -Nru warzone2100-3.3.0/debian/patches/redefinition-FTBFS.patch warzone2100-3.3.0/debian/patches/redefinition-FTBFS.patch --- warzone2100-3.3.0/debian/patches/redefinition-FTBFS.patch 2020-02-29 09:58:59.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/redefinition-FTBFS.patch 2020-10-16 22:11:13.000000000 +0000 @@ -14,11 +14,11 @@ src/scriptvals_lexer.lpp | 21 ++------------------- 7 files changed, 14 insertions(+), 109 deletions(-) -Index: warzone2100-3.3.0/lib/framework/resource_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/resource_lexer.lpp -+++ warzone2100-3.3.0/lib/framework/resource_lexer.lpp -@@ -52,21 +52,21 @@ static inline bool no_warn_unused_result +diff --git a/lib/framework/resource_lexer.lpp b/lib/framework/resource_lexer.lpp +index cb15a39..1839902 100644 +--- a/lib/framework/resource_lexer.lpp ++++ b/lib/framework/resource_lexer.lpp +@@ -52,21 +52,21 @@ static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return tru #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) # define yyget_extra res_get_extra # define yyset_extra res_set_extra @@ -59,11 +59,11 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/lib/framework/strres_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/strres_lexer.lpp -+++ warzone2100-3.3.0/lib/framework/strres_lexer.lpp -@@ -56,21 +56,13 @@ static inline bool no_warn_unused_result +diff --git a/lib/framework/strres_lexer.lpp b/lib/framework/strres_lexer.lpp +index ca2eb8c..8e48b7d 100644 +--- a/lib/framework/strres_lexer.lpp ++++ b/lib/framework/strres_lexer.lpp +@@ -56,21 +56,13 @@ static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return tru #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) # define yyget_extra strres_get_extra # define yyset_extra strres_set_extra @@ -100,10 +100,10 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/lib/gamelib/audp_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/gamelib/audp_lexer.lpp -+++ warzone2100-3.3.0/lib/gamelib/audp_lexer.lpp +diff --git a/lib/gamelib/audp_lexer.lpp b/lib/gamelib/audp_lexer.lpp +index c829519..afb78f5 100644 +--- a/lib/gamelib/audp_lexer.lpp ++++ b/lib/gamelib/audp_lexer.lpp @@ -55,21 +55,13 @@ void audp_error(const char* fmt); #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) # define yyget_extra audp_get_extra @@ -141,10 +141,10 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/lib/script/chat_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/chat_lexer.lpp -+++ warzone2100-3.3.0/lib/script/chat_lexer.lpp +diff --git a/lib/script/chat_lexer.lpp b/lib/script/chat_lexer.lpp +index fb6ae2d..dab1ddf 100644 +--- a/lib/script/chat_lexer.lpp ++++ b/lib/script/chat_lexer.lpp @@ -227,12 +227,3 @@ int chat_wrap(void) /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) @@ -158,10 +158,10 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/lib/script/script_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/script_lexer.lpp -+++ warzone2100-3.3.0/lib/script/script_lexer.lpp +diff --git a/lib/script/script_lexer.lpp b/lib/script/script_lexer.lpp +index d889f31..14052a5 100644 +--- a/lib/script/script_lexer.lpp ++++ b/lib/script/script_lexer.lpp @@ -858,12 +858,3 @@ int scr_wrap(void) /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) @@ -175,10 +175,10 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/src/level_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/src/level_lexer.lpp -+++ warzone2100-3.3.0/src/level_lexer.lpp +diff --git a/src/level_lexer.lpp b/src/level_lexer.lpp +index df67e8e..7db3c67 100644 +--- a/src/level_lexer.lpp ++++ b/src/level_lexer.lpp @@ -54,21 +54,13 @@ static char aText[YYLMAX]; #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) # define yyget_extra lev_get_extra @@ -216,10 +216,10 @@ - return 0; -} -#endif -Index: warzone2100-3.3.0/src/scriptvals_lexer.lpp -=================================================================== ---- warzone2100-3.3.0.orig/src/scriptvals_lexer.lpp -+++ warzone2100-3.3.0/src/scriptvals_lexer.lpp +diff --git a/src/scriptvals_lexer.lpp b/src/scriptvals_lexer.lpp +index d2818de..e407257 100644 +--- a/src/scriptvals_lexer.lpp ++++ b/src/scriptvals_lexer.lpp @@ -62,21 +62,13 @@ static UDWORD currText=0; #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) # define yyget_extra scrv_get_extra diff -Nru warzone2100-3.3.0/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch warzone2100-3.3.0/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch --- warzone2100-3.3.0/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2020-02-29 09:57:50.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2020-10-16 22:11:13.000000000 +0000 @@ -17,10 +17,10 @@ 7 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 win32/MSVCdelparser.bat -Index: warzone2100-3.3.0/autogen.sh -=================================================================== ---- warzone2100-3.3.0.orig/autogen.sh -+++ warzone2100-3.3.0/autogen.sh +diff --git a/autogen.sh b/autogen.sh +index ca7ad13..d226c02 100755 +--- a/autogen.sh ++++ b/autogen.sh @@ -148,8 +148,13 @@ not_version () # Chdir to the srcdir, then run auto* tools. cd "$SRCDIR" @@ -62,10 +62,10 @@ exit 1 } -Index: warzone2100-3.3.0/configure.ac -=================================================================== ---- warzone2100-3.3.0.orig/configure.ac -+++ warzone2100-3.3.0/configure.ac +diff --git a/configure.ac b/configure.ac +index a788dd5..dd34545 100644 +--- a/configure.ac ++++ b/configure.ac @@ -28,6 +28,19 @@ AC_PROG_CXX AC_CHECK_PROG(CXXCOMPILER, ${CXX}, cxxcompiler) test -z "${CXXCOMPILER}" && AC_MSG_ERROR(No C++ compiler found!) @@ -86,10 +86,10 @@ AX_WITH_PROG([PERL], [perl]) AX_PROG_PERL_VERSION([5.10], [], [ PERL="" ]) AC_SUBST([PERL]) -Index: warzone2100-3.3.0/lib/framework/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/Makefile.am -+++ warzone2100-3.3.0/lib/framework/Makefile.am +diff --git a/lib/framework/Makefile.am b/lib/framework/Makefile.am +index 1111600..a04babe 100644 +--- a/lib/framework/Makefile.am ++++ b/lib/framework/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS) $(QT5_CFLAGS) -DUTF8PROC_STATIC AM_CFLAGS = $(WZ_CFLAGS) -DUTF8PROC_STATIC @@ -116,10 +116,10 @@ treap.cpp \ trig.cpp \ utf.cpp \ -Index: warzone2100-3.3.0/lib/gamelib/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/gamelib/Makefile.am -+++ warzone2100-3.3.0/lib/gamelib/Makefile.am +diff --git a/lib/gamelib/Makefile.am b/lib/gamelib/Makefile.am +index 84f4854..9c9aace 100644 +--- a/lib/gamelib/Makefile.am ++++ b/lib/gamelib/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS) $(QT5_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) @@ -138,10 +138,10 @@ + audp_lexer.lpp \ + audp_parser.ypp \ gtime.cpp -Index: warzone2100-3.3.0/lib/script/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/Makefile.am -+++ warzone2100-3.3.0/lib/script/Makefile.am +diff --git a/lib/script/Makefile.am b/lib/script/Makefile.am +index 9663a72..6adc31e 100644 +--- a/lib/script/Makefile.am ++++ b/lib/script/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) $(QT5_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) @@ -170,10 +170,10 @@ + script_parser.ypp \ stack.cpp -Index: warzone2100-3.3.0/src/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/src/Makefile.am -+++ warzone2100-3.3.0/src/Makefile.am +diff --git a/src/Makefile.am b/src/Makefile.am +index f70f02c..10d58e0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(VORBISFILE_CFLAGS) $(VORBIS_CFLAGS) $(OPENAL_CFLAGS) $(FONT_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS) $(GLEW_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS) @@ -213,10 +213,11 @@ selection.cpp \ seqdisp.cpp \ stats.cpp \ -Index: warzone2100-3.3.0/win32/MSVCdelparser.bat -=================================================================== +diff --git a/win32/MSVCdelparser.bat b/win32/MSVCdelparser.bat +new file mode 100644 +index 0000000..93af435 --- /dev/null -+++ warzone2100-3.3.0/win32/MSVCdelparser.bat ++++ b/win32/MSVCdelparser.bat @@ -0,0 +1,23 @@ +del ..\lib\framework\resource_lexer.cpp +del ..\lib\framework\resource_parser.cpp diff -Nru warzone2100-3.3.0/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch warzone2100-3.3.0/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch --- warzone2100-3.3.0/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch 2020-02-29 09:58:48.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch 2020-10-16 22:11:13.000000000 +0000 @@ -12,10 +12,10 @@ lib/script/Makefile.am | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) -Index: warzone2100-3.3.0/lib/framework/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/framework/Makefile.am -+++ warzone2100-3.3.0/lib/framework/Makefile.am +diff --git a/lib/framework/Makefile.am b/lib/framework/Makefile.am +index a04babe..aaf2123 100644 +--- a/lib/framework/Makefile.am ++++ b/lib/framework/Makefile.am @@ -7,6 +7,10 @@ AM_YFLAGS = -d EXTRA_DIST = \ cocoa_wrapper.h cocoa_wrapper.mm @@ -39,11 +39,11 @@ strresly.h \ treap.h \ trig.h \ -Index: warzone2100-3.3.0/lib/gamelib/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/gamelib/Makefile.am -+++ warzone2100-3.3.0/lib/gamelib/Makefile.am -@@ -4,10 +4,11 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT5_CFLAG +diff --git a/lib/gamelib/Makefile.am b/lib/gamelib/Makefile.am +index 9c9aace..b335bea 100644 +--- a/lib/gamelib/Makefile.am ++++ b/lib/gamelib/Makefile.am +@@ -4,10 +4,11 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT5_CFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d @@ -56,11 +56,11 @@ gtime.h \ parser.h -Index: warzone2100-3.3.0/lib/script/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/lib/script/Makefile.am -+++ warzone2100-3.3.0/lib/script/Makefile.am -@@ -4,10 +4,12 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT5_CFLAG +diff --git a/lib/script/Makefile.am b/lib/script/Makefile.am +index 6adc31e..ea8676c 100644 +--- a/lib/script/Makefile.am ++++ b/lib/script/Makefile.am +@@ -4,10 +4,12 @@ AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT5_CFLAGS) AM_LFLAGS = $(FLEX_FLAGS) AM_YFLAGS = -d diff -Nru warzone2100-3.3.0/debian/patches/series warzone2100-3.3.0/debian/patches/series --- warzone2100-3.3.0/debian/patches/series 2020-03-01 12:21:48.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/series 2020-10-16 22:11:13.000000000 +0000 @@ -5,3 +5,4 @@ redefinition-FTBFS.patch add-needed-const.patch fromjson.patch +wkhtmltopdf.patch diff -Nru warzone2100-3.3.0/debian/patches/use-system-libraries.patch warzone2100-3.3.0/debian/patches/use-system-libraries.patch --- warzone2100-3.3.0/debian/patches/use-system-libraries.patch 2020-03-01 03:04:14.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/use-system-libraries.patch 2020-10-16 22:11:13.000000000 +0000 @@ -9,16 +9,31 @@ Also should stop it compiling 3rdparty/miniupnp when we use the system one --- - Makefile.am | 2 -- - configure.ac | 12 +++++++----- - po/update-po.sh | 2 +- - src/Makefile.am | 7 +++---- - 4 files changed, 11 insertions(+), 12 deletions(-) + configure.ac | 5 ----- + po/update-po.sh | 2 +- + src/Makefile.am | 7 +++---- + 3 files changed, 4 insertions(+), 10 deletions(-) -Index: warzone2100-3.3.0/po/update-po.sh -=================================================================== ---- warzone2100-3.3.0.orig/po/update-po.sh -+++ warzone2100-3.3.0/po/update-po.sh +diff --git a/configure.ac b/configure.ac +index 02d2139..a788dd5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -473,11 +473,6 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)" + + # 3rdparty libs + WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty" +-# glm +-WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty/glm" +-# miniupnpc +-WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty/miniupnp" +- + + AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}]) + AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}]) +diff --git a/po/update-po.sh b/po/update-po.sh +index 5a7132f..28ab5ec 100755 +--- a/po/update-po.sh ++++ b/po/update-po.sh @@ -14,6 +14,6 @@ EOF find lib src data po -type f | @@ -27,10 +42,10 @@ + grep -v -e '\.lex\.c\(pp\|xx\)\?$' -e '\.tab\.c\(pp\|xx\)\?$' -e 'lib/betawidget/*' -e '_moc\.' -e 'po/custom/files.js' | grep -v -e '_lexer\.cpp' -e '_parser\.cpp' | sort >> po/POTFILES.in -Index: warzone2100-3.3.0/src/Makefile.am -=================================================================== ---- warzone2100-3.3.0.orig/src/Makefile.am -+++ warzone2100-3.3.0/src/Makefile.am +diff --git a/src/Makefile.am b/src/Makefile.am +index 3382cf3..f70f02c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -286,8 +286,7 @@ COMMONLIBS = \ $(top_builddir)/lib/netplay/libnetplay.a \ $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \ @@ -55,19 +70,3 @@ endif -Index: warzone2100-3.3.0/configure.ac -=================================================================== ---- warzone2100-3.3.0.orig/configure.ac -+++ warzone2100-3.3.0/configure.ac -@@ -473,11 +473,6 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_src - - # 3rdparty libs - WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty" --# glm --WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty/glm" --# miniupnpc --WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty/miniupnp" -- - - AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}]) - AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}]) diff -Nru warzone2100-3.3.0/debian/patches/wkhtmltopdf.patch warzone2100-3.3.0/debian/patches/wkhtmltopdf.patch --- warzone2100-3.3.0/debian/patches/wkhtmltopdf.patch 1970-01-01 00:00:00.000000000 +0000 +++ warzone2100-3.3.0/debian/patches/wkhtmltopdf.patch 2020-10-16 22:11:13.000000000 +0000 @@ -0,0 +1,38 @@ +From: Markus Koschany +Date: Tue, 6 Oct 2020 21:15:51 +0200 +Subject: wkhtmltopdf + +Grant wkhtmltopdf access to local files in order to prevent a FTBFS. +Debian-Bug: https://bugs.debian.org/971194 +Forwarded: no +--- + doc/CMakeLists.txt | 2 +- + doc/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index a2913f0..35b3206 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -200,7 +200,7 @@ elseif(A2X_FOUND) + + add_custom_command( + TARGET wz2100_doc +- COMMAND "wkhtmltopdf" ++ COMMAND wkhtmltopdf --enable-local-file-access + ARGS + "${CMAKE_CURRENT_SOURCE_DIR}/quickstartguide.htm" + "${CMAKE_CURRENT_BINARY_DIR}/quickstartguide.pdf" +diff --git a/doc/Makefile.am b/doc/Makefile.am +index be836b2..7030b5e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -86,7 +86,7 @@ quickstartguide.html: quickstartguide.asciidoc + if WKHTMLTOPDF_AVAILABLE + + quickstartguide.pdf: quickstartguide.html +- $(WKHTMLTOPDF) $(srcdir)/quickstartguide.html $(srcdir)/quickstartguide.pdf ++ $(WKHTMLTOPDF) --enable-local-file-access $(srcdir)/quickstartguide.html $(srcdir)/quickstartguide.pdf + + endif + Binary files /tmp/tmpSuKcnC/w8jZ06JgS8/warzone2100-3.3.0/debian/quickstartguide.pdf and /tmp/tmpSuKcnC/rrIf4BZszB/warzone2100-3.3.0/debian/quickstartguide.pdf differ diff -Nru warzone2100-3.3.0/debian/README.source warzone2100-3.3.0/debian/README.source --- warzone2100-3.3.0/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ warzone2100-3.3.0/debian/README.source 2020-10-16 22:11:13.000000000 +0000 @@ -0,0 +1,9 @@ +If you want to rebuild the quickstartguide.pdf file from source, you need to +add + + wkhtmltopdf + +to Build-Depends in debian/control. This works on all supported architectures +except mipsel where the program segfaults. In order to prevent a FTBFS and a +release critical bug this manual method is required as long as wkhtmltopdf is +buggy on mipsel. diff -Nru warzone2100-3.3.0/debian/source/include-binaries warzone2100-3.3.0/debian/source/include-binaries --- warzone2100-3.3.0/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ warzone2100-3.3.0/debian/source/include-binaries 2020-10-16 22:11:13.000000000 +0000 @@ -0,0 +1 @@ +debian/quickstartguide.pdf diff -Nru warzone2100-3.3.0/debian/warzone2100-data.install warzone2100-3.3.0/debian/warzone2100-data.install --- warzone2100-3.3.0/debian/warzone2100-data.install 2019-06-26 04:49:41.000000000 +0000 +++ warzone2100-3.3.0/debian/warzone2100-data.install 2020-10-16 22:11:13.000000000 +0000 @@ -1,4 +1,4 @@ usr/share/doc usr/share/games/warzone2100/*.wz usr/share/locale -doc/quickstartguide.pdf usr/share/doc/warzone2100 +debian/quickstartguide.pdf usr/share/doc/warzone2100 diff -Nru warzone2100-3.3.0/debian/warzone2100.install warzone2100-3.3.0/debian/warzone2100.install --- warzone2100-3.3.0/debian/warzone2100.install 2019-06-26 04:49:41.000000000 +0000 +++ warzone2100-3.3.0/debian/warzone2100.install 2020-10-16 22:11:13.000000000 +0000 @@ -2,3 +2,4 @@ usr/share/applications usr/share/icons usr/share/man +usr/share/appdata