[arch-commits] Commit in krfb/trunk (PKGBUILD krfb-gcc6.patch)

[Antonio Rojas]

    Date: Wednesday, May 11, 2016 @ 09:00:39
  Author: arojas
Revision: 267776

Fix build with GCC 6 (FS#49294)

Added:
  krfb/trunk/krfb-gcc6.patch
Modified:
  krfb/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    9 +++++++--
 krfb-gcc6.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 06:56:53 UTC (rev 267775)
+++ PKGBUILD	2016-05-11 07:00:39 UTC (rev 267776)
@@ -14,11 +14,16 @@
 conflicts=(kdenetwork-krfb)
 replaces=(kdenetwork-krfb)
 groups=(kde-applications kdenetwork)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-md5sums=('192e84897d0ab7e0c76cf0f32bedefa1')
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" krfb-gcc6.patch)
+md5sums=('192e84897d0ab7e0c76cf0f32bedefa1'
+         'fc342abdbbac31a98c9839b2f61b88e7')
 
 prepare() {
   mkdir -p build
+
+# Fix build with GCC6 (Fedora)
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krfb-gcc6.patch
 }
 
 build() {

Added: krfb-gcc6.patch
===================================================================
--- krfb-gcc6.patch	                        (rev 0)
+++ krfb-gcc6.patch	2016-05-11 07:00:39 UTC (rev 267776)
@@ -0,0 +1,13 @@
+diff -up krfb-15.12.2/krfb/rfb.h.than krfb-15.12.2/krfb/rfb.h
+--- krfb-15.12.2/krfb/rfb.h.than	2016-02-18 14:31:57.918262431 +0100
++++ krfb-15.12.2/krfb/rfb.h	2016-02-18 14:35:20.029628544 +0100
+@@ -8,6 +8,9 @@
+ 
+ #include "rfb/rfb.h"
+ 
++#ifdef max // fix conflict with max() macro using gcc6 
++#undef max
++#endif
+ #undef TRUE
+ #undef FALSE
+