Update to version '24.0w'.

3 files changed, 26 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c465c57c3c2d..99a39dd3aea0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ada_spawn
 	pkgdesc = A simple Ada API to start processes and communicate with them.
-	pkgver = 23.0.0
+	pkgver = 24.0w
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/spawn
@@ -9,9 +9,7 @@ pkgbase = ada_spawn
 	license = Apache
 	makedepends = gprbuild
 	depends = gtkada
-	source = https://github.com/AdaCore/spawn/archive/refs/tags/v23.0.0.tar.gz
-	source = Makefile.patch
-	sha256sums = 1487fef86433d1d06c5c3af3c012aac9eae8d2f4b7f8c1d2fdbe2be0b1770fa8
-	sha256sums = 23f7f6c71c5bcdef0f2258becdd39f4d86bb3f742ff73d08610118b467264343
+	source = file:///opt/gnatstudio-sources/spawn-24.0w-20230428-162D4-src.tar.gz
+	sha256sums = 11aaea8688f5b4f9e38cf38963b0a0eec553c16f1a21961a071be40f5dd12b39
 
 pkgname = ada_spawn
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 37d10d792929..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile	2022-09-26 23:44:48.000000000 +1000
-+++ Makefile-new	2023-01-31 19:57:03.771684951 +1100
-@@ -7,9 +7,9 @@
- INSTALL_LIBRARY_DIR    ?= $(DESTDIR)$(LIBDIR)
- INSTALL_ALI_DIR        ?= ${INSTALL_LIBRARY_DIR}/spawn
- 
--GPRINSTALL_FLAGS = --prefix=$(PREFIX) --sources-subdir=$(INSTALL_INCLUDE_DIR)\
-- --lib-subdir=$(INSTALL_ALI_DIR) --project-subdir=$(INSTALL_PROJECT_DIR)\
-- --link-lib-subdir=$(INSTALL_LIBRARY_DIR)
-+GPRINSTALL_FLAGS = --prefix=$(PREFIX) --sources-subdir=$(INSTALL_INCLUDE_DIR)              \
-+                   --lib-subdir=$(INSTALL_ALI_DIR) --project-subdir=$(INSTALL_PROJECT_DIR) \
-+                   --link-lib-subdir=$(INSTALL_LIBRARY_DIR)
- 
- SPAWN_TESTS=.obj/spawn_test/spawn_test .obj/spawn_test/spawn_unexpected
- 
-@@ -17,17 +17,30 @@
-    SPAWN_TESTS += .obj/spawn_test/spawn_kill
- endif
- 
-+
- all:
-+	LIBRARY_TYPE=relocatable \
- 	gprbuild $(GPRBUILD_FLAGS) -P gnat/spawn.gpr
-+	
- 	gprbuild $(GPRBUILD_FLAGS) -P gnat/spawn_tests.gpr
-+	
-+	LIBRARY_TYPE=relocatable \
-+	gprbuild $(GPRBUILD_FLAGS) -P gnat/spawn_glib.gpr
-+	
-+	gprbuild $(GPRBUILD_FLAGS) -P gnat/spawn_glib_tests.gpr
-+
-+
- check:
- 	export LD_LIBRARY_PATH=.libs/spawn/relocatable; \
--	for TEST in ${SPAWN_TESTS}; do \
--	  echo $$TEST; $$TEST; \
-+	for TEST in ${SPAWN_TESTS}; do                  \
-+	  echo $$TEST; $$TEST;                          \
- 	done
- 
-+
- install:
-+	LIBRARY_TYPE=relocatable \
- 	gprinstall $(GPRINSTALL_FLAGS) -p -P gnat/spawn.gpr
-+
-+
- clean:
- 	gprclean -q -P gnat/spawn.gpr
--
diff --git a/PKGBUILD b/PKGBUILD
index 1c9d8f93c21f..951f43013eb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,48 @@
 # Maintainer: Rod Kay <rodakay5 at gmail dot com>
 
-pkgname=ada_spawn
 epoch=1
-pkgver=23.0.0
+
+pkgname=ada_spawn
+pkgver=24.0w
 pkgrel=1
 
-pkgdesc="A simple Ada API to start processes and communicate with them."
-url="https://github.com/AdaCore/spawn"
+pkgdesc='A simple Ada API to start processes and communicate with them.'
+url=https://github.com/AdaCore/spawn
 
-arch=('i686' 'x86_64')
-license=('Apache')
+arch=(i686 x86_64)
+license=(Apache)
 
-depends=('gtkada')
-makedepends=('gprbuild')
+depends=(gtkada)
+makedepends=(gprbuild)
 
-source=("https://github.com/AdaCore/spawn/archive/refs/tags/v$pkgver.tar.gz"
-        "Makefile.patch")
-sha256sums=(1487fef86433d1d06c5c3af3c012aac9eae8d2f4b7f8c1d2fdbe2be0b1770fa8
-            23f7f6c71c5bcdef0f2258becdd39f4d86bb3f742ff73d08610118b467264343)
-
-
-prepare()
-{
-   cd "$srcdir/spawn-$pkgver"
-   patch -Np0 -i ../Makefile.patch
-}
+source=(file:///opt/gnatstudio-sources/spawn-$pkgver-20230428-162D4-src.tar.gz)
+sha256sums=(11aaea8688f5b4f9e38cf38963b0a0eec553c16f1a21961a071be40f5dd12b39)
 
 
 build()
 {
-   cd "$srcdir/spawn-$pkgver"
+   cd $srcdir/spawn-$pkgver-20230428-162D4-src
 
-   export OS=unix
-   export SPAWN_WARN_ERRORS=false
    make all
+   
+   LIBRARY_TYPE=relocatable \
+   gprbuild -P gnat/spawn_glib.gpr
 }
 
 
 package()
 {
-   cd "$srcdir/spawn-$pkgver"
+   cd $srcdir/spawn-$pkgver-20230428-162D4-src
 
-   export OS=unix
-   DESTDIR=$pkgdir make install
+   DESTDIR=$pkgdir \
+   make install
 
    LIBRARY_TYPE=relocatable \
-   gprinstall -p --prefix="$pkgdir/usr" gnat/spawn_glib.gpr
+   gprinstall -p --prefix=$pkgdir/usr gnat/spawn_glib.gpr
 
    # Install the license.
+   #
    install -D -m644 \
-      "LICENSE"     \
-      "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
+      LICENSE.txt   \
+      $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
+}
\ No newline at end of file