This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository lordsawar.
commit 943690f90c2a0e80b03270c9fff4379fdbec4844 Author: Markus Koschany <[email protected]> Date: Sat Aug 5 14:34:48 2017 -0400 Fix FTBFS with GCC 7. Closes: #853529 --- debian/patches/gcc7.patch | 38 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) diff --git a/debian/patches/gcc7.patch b/debian/patches/gcc7.patch new file mode 100644 index 0000000..0c4a65b --- /dev/null +++ b/debian/patches/gcc7.patch @@ -0,0 +1,38 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 5 Aug 2017 18:31:46 +0000 +Subject: gcc7 + +Bug-Debian: https://bugs.debian.org/853529 +Origin: http://git.savannah.nongnu.org/cgit/lordsawar.git/commit/?id=7fb13f5c6326f72394e3ac33cca5ee00bbbb4612 +Origin: http://git.savannah.nongnu.org/cgit/lordsawar.git/commit/?id=87f3d6f4944a91b98e492e1927726019f2a785c4 +--- + src/MapRenderer.cpp | 2 +- + src/gui/stack-army-button.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/MapRenderer.cpp b/src/MapRenderer.cpp +index 53aa278..03356fb 100644 +--- a/src/MapRenderer.cpp ++++ b/src/MapRenderer.cpp +@@ -72,7 +72,7 @@ void MapRenderer::render_tile(Vector<int> draw, Vector<int> tile, + } + else + { +- if (style->getImage() == false) ++ if (style->getImage() == NULL) + { + printf ("pic for style %d for tile %d at %d,%d is null\n", + style->getType(), mtile->getType(), tile.x, tile.y); +diff --git a/src/gui/stack-army-button.cpp b/src/gui/stack-army-button.cpp +index 351d978..dcfe4c1 100644 +--- a/src/gui/stack-army-button.cpp ++++ b/src/gui/stack-army-button.cpp +@@ -146,7 +146,7 @@ void StackArmyButton::fill_army_button() + { + bool greyed_out = false; + Stack *active_stack = p->getActivestack(); +- if (active_stack->getArmyById(d_army->getId()) == false) ++ if (active_stack->getArmyById(d_army->getId()) == NULL) + greyed_out = true; + army_image->property_pixbuf() = + gc->getCircledArmyPic(p->getArmyset(), d_army->getTypeId(), diff --git a/debian/patches/series b/debian/patches/series index 1e8dfd4..97de92d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ bigmap-cairomm.patch +gcc7.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
