Date: Tuesday, June 14, 2016 @ 17:11:02 Author: arojas Revision: 269890
archrelease: copy trunk to extra-i686, extra-x86_64 Added: krfb/repos/extra-i686/PKGBUILD (from rev 269889, krfb/trunk/PKGBUILD) krfb/repos/extra-i686/krfb-gcc6.patch (from rev 269889, krfb/trunk/krfb-gcc6.patch) krfb/repos/extra-x86_64/PKGBUILD (from rev 269889, krfb/trunk/PKGBUILD) krfb/repos/extra-x86_64/krfb-gcc6.patch (from rev 269889, krfb/trunk/krfb-gcc6.patch) Deleted: krfb/repos/extra-i686/PKGBUILD krfb/repos/extra-i686/krfb-gcc6.patch krfb/repos/extra-x86_64/PKGBUILD krfb/repos/extra-x86_64/krfb-gcc6.patch ------------------------------+ /PKGBUILD | 84 +++++++++++++++++++++++++++++++++++++++++ /krfb-gcc6.patch | 26 ++++++++++++ extra-i686/PKGBUILD | 43 -------------------- extra-i686/krfb-gcc6.patch | 13 ------ extra-x86_64/PKGBUILD | 43 -------------------- extra-x86_64/krfb-gcc6.patch | 13 ------ 6 files changed, 110 insertions(+), 112 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-06-14 17:10:46 UTC (rev 269889) +++ extra-i686/PKGBUILD 2016-06-14 17:11:02 UTC (rev 269890) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <arojas@archlinux,org> -# Maintainer: Felix Yan <felixonm...@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/PKGBUILD (from rev 269889, krfb/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-06-14 17:11:02 UTC (rev 269890) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Antonio Rojas <arojas@archlinux,org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=krfb +pkgver=16.04.2 +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=('eb80198868f6181ca28766715c9ec1c7' + '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 +} Deleted: extra-i686/krfb-gcc6.patch =================================================================== --- extra-i686/krfb-gcc6.patch 2016-06-14 17:10:46 UTC (rev 269889) +++ extra-i686/krfb-gcc6.patch 2016-06-14 17:11:02 UTC (rev 269890) @@ -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/extra-i686/krfb-gcc6.patch (from rev 269889, krfb/trunk/krfb-gcc6.patch) =================================================================== --- extra-i686/krfb-gcc6.patch (rev 0) +++ extra-i686/krfb-gcc6.patch 2016-06-14 17:11:02 UTC (rev 269890) @@ -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-06-14 17:10:46 UTC (rev 269889) +++ extra-x86_64/PKGBUILD 2016-06-14 17:11:02 UTC (rev 269890) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Antonio Rojas <arojas@archlinux,org> -# Maintainer: Felix Yan <felixonm...@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/PKGBUILD (from rev 269889, krfb/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-06-14 17:11:02 UTC (rev 269890) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Antonio Rojas <arojas@archlinux,org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=krfb +pkgver=16.04.2 +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=('eb80198868f6181ca28766715c9ec1c7' + '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 +} Deleted: extra-x86_64/krfb-gcc6.patch =================================================================== --- extra-x86_64/krfb-gcc6.patch 2016-06-14 17:10:46 UTC (rev 269889) +++ extra-x86_64/krfb-gcc6.patch 2016-06-14 17:11:02 UTC (rev 269890) @@ -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/extra-x86_64/krfb-gcc6.patch (from rev 269889, krfb/trunk/krfb-gcc6.patch) =================================================================== --- extra-x86_64/krfb-gcc6.patch (rev 0) +++ extra-x86_64/krfb-gcc6.patch 2016-06-14 17:11:02 UTC (rev 269890) @@ -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 +