[arch-commits] Commit in restbed/repos/community-x86_64 (3 files)

[Baptiste Jonglez]

    Date: Saturday, March 31, 2018 @ 20:47:05
  Author: zorun
Revision: 313633

archrelease: copy trunk to community-x86_64

Added:
  restbed/repos/community-x86_64/PKGBUILD
    (from rev 313632, restbed/trunk/PKGBUILD)
  restbed/repos/community-x86_64/fix-cmake-catch-include.patch
    (from rev 313632, restbed/trunk/fix-cmake-catch-include.patch)
Deleted:
  restbed/repos/community-x86_64/PKGBUILD

-------------------------------+
 PKGBUILD                      |   86 +++++++++++++++++++++++-----------------
 fix-cmake-catch-include.patch |   12 +++++
 2 files changed, 62 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-31 20:46:44 UTC (rev 313632)
+++ PKGBUILD	2018-03-31 20:47:05 UTC (rev 313633)
@@ -1,36 +0,0 @@
-# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
-# Contributor: Justin Wilcox <nat1192 at gmail dot com>
-pkgname=restbed
-pkgver=4.6+24+gb1f0182
-pkgrel=1
-pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
-arch=('x86_64')
-url="https://github.com/Corvusoft/restbed"
-license=('AGPL3')
-depends=('openssl')
-replaces=('restbed-latest')
-conflicts=('restbed-latest')
-makedepends=('cmake' 'asio' 'kashmir')
-_commit=b1f0182c0ea74ea5e6dc08fd540462422fd0dc7f
-source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz")
-sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9')
-
-build() {
-  cd "$srcdir/$pkgname-$_commit"
-
-  mkdir -p build
-  cd build
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_SHARED=on \
-    -DBUILD_SSL=on
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_commit"
-
-  cd build/
-  make DESTDIR="$pkgdir" install
-}

Copied: restbed/repos/community-x86_64/PKGBUILD (from rev 313632, restbed/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-03-31 20:47:05 UTC (rev 313633)
@@ -0,0 +1,50 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+# Contributor: Justin Wilcox <nat1192 at gmail dot com>
+pkgname=restbed
+pkgver=4.6+24+gb1f0182
+pkgrel=2
+pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications"
+arch=('x86_64')
+url="https://github.com/Corvusoft/restbed"
+license=('AGPL3')
+depends=('openssl')
+replaces=('restbed-latest')
+conflicts=('restbed-latest')
+makedepends=('cmake' 'asio' 'kashmir')
+checkdepends=('catch2')
+_commit=b1f0182c0ea74ea5e6dc08fd540462422fd0dc7f
+source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz"
+        "fix-cmake-catch-include.patch")
+sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9'
+            '9f0de7baf90cb00c02ba27fff893a4d343c46a729f85817871b71cc8f3533790')
+
+prepare() {
+  cd "$srcdir/$pkgname-$_commit"
+  patch -p1 < "$srcdir/fix-cmake-catch-include.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$_commit"
+
+  mkdir -p build
+  cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_SHARED=on \
+    -DBUILD_SSL=on \
+    -DBUILD_TESTS=on
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$_commit/build"
+  make test
+}
+
+package() {
+  cd "$srcdir/$pkgname-$_commit"
+
+  cd build/
+  make DESTDIR="$pkgdir" install
+}

Copied: restbed/repos/community-x86_64/fix-cmake-catch-include.patch (from rev 313632, restbed/trunk/fix-cmake-catch-include.patch)
===================================================================
--- fix-cmake-catch-include.patch	                        (rev 0)
+++ fix-cmake-catch-include.patch	2018-03-31 20:47:05 UTC (rev 313633)
@@ -0,0 +1,12 @@
+diff --git a/cmake/modules/Findcatch.cmake b/cmake/modules/Findcatch.cmake
+index eff91fe..15c7f87 100644
+--- a/cmake/modules/Findcatch.cmake
++++ b/cmake/modules/Findcatch.cmake
+@@ -1,6 +1,6 @@
+ # Copyright 2013-2017, Corvusoft Ltd, All Rights Reserved.
+ 
+-find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/local/include" "/opt/local/include" )
++find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/include/catch" "/usr/local/include" "/opt/local/include" )
+ 
+ if ( catch_INCLUDE )
+     set( CATCH_FOUND TRUE )