From 79e3f684ad2db0c6df8659e819add7d8517d9cab Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 May 2024 21:45:34 -0500
Subject: user/gprbuild: Update to 24.0.0

---
 user/gprbuild/APKBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'user')

diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD
index 9400b0400..da94aa56d 100644
--- a/user/gprbuild/APKBUILD
+++ b/user/gprbuild/APKBUILD
@@ -1,8 +1,6 @@
 # Maintainer: Samuel Holland <samuel@sholland.org>
 pkgname=gprbuild
-pkgver=2020
-_pkgver=2020-20200814-19ABE
-_xmlver=2020-20200814-19BC4
+pkgver=24.0.0
 pkgrel=0
 pkgdesc="An advanced build system for multi-language systems"
 url="https://github.com/AdaCore/gprbuild"
@@ -11,14 +9,19 @@ options="!check" # No test suite.
 license="GPL-3.0+"
 depends=""
 makedepends="gcc-gnat"
-source="$pkgname-$_pkgver-src.tar.gz::https://community.download.adacore.com/v1/4e13d41920eac86fd139b5d7984eb908d697d868?filename=$pkgname-$_pkgver-src.tar.gz
-	xmlada-$_xmlver-src.tar.gz::https://community.download.adacore.com/v1/9cf1ab59b526d1260e007fa9719126c5498632d2?filename=xmlada-$_xmlver-src.tar.gz
+source="https://github.com/AdaCore/gprbuild/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+	https://github.com/AdaCore/xmlada/archive/v$pkgver/xmlada-$pkgver.tar.gz
 	foxkit.xml
 	"
-builddir="$srcdir/$pkgname-$_pkgver-src"
+
+prepare() {
+	default_prepare
+	ln -s gpr-util-put_resource_usage__unix.adb \
+		"$builddir"/gpr/src/gpr-util-put_resource_usage.adb
+}
 
 build() {
-	xmlada="../xmlada-$_xmlver-src"
+	xmlada="../xmlada-$pkgver"
 	incflags="-Isrc -Igpr/src -I$xmlada/dom -I$xmlada/input_sources \
 	          -I$xmlada/sax -I$xmlada/schema -I$xmlada/unicode"
 	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o
@@ -40,13 +43,13 @@ package() {
 	cp gprlib gprbind \
 		"$pkgdir"/usr/libexec/gprbuild
 	mkdir -p "$pkgdir"/usr/share/gpr
-	cp share/_default.gpr \
+	cp share/_default.gpr share/share.gpr \
 		"$pkgdir"/usr/share/gpr
 	mkdir -p "$pkgdir"/usr/share/gprconfig
-	cp share/gprconfig/* "$srcdir"/foxkit.xml \
+	cp "$srcdir"/foxkit.xml \
 		"$pkgdir"/usr/share/gprconfig
 }
 
-sha512sums="cd9cb2a1f7867f17a5b69d8500476f3a97ca4856b171344d3bf887f55a4860d0ae32ec89ad82e9c7cec13fa20e58cd8ab890554115774095111ed38f9760050e  gprbuild-2020-20200814-19ABE-src.tar.gz
-51365bc1baaa0886caf46d75d3d27d56b37d5a02f04673321a60bda14a2adda0edd43321f8b34583d4aeaf852f4a21a924f841899c458076b3f261d881bb29a1  xmlada-2020-20200814-19BC4-src.tar.gz
+sha512sums="09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03  gprbuild-24.0.0.tar.gz
+4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d  xmlada-24.0.0.tar.gz
 e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc  foxkit.xml"
-- 
cgit v1.2.3-70-g09d2