Date: Friday, April 7, 2017 @ 20:52:03 Author: arojas Revision: 292433
archrelease: copy kde-unstable to kde-unstable-x86_64 Added: krfb/repos/kde-unstable-x86_64/PKGBUILD (from rev 292432, krfb/kde-unstable/PKGBUILD) krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch (from rev 292432, krfb/kde-unstable/krfb-gcc6.patch) Deleted: krfb/repos/kde-unstable-x86_64/PKGBUILD krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch -----------------+ PKGBUILD | 88 +++++++++++++++++++++++++++--------------------------- krfb-gcc6.patch | 26 +++++++-------- 2 files changed, 57 insertions(+), 57 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-04-07 20:51:50 UTC (rev 292432) +++ PKGBUILD 2017-04-07 20:52:03 UTC (rev 292433) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <arojas@archlinux,org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=krfb -pkgver=17.03.80 -pkgrel=1 -pkgdesc='Desktop Sharing' -url='https://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=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} krfb-gcc6.patch) -sha256sums=('3582b2303ff1390353b13def5d5c0475cf5b8224887f05c8334bd0afc1d51106' - 'SKIP' - '09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> - -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/PKGBUILD (from rev 292432, krfb/kde-unstable/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-04-07 20:52:03 UTC (rev 292433) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Antonio Rojas <arojas@archlinux,org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=krfb +pkgver=17.03.90 +pkgrel=1 +pkgdesc='Desktop Sharing' +url='https://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=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} krfb-gcc6.patch) +sha256sums=('b64d01ee15a09877346632143419166b62bc78a40f9e5bc1c5a6c9e69e797970' + 'SKIP' + '09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> + +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 +} Deleted: krfb-gcc6.patch =================================================================== --- krfb-gcc6.patch 2017-04-07 20:51:50 UTC (rev 292432) +++ krfb-gcc6.patch 2017-04-07 20:52:03 UTC (rev 292433) @@ -1,13 +0,0 @@ -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/krfb-gcc6.patch (from rev 292432, krfb/kde-unstable/krfb-gcc6.patch) =================================================================== --- krfb-gcc6.patch (rev 0) +++ krfb-gcc6.patch 2017-04-07 20:52:03 UTC (rev 292433) @@ -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 +