[arch-commits] Commit in krfb/repos (4 files)

[Antonio Rojas]

    Date: Wednesday, May 11, 2016 @ 09:01:07
  Author: arojas
Revision: 267777

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

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

------------------------------+
 extra-i686/PKGBUILD          |   38 --------------------------------------
 extra-i686/krfb-gcc6.patch   |   13 +++++++++++++
 extra-x86_64/PKGBUILD        |   38 --------------------------------------
 extra-x86_64/krfb-gcc6.patch |   13 +++++++++++++
 4 files changed, 26 insertions(+), 76 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-05-11 07:00:39 UTC (rev 267776)
+++ extra-i686/PKGBUILD	2016-05-11 07:01:07 UTC (rev 267777)
@@ -1,38 +0,0 @@
-# $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")
-md5sums=('192e84897d0ab7e0c76cf0f32bedefa1')
-
-prepare() {
-  mkdir -p build
-}
-
-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 267776, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- extra-i686/krfb-gcc6.patch	                        (rev 0)
+++ extra-i686/krfb-gcc6.patch	2016-05-11 07:01:07 UTC (rev 267777)
@@ -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
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-05-11 07:00:39 UTC (rev 267776)
+++ extra-x86_64/PKGBUILD	2016-05-11 07:01:07 UTC (rev 267777)
@@ -1,38 +0,0 @@
-# $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")
-md5sums=('192e84897d0ab7e0c76cf0f32bedefa1')
-
-prepare() {
-  mkdir -p build
-}
-
-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 267776, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- extra-x86_64/krfb-gcc6.patch	                        (rev 0)
+++ extra-x86_64/krfb-gcc6.patch	2016-05-11 07:01:07 UTC (rev 267777)
@@ -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
+