4 files changed, 30 insertions, 34 deletions
diff --git a/libraries/cpprestsdk/cpprestsdk.SlackBuild b/libraries/cpprestsdk/cpprestsdk.SlackBuild
index 6482c6239a..2d1047eebd 100644
--- a/libraries/cpprestsdk/cpprestsdk.SlackBuild
+++ b/libraries/cpprestsdk/cpprestsdk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Microsoft cpprestsdk
 
@@ -22,10 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220304 bkw: Modified by SlackBuilds.org: fix conflict with libwebsocketpp.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpprestsdk
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-20201210_eb6801f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,38 +69,38 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/cpprestsdk.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# 20220304 bkw: explicitly disable websockets. attempting to build with
+# libwebsocketpp installed will fail, otherwise.
 mkdir -p Release/build
 cd Release/build
   cmake \
+    -DCPPREST_EXCLUDE_WEBSOCKETS=ON \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=format-truncation=" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_BINDIR=/usr/bin \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
-cd ../..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  make install/strip DESTDIR=$PKG
+cd -
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar CONTRIBUTORS.txt  README.md  ThirdPartyNotices.txt license.txt Release/samples \
-       $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTORS.txt README.md ThirdPartyNotices.txt license.txt Release/samples \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/cpprestsdk/cpprestsdk.info b/libraries/cpprestsdk/cpprestsdk.info
index 58b9f3945a..ccff5876c0 100644
--- a/libraries/cpprestsdk/cpprestsdk.info
+++ b/libraries/cpprestsdk/cpprestsdk.info
@@ -1,8 +1,8 @@
 PRGNAM="cpprestsdk"
-VERSION="2.9.1"
+VERSION="20201210_eb6801f"
 HOMEPAGE="https://github.com/Microsoft/cpprestsdk/"
-DOWNLOAD="https://github.com/Microsoft/cpprestsdk/archive/v2.9.1/cpprestsdk-2.9.1.tar.gz"
-MD5SUM="0c0e86ef413a05773ffad9de663f8889"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cpprestsdk-20201210_eb6801f.tar.xz"
+MD5SUM="dd06c04b302de7e9543e8485034176a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/cpprestsdk/cpprestsdk.patch b/libraries/cpprestsdk/cpprestsdk.patch
deleted file mode 100644
index cd6035db8a..0000000000
--- a/libraries/cpprestsdk/cpprestsdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur cpprestsdk-2.9.0.old/Release/src/CMakeLists.txt cpprestsdk-2.9.0/Release/src/CMakeLists.txt
---- cpprestsdk-2.9.0.old/Release/src/CMakeLists.txt	2016-10-18 17:30:28.000000000 -0200
-+++ cpprestsdk-2.9.0/Release/src/CMakeLists.txt	2016-12-20 22:36:53.079208022 -0200
-@@ -147,7 +147,7 @@
- 
-   install(
-     TARGETS cpprest
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-     )
- endif()
diff --git a/libraries/cpprestsdk/slack-desc b/libraries/cpprestsdk/slack-desc
index ee3144f5cc..8e0da05681 100644
--- a/libraries/cpprestsdk/slack-desc
+++ b/libraries/cpprestsdk/slack-desc
@@ -13,7 +13,7 @@ cpprestsdk: client-server communication in native code using a modern
 cpprestsdk: asynchronous C++ API design. This project aims to help
 cpprestsdk: C++ developers connect to and interact with services.
 cpprestsdk:
+cpprestsdk: Homepage: https://github.com/Microsoft/cpprestsdk
 cpprestsdk:
 cpprestsdk:
-cpprestsdk: https://github.com/Microsoft/cpprestsdk
 cpprestsdk: