local/xdiff: upgrade to 2.45.0

Revise cmake patch for simplified build.
Fix up subpackages.

4 files changed, 62 insertions, 61 deletions

diff --git a/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch b/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
index ef85ab9..44088bf 100644
--- a/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
+++ b/xdiff/0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
@@ -1,17 +1,17 @@
-From f9e099d60b7c427b69298b0e04b71d6128188397 Mon Sep 17 00:00:00 2001
+From 8e9a7001d70bc35322dc3326e252a3407d762ef2 Mon Sep 17 00:00:00 2001
 From: John Vogel <jvogel4@stny.rr.com>
-Date: Sat, 9 Sep 2023 21:23:42 -0400
-Subject: [PATCH 1/2] flesh out CMakeLists.txt for managable build/install
+Date: Sat, 13 Jul 2024 04:13:24 -0400
+Subject: [PATCH] flesh out CMakeLists.txt for managable build/install
 
 ---
- CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 40 insertions(+), 4 deletions(-)
+ CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 42 insertions(+), 4 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 766b546..6e7e610 100644
+index 49a0d2c..6d01a30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,8 +1,44 @@
+@@ -1,8 +1,46 @@
  cmake_minimum_required(VERSION 3.5.1)
  
 -project(xdiff VERSION "0.1" LANGUAGES C)
@@ -20,10 +20,10 @@ index 766b546..6e7e610 100644
 -file(GLOB SRC "*.c" "*.h")
 -list(SORT SRC)
 +set(XDIFF_MAJOR_VERSION 2)
-+set(XDIFF_MINOR_VERSION 40)
-+set(XDIFF_PATCH_VERSION 1)
++set(XDIFF_MINOR_VERSION 45)
++set(XDIFF_PATCH_VERSION 0)
  
--add_library(xdiff OBJECT ${SRC})
+-add_library(xdiff STATIC ${SRC})
 +set(XDIFF_VERSION
 +	${XDIFF_MAJOR_VERSION}.${XDIFF_MINOR_VERSION}.${XDIFF_PATCH_VERSION})
 +
@@ -38,8 +38,7 @@ index 766b546..6e7e610 100644
 +
 +add_library(xdiff ${xdiff_LIB_SRCS})
 +
-+option(BUILD_SHARED_LIBS "build a shared library" ON)
-+option(BUILD_STATIC_LIBS "build a static library" OFF)
++option(BUILD_SHARED_LIBS "build a shared library" OFF)
 +
 +install(FILES
 +	git-xdiff.h
@@ -51,6 +50,7 @@ index 766b546..6e7e610 100644
 +	xprepare.h
 +	xtypes.h
 +	xutils.h
++	COMPONENT files
 +	DESTINATION include/xdiff)
 +
 +set_target_properties(xdiff PROPERTIES
@@ -58,8 +58,10 @@ index 766b546..6e7e610 100644
 +	SOVERSION ${XDIFF_MAJOR_VERSION}.${XDIFF_MINOR_VERSION})
 +
 +install(TARGETS xdiff ${INSTALL_TARGETS_DEFAULT_ARGS}
++	COMPONENT libs
 +	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	)
 -- 
-2.42.0
+2.45.2
 
diff --git a/xdiff/0002-fix-build-with-musl-libc.patch b/xdiff/0002-fix-build-with-musl-libc.patch
new file mode 100644
index 0000000..c4c7039
--- /dev/null
+++ b/xdiff/0002-fix-build-with-musl-libc.patch
@@ -0,0 +1,27 @@
+From 25677f3ce5b212c81b830e02607401d0ad16a5b5 Mon Sep 17 00:00:00 2001
+From: John Vogel <jvogel4@stny.rr.com>
+Date: Fri, 12 Jul 2024 10:42:06 -0400
+Subject: [PATCH 2/2] fix build with musl libc
+
+---
+ git-xdiff.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/git-xdiff.h b/git-xdiff.h
+index 4091d22..ab5ad47 100644
+--- a/git-xdiff.h
++++ b/git-xdiff.h
+@@ -61,6 +61,10 @@ inline int xdl_regexec_buf(
+ #else
+ # include <regex.h>
+ 
++#ifndef REG_STARTEND
++#define REG_STARTEND 00004
++#endif
++
+ # define xdl_regex_t regex_t
+ # define xdl_regmatch_t regmatch_t
+ 
+-- 
+2.45.2
+
diff --git a/xdiff/0002-git-diff.h-fix-build-with-musl-libc.patch b/xdiff/0002-git-diff.h-fix-build-with-musl-libc.patch
deleted file mode 100644
index 099ff55..0000000
--- a/xdiff/0002-git-diff.h-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e0d91c7d06fef4911cca35b40ea810cc5268ceff Mon Sep 17 00:00:00 2001
-From: John Vogel <jvogel4@stny.rr.com>
-Date: Sat, 9 Sep 2023 21:24:37 -0400
-Subject: [PATCH 2/2] git-diff.h: fix build with musl libc
-
----
- git-xdiff.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/git-xdiff.h b/git-xdiff.h
-index d812d0d..1e8c260 100644
---- a/git-xdiff.h
-+++ b/git-xdiff.h
-@@ -50,6 +50,10 @@
- #define xdl_regex_t regex_t
- #define xdl_regmatch_t regmatch_t
- 
-+#ifndef REG_STARTEND
-+#define REG_STARTEND 00004
-+#endif
-+
- inline int xdl_regexec_buf(
- 	const xdl_regex_t *preg, const char *buf, size_t size,
- 	size_t nmatch, xdl_regmatch_t pmatch[], int eflags)
--- 
-2.42.0
-
diff --git a/xdiff/APKBUILD b/xdiff/APKBUILD
index c2e32fa..f4df063 100644
--- a/xdiff/APKBUILD
+++ b/xdiff/APKBUILD
@@ -1,20 +1,19 @@
 # Contributor: John Vogel <jvogel4@stny.rr.com>
 # Maintainer: John Vogel <jvogel4@stny.rr.com>
 pkgname=xdiff
-pkgver=2.40.1_git20230511
-_commit=4e970f608ee778180e7f68ae1a1c59099a7c1307
-pkgrel=0
+pkgver=2.45.0_git20240513
+_commit=5fa8f66616766361f49bfe0cc0d39451a6795449
+pkgrel=1
 pkgdesc="file differential library used by git, libgit2 and vim"
 url="https://github.com/libgit2/xdiff"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="cmake samurai"
-install=""
-subpackages="$pkgname-static $pkgname-dev"
+makedepends="cmake"
+subpackages="$pkgname-dev $pkgname-doc"
 options="!check"
 source="$pkgname-$pkgver.tar.gz::https://github.com/libgit2/xdiff/archive/$_commit.tar.gz
 	0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
-	0002-git-diff.h-fix-build-with-musl-libc.patch"
+	0002-fix-build-with-musl-libc.patch"
 
 builddir="$srcdir/xdiff-$_commit"
 
@@ -22,29 +21,29 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake -B build-shared \
+	cmake -B build-static \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_STATIC_LIBS=OFF \
 		-DCMAKE_BUILD_TYPE=None \
 		$crossopts
-	cmake --build build-shared
-	cmake -B build-static \
+	cmake --build build-static
+	cmake -B build-shared \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBUILD_STATIC_LIBS=ON \
+		-DBUILD_SHARED_LIBS=ON \
 		-DCMAKE_BUILD_TYPE=None \
 		$crossopts
-	cmake --build build-static
+	cmake --build build-shared
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --install build-shared
-	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-static --component libs
+	DESTDIR="$pkgdir" cmake --install build-shared --component libs
+	DESTDIR="$pkgdir" cmake --install build-shared --component files
+	install -D -m 644 -t "$pkgdir"/usr/share/doc/"$pkgname" \
+		README.md COPYING
 }
 
 sha512sums="
-6e4b70b2e3dcf59052c8dfd93598bd9d3bcdc3c2f7023aa57fe97913dc2b5c6d861a37886328e483fbcc97fc036b1347406f62cf93f1f3931dbdc3f35f0ddad3  xdiff-2.40.1_git20230511.tar.gz
-8fd1b2bbd70dcdb69d5d969111863c5fe9802e264bcc04c921a542fc78be39efc659f2f33330d021e6bf6c023f4c9b2eaabc8aeecc6634196cf2716f70b6a3f8  0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
-ca4b04b65201ef35a6498f8d4f41d8a4d69d4811a53e3ce02778496dd105c39f7bcd43fbca24196975d994822187b14e58070af73fa10598de86774eafefc8f1  0002-git-diff.h-fix-build-with-musl-libc.patch
+5aa0503b55c6d017d1b89bbf432ffba765276b5145ff3e0e6da64da7515dedf5d8343488fb5d4fa5d8960db6b852a31ebdf00552659a34fd768f0456f1015125  xdiff-2.45.0_git20240513.tar.gz
+567d3ade90ac702de884b42dda738da08aa6b44e2592c095b205ea899932a3ae292362a99009ce6dffa4fb9192a4add0cb0faea7fe3846fcd4635b9b4d96864c  0001-flesh-out-CMakeLists.txt-for-managable-build-install.patch
+11562aaed9c1a0bfe5beb9d02dee1a206f5803580b59b4fd0249586d18b79ed9d44ecab25c0e2c40b596ffcaa45213e38a8b419f5368b9d8145a03467d2b4bd8  0002-fix-build-with-musl-libc.patch
 "