[arch-commits] Commit in krfb/repos (7 files)
Antonio Rojas
arojas at archlinux.org
Thu Apr 20 08:52:36 UTC 2017
Date: Thursday, April 20, 2017 @ 08:52:29
Author: arojas
Revision: 293465
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64
Added:
krfb/repos/kde-unstable-i686/
krfb/repos/kde-unstable-i686/PKGBUILD
(from rev 293464, krfb/trunk/PKGBUILD)
krfb/repos/kde-unstable-i686/krfb-gcc6.patch
(from rev 293464, krfb/trunk/krfb-gcc6.patch)
krfb/repos/kde-unstable-x86_64/PKGBUILD
(from rev 293464, krfb/trunk/PKGBUILD)
krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch
(from rev 293464, krfb/trunk/krfb-gcc6.patch)
Deleted:
krfb/repos/kde-unstable-x86_64/PKGBUILD
krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch
-------------------------------------+
/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++
/krfb-gcc6.patch | 13 ++++++++++
kde-unstable-i686/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++
kde-unstable-i686/krfb-gcc6.patch | 13 ++++++++++
kde-unstable-x86_64/PKGBUILD | 44 ----------------------------------
kde-unstable-x86_64/krfb-gcc6.patch | 13 ----------
6 files changed, 114 insertions(+), 57 deletions(-)
Copied: krfb/repos/kde-unstable-i686/PKGBUILD (from rev 293464, krfb/trunk/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2017-04-20 08:52:29 UTC (rev 293465)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=17.04.0
+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=('7ee97a4bb37c43fcd57f72cb7820fe9ab2481702ab77e341c37c5f00c7de6a86'
+ 'SKIP'
+ '09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at 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-i686/krfb-gcc6.patch (from rev 293464, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- kde-unstable-i686/krfb-gcc6.patch (rev 0)
+++ kde-unstable-i686/krfb-gcc6.patch 2017-04-20 08:52:29 UTC (rev 293465)
@@ -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: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2017-04-20 08:52:02 UTC (rev 293464)
+++ kde-unstable-x86_64/PKGBUILD 2017-04-20 08:52:29 UTC (rev 293465)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux,org>
-# Maintainer: Felix Yan <felixonmars at 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 <aacid at 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 293464, krfb/trunk/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2017-04-20 08:52:29 UTC (rev 293465)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux,org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=krfb
+pkgver=17.04.0
+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=('7ee97a4bb37c43fcd57f72cb7820fe9ab2481702ab77e341c37c5f00c7de6a86'
+ 'SKIP'
+ '09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at 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: kde-unstable-x86_64/krfb-gcc6.patch
===================================================================
--- kde-unstable-x86_64/krfb-gcc6.patch 2017-04-20 08:52:02 UTC (rev 293464)
+++ kde-unstable-x86_64/krfb-gcc6.patch 2017-04-20 08:52:29 UTC (rev 293465)
@@ -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 293464, krfb/trunk/krfb-gcc6.patch)
===================================================================
--- kde-unstable-x86_64/krfb-gcc6.patch (rev 0)
+++ kde-unstable-x86_64/krfb-gcc6.patch 2017-04-20 08:52:29 UTC (rev 293465)
@@ -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