[arch-commits] Commit in krfb (7 files)

[Antonio Rojas]

    Date: Wednesday, May 11, 2016 @ 09:01:56
  Author: arojas
Revision: 267779

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  krfb/repos/
  krfb/repos/extra-i686/
  krfb/repos/extra-i686/PKGBUILD
    (from rev 267778, krfb/trunk/PKGBUILD)
  krfb/repos/extra-i686/krfb-gcc6.patch
    (from rev 267778, krfb/trunk/krfb-gcc6.patch)
  krfb/repos/extra-x86_64/
  krfb/repos/extra-x86_64/PKGBUILD
    (from rev 267778, krfb/trunk/PKGBUILD)
  krfb/repos/extra-x86_64/krfb-gcc6.patch
    (from rev 267778, krfb/trunk/krfb-gcc6.patch)

------------------------------+
 extra-i686/PKGBUILD          |   43 +++++++++++++++++++++++++++++++++++++++++
 extra-i686/krfb-gcc6.patch   |   13 ++++++++++++
 extra-x86_64/PKGBUILD        |   43 +++++++++++++++++++++++++++++++++++++++++
 extra-x86_64/krfb-gcc6.patch |   13 ++++++++++++
 4 files changed, 112 insertions(+)

Copied: krfb/repos/extra-i686/PKGBUILD (from rev 267778, krfb/trunk/PKGBUILD)
===================================================================
--- repos/extra-i686/PKGBUILD	                        (rev 0)
+++ repos/extra-i686/PKGBUILD	2016-05-11 07:01:56 UTC (rev 267779)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=16.04.1
+pkgrel=1
+pkgdesc='Desktop Sharing'
+url='http://www.kde.org/applications/system/krfb'
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver libxdamage)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdenetwork-krfb)
+replaces=(kdenetwork-krfb)
+groups=(kde-applications kdenetwork)
+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() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krfb/repos/extra-i686/krfb-gcc6.patch (from rev 267778, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- repos/extra-i686/krfb-gcc6.patch	                        (rev 0)
+++ repos/extra-i686/krfb-gcc6.patch	2016-05-11 07:01:56 UTC (rev 267779)
@@ -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
+ 

Copied: krfb/repos/extra-x86_64/PKGBUILD (from rev 267778, krfb/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD	                        (rev 0)
+++ repos/extra-x86_64/PKGBUILD	2016-05-11 07:01:56 UTC (rev 267779)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=16.04.1
+pkgrel=1
+pkgdesc='Desktop Sharing'
+url='http://www.kde.org/applications/system/krfb'
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver libxdamage)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdenetwork-krfb)
+replaces=(kdenetwork-krfb)
+groups=(kde-applications kdenetwork)
+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() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DKDE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krfb/repos/extra-x86_64/krfb-gcc6.patch (from rev 267778, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- repos/extra-x86_64/krfb-gcc6.patch	                        (rev 0)
+++ repos/extra-x86_64/krfb-gcc6.patch	2016-05-11 07:01:56 UTC (rev 267779)
@@ -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
+