[lordsawar] 04/05: Add bigmap-cairomm.patch and fix FTBFS with cairomm 1.12.2.

[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 9e94f1f2116b60ceffadf1d8644829c8b7c9d64d
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 8 16:54:13 2017 +0200

    Add bigmap-cairomm.patch and fix FTBFS with cairomm 1.12.2.
    
    Closes: #866988
---
 debian/patches/bigmap-cairomm.patch | 56 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/bigmap-cairomm.patch b/debian/patches/bigmap-cairomm.patch
new file mode 100644
index 0000000..e9eb20c
--- /dev/null
+++ b/debian/patches/bigmap-cairomm.patch
@@ -0,0 +1,56 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 8 Jul 2017 16:51:16 +0200
+Subject: bigmap cairomm
+
+Fix FTBFS with cairomm 1.12.2. Thanks to Koop Mast for the patch.
+
+Bug-Debian: https://bugs.debian.org/866988
+Forwarded: https://savannah.nongnu.org/bugs/?50853
+---
+ src/bigmap.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/bigmap.cpp b/src/bigmap.cpp
+index 95bbeb6..7ab559a 100644
+--- a/src/bigmap.cpp
++++ b/src/bigmap.cpp
+@@ -67,10 +67,10 @@ BigMap::BigMap()
+ 
+ BigMap::~BigMap()
+ {
+-    if (buffer == true)
++    if (buffer)
+       buffer.clear();
+ 
+-    if (magnified_buffer == true)
++    if (magnified_buffer)
+       magnified_buffer.clear();
+ 
+     delete d_renderer;
+@@ -112,7 +112,7 @@ void BigMap::set_view(Rectangle new_view)
+     // this represents a 1 tile border around the outside of the picture.
+     // it gets rid of the black border.
+ 
+-    if (buffer == true)
++    if (buffer)
+       buffer.clear();
+     
+     buffer_view.dim = view.dim + Vector<int>(2, 2);
+@@ -122,7 +122,7 @@ void BigMap::set_view(Rectangle new_view)
+     buffer_gc = Cairo::Context::create(buffer);
+ 
+     //now create the part that will go out to the gtk::image
+-    if (outgoing == true)
++    if (outgoing)
+       outgoing.clear();
+     outgoing = Cairo::Surface::create(buffer, Cairo::CONTENT_COLOR_ALPHA, image.get_width(), image.get_height());
+ 
+@@ -174,7 +174,7 @@ void BigMap::draw(Player *player, bool redraw_buffer)
+     //Glib::RefPtr<Gdk::Pixmap> outgoing;
+     if (magnification_factor != 1.0)
+       {
+-	if (magnified_buffer == true)
++	if (magnified_buffer)
+ 	  magnified_buffer.clear();
+ 	magnified_buffer = magnify(buffer);
+ 	clip_viewable_buffer(magnified_buffer, p, outgoing);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1e8dfd4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bigmap-cairomm.patch

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