From 6c3584b055426503dc240a10338b92f35f8672b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 17 Aug 2023 18:26:13 +0700
Subject: [PATCH] New package: cppdap-1.58.0+a

---
 common/shlibs                                 |  1 +
 srcpkgs/cppdap-devel                          |  1 +
 srcpkgs/cppdap/patches/gtest.patch            | 32 +++++++++++++++
 .../cppdap/patches/no-freeaddrinfo-null.patch | 26 +++++++++++++
 srcpkgs/cppdap/template                       | 39 +++++++++++++++++++
 5 files changed, 99 insertions(+)
 create mode 120000 srcpkgs/cppdap-devel
 create mode 100644 srcpkgs/cppdap/patches/gtest.patch
 create mode 100644 srcpkgs/cppdap/patches/no-freeaddrinfo-null.patch
 create mode 100644 srcpkgs/cppdap/template

diff --git a/common/shlibs b/common/shlibs
index 4477d4c8797..eab94bb9b16 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4326,3 +4326,4 @@ libmimalloc.so.2 mimalloc-2.1.2_1
 lib2geom.so.1.3.0 lib2geom-1.3_1
 libdbi.so.1 libdbi-0.9.0_1
 libchafa.so.0 libchafa-1.12.5_1
+libcppdap.so cppdap-1.58.0+a_1
diff --git a/srcpkgs/cppdap-devel b/srcpkgs/cppdap-devel
new file mode 120000
index 00000000000..e38f4d08871
--- /dev/null
+++ b/srcpkgs/cppdap-devel
@@ -0,0 +1 @@
+cppdap
\ No newline at end of file
diff --git a/srcpkgs/cppdap/patches/gtest.patch b/srcpkgs/cppdap/patches/gtest.patch
new file mode 100644
index 00000000000..231bf4e5f38
--- /dev/null
+++ b/srcpkgs/cppdap/patches/gtest.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,13 +59,6 @@ set_if_not_defined(CPPDAP_GOOGLETEST_DIR
+ ###########################################################
+ # Submodules
+ ###########################################################
+-if(CPPDAP_BUILD_TESTS)
+-    if(NOT EXISTS ${CPPDAP_GOOGLETEST_DIR}/.git)
+-        message(WARNING "third_party/googletest submodule missing.")
+-        message(WARNING "Run: `git submodule update --init` to build tests.")
+-        set(CPPDAP_BUILD_TESTS OFF)
+-    endif()
+-endif(CPPDAP_BUILD_TESTS)
+ 
+ ###########################################################
+ # JSON library
+@@ -289,7 +282,6 @@ if(CPPDAP_BUILD_TESTS)
+         ${CPPDAP_SRC_DIR}/traits_test.cpp
+         ${CPPDAP_SRC_DIR}/typeinfo_test.cpp
+         ${CPPDAP_SRC_DIR}/variant_test.cpp
+-        ${CPPDAP_GOOGLETEST_DIR}/googletest/src/gtest-all.cc
+     )
+ 
+     set(DAP_TEST_INCLUDE_DIR
+@@ -312,6 +304,7 @@ if(CPPDAP_BUILD_TESTS)
+ 
+     cppdap_set_target_options(cppdap-unittests)
+     target_link_libraries(cppdap-unittests PRIVATE cppdap)
++    target_link_libraries(cppdap-unittests PRIVATE gtest_main gtest)
+ endif(CPPDAP_BUILD_TESTS)
+ 
+ # fuzzer
diff --git a/srcpkgs/cppdap/patches/no-freeaddrinfo-null.patch b/srcpkgs/cppdap/patches/no-freeaddrinfo-null.patch
new file mode 100644
index 00000000000..426b64d1454
--- /dev/null
+++ b/srcpkgs/cppdap/patches/no-freeaddrinfo-null.patch
@@ -0,0 +1,26 @@
+ src/socket.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/socket.cpp b/src/socket.cpp
+index 1211310..e9402d3 100644
+--- a/src/socket.cpp
++++ b/src/socket.cpp
+@@ -108,7 +108,6 @@ class dap::Socket::Shared : public dap::ReaderWriter {
+       return out;
+     }
+ 
+-    freeaddrinfo(info);
+     term();
+     return nullptr;
+   }
+@@ -117,7 +116,9 @@ class dap::Socket::Shared : public dap::ReaderWriter {
+   Shared(addrinfo* info, SOCKET socket) : info(info), s(socket) {}
+ 
+   ~Shared() {
+-    freeaddrinfo(info);
++    if (info) {
++        freeaddrinfo(info);
++    }
+     close();
+     term();
+   }
diff --git a/srcpkgs/cppdap/template b/srcpkgs/cppdap/template
new file mode 100644
index 00000000000..ea294ccdb85
--- /dev/null
+++ b/srcpkgs/cppdap/template
@@ -0,0 +1,39 @@
+# Template file for 'cppdap'
+#
+# As much as I know about Google, their library's ABI ain't stable.
+# Rebuild all revdeps on update
+pkgname=cppdap
+version=1.58.0+a
+revision=1
+build_style=cmake
+configure_args="-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=On
+ -DCPPDAP_BUILD_TESTS=On -DBUILD_SHARED_LIBS=On"
+makedepends="json-c++ gtest-devel"
+short_desc="C++ library for the Debug Adapter Protocol"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/google/cppdap"
+distfiles="https://github.com/google/cppdap/archive/refs/tags/dap-${version/+/-}.tar.gz"
+checksum=5d35ca5db78570b6bef698e3365f79bd82a4f78e8393546387f78d7bdb2a2a08
+
+post_patch() {
+	vsed -i -e "/project.*VERSION/s/VERSION [0-9.]* /VERSION ${version%+*} /" \
+		-e "/add_library/s/ STATIC / /" \
+		CMakeLists.txt
+}
+
+do_check() {
+	cd build
+	./cppdap-unittests
+}
+
+cppdap-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} json-c++"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		# vmove "usr/lib/*.a"
+		# vmove "usr/lib/*.so"
+	}
+}