[lordsawar] 01/04: Add gcc6.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository lordsawar.

commit f64e5aeca3a28522f3a16395da24bfdd256723d0
Author: Markus Koschany <apo at debian.org>
Date:   Sat Oct 1 16:37:42 2016 +0200

    Add gcc6.patch
---
 debian/patches/gcc6.patch               | 24 ++++++++++++++++++++++++
 debian/patches/reproducible-build.patch | 16 +++++++++++++---
 debian/patches/series                   |  1 +
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
new file mode 100644
index 0000000..23d361c
--- /dev/null
+++ b/debian/patches/gcc6.patch
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 1 Oct 2016 16:37:31 +0200
+Subject: gcc6
+
+Fix FTBFS with GCC-6.
+
+Forwarded: no
+---
+ src/gui/use-item-on-player-dialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/use-item-on-player-dialog.cpp b/src/gui/use-item-on-player-dialog.cpp
+index 7127ec0..884082a 100644
+--- a/src/gui/use-item-on-player-dialog.cpp
++++ b/src/gui/use-item-on-player-dialog.cpp
+@@ -67,7 +67,7 @@ Player *UseItemOnPlayerDialog::grabSelectedPlayer()
+ {
+     Glib::RefPtr<Gtk::TreeView::Selection> sel;
+     sel = player_treeview->get_selection();
+-    if (sel == true)
++    if (sel)
+       {
+         Gtk::TreeModel::iterator it = sel->get_selected();
+         Gtk::TreeModel::Row row = *it;
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 7f4bafb..3285128 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -1,13 +1,23 @@
-Author: Reiner Herrmann <reiner at reiner-h.de>
-Description: Make tarball reproducible
+From: Reiner Herrmann <reiner at reiner-h.de>
+Date: Sat, 1 Oct 2016 16:35:12 +0200
+Subject: reproducible-build
+
+Make tarball reproducible
  - sort file order
  - clamp mtime at $SOURCE_DATE_EPOCH
  - set owner/group to root
  - fix permissions
 
+Forwarded: no
+---
+ create-lw-file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/create-lw-file b/create-lw-file
+index 061a480..0fabd1f 100755
 --- a/create-lw-file
 +++ b/create-lw-file
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ if [ "x$tmpdir" != "x" ]; then
    for f in $files; do
            tmpfiles="$tmpfiles `basename $f`"
    done
diff --git a/debian/patches/series b/debian/patches/series
index 55077d0..3e6a2b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 reproducible-build.patch
+gcc6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git