2 files changed, 26 insertions, 12 deletions
diff --git a/development/Catch/Catch.SlackBuild b/development/Catch/Catch.SlackBuild
index 324e056b4f8ae..be0ef0653fc57 100644
--- a/development/Catch/Catch.SlackBuild
+++ b/development/Catch/Catch.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Catch
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-2.13.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -69,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf ${PRGNAM}2-$VERSION
+tar xvf $CWD/${PRGNAM}2-$VERSION.tar.gz
+cd ${PRGNAM}2-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,12 +79,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/include/Catch
-cp -rvf include/* $PKG/usr/include/Catch
-cp -vf single_include/catch.hpp $PKG/usr/include
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCATCH_USE_VALGRIND=OFF \
+    -DCATCH_BUILD_EXAMPLES=OFF \
+    -DCATCH_ENABLE_COVERAGE=OFF \
+    -DCATCH_ENABLE_WERROR=OFF \
+    -DBUILD_TESTING=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -raf LICENSE.txt README.md docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.md docs/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/Catch/Catch.info b/development/Catch/Catch.info
index c858664ced75d..4464592b0d4c9 100644
--- a/development/Catch/Catch.info
+++ b/development/Catch/Catch.info
@@ -1,8 +1,8 @@
 PRGNAM="Catch"
-VERSION="1.10.0"
-HOMEPAGE="https://github.com/philsquared/Catch"
-DOWNLOAD="https://github.com/philsquared/Catch/archive/v1.10.0/Catch-1.10.0.tar.gz"
-MD5SUM="dbf33b43d6289d2f586cc3f4f9a4f540"
+VERSION="2.13.8"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+DOWNLOAD="https://github.com/catchorg/Catch2/archive/v2.13.8/Catch2-2.13.8.tar.gz"
+MD5SUM="3639fb4cb8020de0dcf1fd5addb39418"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""