Merge ~panfaust/kubuntu-packaging/+git/krfb:gcc6 into ~kubuntu-packagers/kubuntu-packaging/+git/krfb:kubuntu_yakkety_archive

[Jose Manuel Santamaria Lema]

Add a patch from Fedora to fix a build failure with GCC 6. Note that there's also one in debian's git but I think the one from debian is not the correct solution to the problem because it puts some includes upside-down while this one seems to adress the problem directly and correclty.

This patch should be sent upstream sooner or later.

diff --git a/debian/changelog b/debian/changelog
index 8c53311..d0856cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,11 @@ krfb (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release (16.04.2)
   * New upstream release (16.04.3)
 
+  [ José Manuel Santamaría Lema ]
+  * Refresh add_libpthread_to_krfb.diff
+  * Add kubuntu_krfb-max-gcc6.diff from Fedora to avoid a build failure
+    with GCC 6.
+
  -- Clive Johnston <[e-mail]>  Fri, 08 Jul 2016 01:18:06 +0100
 
 krfb (4:15.12.3-0ubuntu1) xenial; urgency=medium
diff --git a/debian/patches/add_libpthread_to_krfb.diff b/debian/patches/add_libpthread_to_krfb.diff
index dfd8fad..62e321b 100644
--- a/debian/patches/add_libpthread_to_krfb.diff
+++ b/debian/patches/add_libpthread_to_krfb.diff
@@ -1,8 +1,6 @@
-Index: krfb/krfb/CMakeLists.txt
-===================================================================
---- krfb.orig/krfb/CMakeLists.txt	2014-09-24 14:08:49.843738219 +0200
-+++ krfb/krfb/CMakeLists.txt	2014-09-24 14:08:49.843738219 +0200
-@@ -125,6 +125,8 @@
+--- a/krfb/CMakeLists.txt
++++ b/krfb/CMakeLists.txt
+@@ -102,6 +102,8 @@ if (X11_XTest_FOUND)
      )
  endif (X11_XTest_FOUND)
  
diff --git a/debian/patches/kubuntu_krfb-max-gcc6.diff b/debian/patches/kubuntu_krfb-max-gcc6.diff
new file mode 100644
index 0000000..01e773e
--- /dev/null
+++ b/debian/patches/kubuntu_krfb-max-gcc6.diff
@@ -0,0 +1,15 @@
+Description: This patch fixes a build failure with GCC 6
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/krfb.git/tree/krfb-15.12.2-max-gcc6.patch
+Forwarded: no
+--- a/krfb/rfb.h
++++ b/krfb/rfb.h
+@@ -8,6 +8,9 @@
+ 
+ #include "rfb/rfb.h"
+ 
++#ifdef max // fix conflict with max() macro using gcc6 
++#undef max
++#endif
+ #undef TRUE
+ #undef FALSE
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 98cd28e..cebcd57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add_libpthread_to_krfb.diff
+kubuntu_krfb-max-gcc6.diff