From 7a81e7ec2d2c790b4f6ab3d901b209c9df630995 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Sat, 10 May 2025 17:16:54 +0200
Subject: [PATCH] main/ada: remove CPM logic

CPM usage is removed in use-system-deps.patch
---
 main/ada/APKBUILD              | 15 ++-------------
 main/ada/use-system-deps.patch |  6 +++---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/main/ada/APKBUILD b/main/ada/APKBUILD
index a93428b1c20..be9065796f6 100644
--- a/main/ada/APKBUILD
+++ b/main/ada/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=ada
 # NOTE: The primary use of this library is for main/nodejs and community/nodejs-current.
 pkgver=2.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="WHATWG-compliant and fast URL parser written in modern C++"
 url="https://ada-url.github.io/ada"
 arch="all"
@@ -18,20 +18,11 @@ makedepends="
 	"
 checkdepends="simdjson-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-libs"
-_cpmver="0.38.6"
 source="https://github.com/ada-url/ada/archive/v$pkgver/ada-$pkgver.tar.gz
-	CPM_$_cpmver.cmake::https://github.com/cpm-cmake/CPM.cmake/releases/download/v$_cpmver/CPM.cmake
 	use-system-deps.patch
 	ada.pc.in
 	"
 
-prepare() {
-	default_prepare
-
-	mkdir -p "$tmpdir"/cpm
-	mv "$srcdir"/CPM_$_cpmver.cmake "$tmpdir"/cpm/
-}
-
 build() {
 	local crossopts=
 	[ "$CBUILD" != "$CHOST" ] && crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
@@ -44,7 +35,6 @@ build() {
 			-DBUILD_SHARED_LIBS=$shared \
 			-DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \
 			-DADA_BENCHMARKS=OFF \
-			-DCPM_SOURCE_CACHE="$tmpdir" \
 			$crossopts
 		cmake --build build
 	done
@@ -71,7 +61,6 @@ tools() {
 
 sha512sums="
 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6  ada-2.9.2.tar.gz
-4cf8400c408dbaeae7552dac83f6ee3124ff31504975c6c979092101db6fecbbd3e6d80145ce7d3fc437eb254780468c58662c39222b1a2c4770eba790f6a195  CPM_0.38.6.cmake
-ec898e347b55240ef8b6932dfb566facb04c0d1c47a9a41c4cf05eda6c5fc67637b6780a654169480583f83f3e72a6159758c725ba78dfb8128e6ae61e0d6d40  use-system-deps.patch
+9ae74614f5f628fe108fa0b157f3cdd8a049cad245bde9d7b5247c4a99b304b2dc3d93dbbc2436ebcbfc9058de8c05dd1220dedfd08fd26012b067303286646f  use-system-deps.patch
 3fc43305ca84108b0a0bb72f4ebefee04accb4998ed3f19f8c0fa37a732e9e8439231cd35d6dffc09a3ccc8a4de9027c8003dc0fb0aa2cf14bf6bd730360e1f7  ada.pc.in
 "
diff --git a/main/ada/use-system-deps.patch b/main/ada/use-system-deps.patch
index 51c25558103..af54ba68b1a 100644
--- a/main/ada/use-system-deps.patch
+++ b/main/ada/use-system-deps.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,6 +22,7 @@
+@@ -22,39 +22,20 @@
  
  option(ADA_BENCHMARKS "Build benchmarks" OFF)
  option(ADA_TESTING "Build tests" ${BUILD_TESTING})
@@ -8,10 +8,10 @@
  
  # There are cases where when embedding ada as a dependency for other CMake
  # projects as submodules or subdirectories (via FetchContent) can lead to
-@@ -29,32 +30,13 @@
+ # errors due to CPM, so this is here to support disabling all the testing
  # and tooling for ada if one only wishes to use the ada library.
  if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
-   include(cmake/CPM.cmake)
+-  include(cmake/CPM.cmake)
 -  # CPM requires git as an implicit dependency
 -  find_package(Git QUIET)
    # We use googletest in the tests