[arch-commits] Commit in krfb/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Jul 23 18:51:56 UTC 2016
Date: Saturday, July 23, 2016 @ 18:51:56
Author: arojas
Revision: 272383
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
krfb/repos/kde-unstable-i686/
krfb/repos/kde-unstable-i686/PKGBUILD
(from rev 272382, krfb/kde-unstable/PKGBUILD)
krfb/repos/kde-unstable-i686/krfb-gcc6.patch
(from rev 272382, krfb/kde-unstable/krfb-gcc6.patch)
krfb/repos/kde-unstable-x86_64/
krfb/repos/kde-unstable-x86_64/PKGBUILD
(from rev 272382, krfb/kde-unstable/PKGBUILD)
krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch
(from rev 272382, krfb/kde-unstable/krfb-gcc6.patch)
-------------------------------------+
kde-unstable-i686/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++
kde-unstable-i686/krfb-gcc6.patch | 13 ++++++++++
kde-unstable-x86_64/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++
kde-unstable-x86_64/krfb-gcc6.patch | 13 ++++++++++
4 files changed, 110 insertions(+)
Copied: krfb/repos/kde-unstable-i686/PKGBUILD (from rev 272382, krfb/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2016-07-23 18:51:56 UTC (rev 272383)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=16.07.80
+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/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" krfb-gcc6.patch)
+md5sums=('d1e0c89362145de9bdc020c22751d0bd'
+ '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 \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: krfb/repos/kde-unstable-i686/krfb-gcc6.patch (from rev 272382, krfb/kde-unstable/krfb-gcc6.patch)
===================================================================
--- kde-unstable-i686/krfb-gcc6.patch (rev 0)
+++ kde-unstable-i686/krfb-gcc6.patch 2016-07-23 18:51:56 UTC (rev 272383)
@@ -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/kde-unstable-x86_64/PKGBUILD (from rev 272382, krfb/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2016-07-23 18:51:56 UTC (rev 272383)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=16.07.80
+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/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" krfb-gcc6.patch)
+md5sums=('d1e0c89362145de9bdc020c22751d0bd'
+ '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 \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch (from rev 272382, krfb/kde-unstable/krfb-gcc6.patch)
===================================================================
--- kde-unstable-x86_64/krfb-gcc6.patch (rev 0)
+++ kde-unstable-x86_64/krfb-gcc6.patch 2016-07-23 18:51:56 UTC (rev 272383)
@@ -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
+
More information about the arch-commits
mailing list