testing/paho-mqtt-c: upgrade to 1.3.9

 - Switch to cmake.

2 files changed, 24 insertions, 40 deletions

diff --git a/testing/paho-mqtt-c/0002-make-make-all-dirs-required-in-install.patch b/testing/paho-mqtt-c/0002-make-make-all-dirs-required-in-install.patch
deleted file mode 100644
index dda939beb53..00000000000
--- a/testing/paho-mqtt-c/0002-make-make-all-dirs-required-in-install.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9452e00747348535e8c7e87a9edd4d0f1a2df5b0 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 29 Oct 2018 22:40:51 -0400
-Subject: [PATCH 2/3] make: make all dirs required in install
-
-When using DESTDIR, it's possible (and typical) that none of the
-directories in the target will exist. This requires that we create all
-directories needed for our files.
-
-This adds the directories that were omitted.
----
- Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 54c992b..7dd3536 100644
---- a/Makefile
-+++ b/Makefile
-@@ -281,6 +281,10 @@ install-strip: build strip_options install
- 
- install: build
- 	mkdir -p $(DESTDIR)$(PREFIX)${includedir}
-+	mkdir -p $(DESTDIR)$(PREFIX)${bindir}
-+	mkdir -p $(DESTDIR)$(PREFIX)${libdir}
-+	mkdir -p $(DESTDIR)$(PREFIX)${man1dir}
-+	mkdir -p $(DESTDIR)$(PREFIX)${man3dir}
- 	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_C_TARGET} $(DESTDIR)${libdir}
- 	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_CS_TARGET} $(DESTDIR)${libdir}
- 	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_A_TARGET} $(DESTDIR)${libdir}
--- 
-2.26.2
diff --git a/testing/paho-mqtt-c/APKBUILD b/testing/paho-mqtt-c/APKBUILD
index ef54aed1c3c..c61e072d5ab 100644
--- a/testing/paho-mqtt-c/APKBUILD
+++ b/testing/paho-mqtt-c/APKBUILD
@@ -1,27 +1,42 @@
 # Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com>
 # Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com>
 pkgname=paho-mqtt-c
-pkgver=1.3.8
+pkgver=1.3.9
 pkgrel=0
 pkgdesc="Fully fledged MQTT client written in ANSI standard C"
 url="https://www.eclipse.org/paho/clients/c/"
 arch="all"
 license="EPL-1.0"
-makedepends="openssl-dev"
+makedepends="cmake openssl-dev"
 options="!check" # make check not implemented
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/eclipse/paho.mqtt.c/archive/v$pkgver.tar.gz
-	0002-make-make-all-dirs-required-in-install.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/eclipse/paho.mqtt.c/archive/v$pkgver.tar.gz"
 builddir="$srcdir/paho.mqtt.c-$pkgver"
 
 build() {
-	make GAI_LIB="" prefix=/usr
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=None \
+		-DPAHO_WITH_SSL=TRUE \
+		$CMAKE_CROSSOPTS .
+	cmake --build build
 }
 
 package() {
-	make prefix=/usr DESTDIR="$pkgdir" LDCONFIG=echo install
+	DESTDIR="$pkgdir" cmake --install build
+
+	# install man pages
+	for dir in MQTTAsync MQTTClient; do
+		install -Dm644 "docs/$dir/man/man3/"*.3 \
+			-t "$pkgdir"/usr/share/man/man3/
+	done
 }
 
-sha512sums="9bfce9d1b9a8524e7ec84e4e066f5e9da3c297808a2b6403c089f7a04c0fd0df9a8b3085aaa2199181843d23820d14dff9db7f58bb12a5731820511814a4c018  paho-mqtt-c-1.3.8.tar.gz
-9bff23e4750f9d078f1b48d69a4932d3d0655a28d88165111e96919e733a033d47df0470fd9e7ffb87d6445ac1f05af431fa815943a7e00b2bd6cfda39aabe2c  0002-make-make-all-dirs-required-in-install.patch"
+sha512sums="
+2a2ad34df508d8d97ef5382310ba28bb5280843bec337770a2e20442405dde3283473a6038b23fbc1a79bd60d1dfb72d6b508ae4338e95d88b370c0e5625dae5  paho-mqtt-c-1.3.9.tar.gz
+"