Update to version '23.0.0'.

3 files changed, 54 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fde7ec947fd6..c465c57c3c2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = ada_spawn
 	pkgdesc = A simple Ada API to start processes and communicate with them.
-	pkgver = 22.0.0
+	pkgver = 23.0.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/spawn
 	arch = i686
 	arch = x86_64
-	license = GPL3
-	license = custom
+	license = Apache
 	makedepends = gprbuild
 	depends = gtkada
-	source = https://github.com/AdaCore/spawn/archive/refs/tags/v22.0.0.tar.gz
+	source = https://github.com/AdaCore/spawn/archive/refs/tags/v23.0.0.tar.gz
 	source = Makefile.patch
-	sha256sums = c1a02dac68dd84f18d4cacd4710310ae7d29b83f66a02dd8976d534f369cd769
-	sha256sums = fd4af51cd1eaf12040475425276eb4c5df17b46b948154c3babfae5d0710b105
+	sha256sums = 1487fef86433d1d06c5c3af3c012aac9eae8d2f4b7f8c1d2fdbe2be0b1770fa8
+	sha256sums = 23f7f6c71c5bcdef0f2258becdd39f4d86bb3f742ff73d08610118b467264343
 
 pkgname = ada_spawn
diff --git a/Makefile.patch b/Makefile.patch
index 32a905fb0c42..37d10d792929 100644
--- a/Makefile.patch
+++ b/Makefile.patch
@@ -1,30 +1,49 @@
-diff --git a/Makefile b/Makefile
-index 32b9c1d..736e964 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,8 +18,11 @@ ifneq ($(OS),Windows_NT)
+--- 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:
-+	export LIBRARY_TYPE=relocateable
++	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 \
-@@ -27,7 +30,13 @@ check:
+-	for TEST in ${SPAWN_TESTS}; do \
+-	  echo $$TEST; $$TEST; \
++	for TEST in ${SPAWN_TESTS}; do                  \
++	  echo $$TEST; $$TEST;                          \
  	done
  
++
  install:
-+	export LIBRARY_TYPE=relocateable
++	LIBRARY_TYPE=relocatable \
  	gprinstall $(GPRINSTALL_FLAGS) -p -P gnat/spawn.gpr
 +
-+install-glib:
-+	export LIBRARY_TYPE=relocateable
-+	gprinstall $(GPRINSTALL_FLAGS) -p -P gnat/spawn_glib.gpr
 +
  clean:
  	gprclean -q -P gnat/spawn.gpr
- 
+-
diff --git a/PKGBUILD b/PKGBUILD
index abec2269f62a..1c9d8f93c21f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,33 +2,31 @@
 
 pkgname=ada_spawn
 epoch=1
-pkgver=22.0.0
+pkgver=23.0.0
 pkgrel=1
 
 pkgdesc="A simple Ada API to start processes and communicate with them."
 url="https://github.com/AdaCore/spawn"
 
 arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
+license=('Apache')
 
-depends=('gtkada')           # 'namcap' says gtkada dependency is not needed, yet it is needed to supply the ada glib binding.
+depends=('gtkada')
 makedepends=('gprbuild')
 
-_name=spawn
-_version=2021-20210701-19A43-src
-_hash=28342768afab1e644a660b96051c04e5e9d3bcb0
-
-source=("https://github.com/AdaCore/spawn/archive/refs/tags/v22.0.0.tar.gz"
+source=("https://github.com/AdaCore/spawn/archive/refs/tags/v$pkgver.tar.gz"
         "Makefile.patch")
-sha256sums=(c1a02dac68dd84f18d4cacd4710310ae7d29b83f66a02dd8976d534f369cd769
-            fd4af51cd1eaf12040475425276eb4c5df17b46b948154c3babfae5d0710b105)
+sha256sums=(1487fef86433d1d06c5c3af3c012aac9eae8d2f4b7f8c1d2fdbe2be0b1770fa8
+            23f7f6c71c5bcdef0f2258becdd39f4d86bb3f742ff73d08610118b467264343)
+
 
 prepare()
 {
    cd "$srcdir/spawn-$pkgver"
-   patch -Np1 -i ../Makefile.patch
+   patch -Np0 -i ../Makefile.patch
 }
 
+
 build()
 {
    cd "$srcdir/spawn-$pkgver"
@@ -38,6 +36,7 @@ build()
    make all
 }
 
+
 package()
 {
    cd "$srcdir/spawn-$pkgver"
@@ -45,19 +44,11 @@ package()
    export OS=unix
    DESTDIR=$pkgdir make install
 
-   # Rid duplicated '.ali' files.
-   rm $pkgdir/usr/lib/spawn/spawn-environments.ali
-   rm $pkgdir/usr/lib/spawn/spawn-internal__posix.ali
-   
-   DESTDIR=$pkgdir make install-glib
- 
+   LIBRARY_TYPE=relocatable \
+   gprinstall -p --prefix="$pkgdir/usr" gnat/spawn_glib.gpr
+
    # Install the license.
-   install -D -m644     \
-      "COPYING3" \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING3"
-
-   # Install the custom license.
-   install -D -m644     \
-      "COPYING.RUNTIME" \
-      "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME"
-}
\ No newline at end of file
+   install -D -m644 \
+      "LICENSE"     \
+      "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}