Update to version '23.0.0'.

3 files changed, 29 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b393df877e3b..485d59cc558c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xmlada
 	pkgdesc = An XML parser for Ada95
-	pkgver = 22.0.0
-	pkgrel = 2
+	pkgver = 23.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/xmlada/
 	arch = i686
@@ -11,9 +11,9 @@ pkgbase = xmlada
 	makedepends = gprbuild-bootstrap
 	depends = gcc-ada
 	conflicts = xmlada-git
-	source = xmlada-22.0.0.tar.gz::https://github.com/AdaCore/xmlada//archive/v22.0.0.tar.gz
+	source = xmlada-23.0.0.tar.gz::https://github.com/AdaCore/xmlada//archive/v23.0.0.tar.gz
 	source = expose-cargs-and-largs-makefile.patch
-	sha256sums = 853ed895defd395c0bc96c23a50812168b656b31befc1336f45c5541f2bec06d
-	sha256sums = 8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989
+	sha256sums = 66245a68f2e391c8dc8dc50d6d5f109eb3b371e261d095d2002dff3927dd5253
+	sha256sums = 7543e5fa8f2b0b400b937b0b3bb27b46b263a3cd7b17f00f6f9c6b3905729610
 
 pkgname = xmlada
diff --git a/PKGBUILD b/PKGBUILD
index 10415006cb2e..6d8510bcf8d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=xmlada
 epoch=1
-pkgver=22.0.0
-pkgrel=2
+pkgver=23.0.0
+pkgrel=1
 pkgdesc="An XML parser for Ada95"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/xmlada/"
@@ -15,21 +15,23 @@ depends=('gcc-ada')
 makedepends=('gprbuild-bootstrap')
 conflicts=("$pkgname-git")
 
-source=(
-	"$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-	'expose-cargs-and-largs-makefile.patch'
-)
-sha256sums=('853ed895defd395c0bc96c23a50812168b656b31befc1336f45c5541f2bec06d'
-            '8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+	'expose-cargs-and-largs-makefile.patch')
 
-prepare() {
+sha256sums=('66245a68f2e391c8dc8dc50d6d5f109eb3b371e261d095d2002dff3927dd5253'
+            '7543e5fa8f2b0b400b937b0b3bb27b46b263a3cd7b17f00f6f9c6b3905729610')
+
+prepare()
+{
     cd "$srcdir/$pkgname-$pkgver"
 
-    patch -Np1 -i "$srcdir/expose-cargs-and-largs-makefile.patch"
+    patch -Np0 -i "$srcdir/expose-cargs-and-largs-makefile.patch"
 }
 
-build() {
+build()
+{
     cd "$srcdir/$pkgname-$pkgver"
+
     ./configure --prefix=/usr --libexecdir=/lib --enable-shared
 
     # Rid flags not used by Ada.
@@ -40,7 +42,8 @@ build() {
     make -j1 GPRBUILD_OPTIONS=-R
 }
 
-package() {
+package()
+{
     cd "$srcdir/$pkgname-$pkgver"
 
     # Make one install at a time to avoid GPRinstall reading/writing to
diff --git a/expose-cargs-and-largs-makefile.patch b/expose-cargs-and-largs-makefile.patch
index ee2662a64387..8cbe752d6cab 100644
--- a/expose-cargs-and-largs-makefile.patch
+++ b/expose-cargs-and-largs-makefile.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index c6327d2..3355762 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -51,14 +51,22 @@ all: static
+--- Makefile.in-orig	2022-09-28 16:33:19.000000000 +1000
++++ Makefile.in	2022-11-15 21:15:27.002332097 +1100
+@@ -68,14 +68,22 @@
  install: install-clean install-static
  endif
  
@@ -15,16 +13,16 @@ index c6327d2..3355762 100644
 +endif
 +
  static:
--	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+-	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
  
  shared relocatable:
--	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+-	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
  
  static-pic:
--	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr $(CARGS) $(LARGS)
+-	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA}
++	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr ${GPROPTS_EXTRA} $(CARGS) $(LARGS)
  
  # Rebuild the tests (and not the XML/Ada code itself)
  test: force