Update to version '23.0.0'.

3 files changed, 22 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a037ba16e805..57641bf48567 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnatcoll-bindings
 	pkgdesc = GNAT Components Collection - Language and library bindings
-	pkgver = 22.0.0
-	pkgrel = 2
+	pkgver = 23.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/gnatcoll-bindings
 	arch = i686
@@ -13,12 +13,10 @@ pkgbase = gnatcoll-bindings
 	makedepends = gnatcoll-core
 	makedepends = libiconv
 	makedepends = syslog-ng
-	source = gnatcoll-bindings-22.0.0.tar.gz::https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz
-	source = 0001-fix-omp-read-version-information-file-in-text-mode.patch
+	source = gnatcoll-bindings-23.0.0.tar.gz::https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v23.0.0.tar.gz
 	source = 0002-fix-python-don-t-cache-prefix-during-install.patch
-	sha1sums = d1d3b80331dd097bb4e07289d53cd33fad247794
-	sha1sums = ca00377ecc3e05e5b89f947e0806631fd4e6b48c
-	sha1sums = 575d5d17bcf3983bea31bd75a32035b5005ab805
+	sha256sums = d51a7d1d35b2689feb6b05568702c4a22226538902ffd658e6f98a5d69d7bd51
+	sha256sums = 0655801612e6b69a81d240e6fff71262c7db73c4708766e24627c1329730c345
 
 pkgname = gnatcoll-gmp
 	pkgdesc = GNAT Components Collection - Bindings to GMP
diff --git a/0001-fix-omp-read-version-information-file-in-text-mode.patch b/0001-fix-omp-read-version-information-file-in-text-mode.patch
deleted file mode 100644
index 396daca845d9..000000000000
--- a/0001-fix-omp-read-version-information-file-in-text-mode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c91b970f601178ac7edaf620a9daddfd6aad8afe Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Sun, 15 May 2022 11:15:01 +0200
-Subject: [PATCH 1/2] fix(omp): read version information file in text mode
-
-This was already fixed for the other bindings in
-5e9aa4d3d4d3f476ab32fa10a08f28a56495e8f4, but omp was missed.
----
- omp/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/omp/setup.py b/omp/setup.py
-index 942ab1f5..5281398e 100755
---- a/omp/setup.py
-+++ b/omp/setup.py
-@@ -25,7 +25,7 @@ class GNATCollOMP(SetupApp):
- 
-         # Set library version
-         with open(os.path.join(config.source_dir, '..',
--                               'version_information'), 'rb') as fd:
-+                               'version_information'), 'r') as fd:
-             version = fd.read().strip()
-         config.set_data('GNATCOLL_VERSION', version, sub='gprbuild')
- 
--- 
-2.36.1
-
diff --git a/PKGBUILD b/PKGBUILD
index a0d4acd62dbc..3232239b21b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,14 @@ pkgname=(
     gnatcoll-iconv
     gnatcoll-lzma
     gnatcoll-omp
-#    gnatcoll-python2
     gnatcoll-python
     gnatcoll-readline
     gnatcoll-syslog
     gnatcoll-zlib
 )
 epoch=1
-pkgver=22.0.0
-pkgrel=2
+pkgver=23.0.0
+pkgrel=1
 
 pkgdesc='GNAT Components Collection - Language and library bindings'
 url='https://github.com/AdaCore/gnatcoll-bindings'
@@ -24,34 +23,31 @@ license=('GPL3' 'custom')
 
 makedepends=('python' 'gprbuild' 'gnatcoll-core' 'libiconv' 'syslog-ng')
 
-source=(
-    "$pkgbase-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
-    "0001-fix-omp-read-version-information-file-in-text-mode.patch"
-    "0002-fix-python-don-t-cache-prefix-during-install.patch"
-)
-sha1sums=('d1d3b80331dd097bb4e07289d53cd33fad247794'
-          'ca00377ecc3e05e5b89f947e0806631fd4e6b48c'
-          '575d5d17bcf3983bea31bd75a32035b5005ab805')
+source=("$pkgbase-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
+        "0002-fix-python-don-t-cache-prefix-during-install.patch")
+
+sha256sums=('d51a7d1d35b2689feb6b05568702c4a22226538902ffd658e6f98a5d69d7bd51'
+            '0655801612e6b69a81d240e6fff71262c7db73c4708766e24627c1329730c345')
+
+_source_dir="$pkgbase-$pkgver"
+
 
-_source_dir="gnatcoll-bindings-22.0.0"
+prepare()
+{
+    cd "$srcdir/$_source_dir"
+    patch -p1 < "$srcdir/0002-fix-python-don-t-cache-prefix-during-install.patch"
+}
 
 build()
 {
+    cd "$srcdir/$_source_dir"
+   
     ADA_FLAGS="$CFLAGS"
     ADA_FLAGS="${ADA_FLAGS//-Wformat}"
     ADA_FLAGS="${ADA_FLAGS//-Werror=format-security}"
 
    _gpr_opts="-R -cargs $ADA_FLAGS -fPIC -largs $LDFLAGS"
 
-    cd "$srcdir/$_source_dir"
-
-    patch -p1 < "$srcdir/0001-fix-omp-read-version-information-file-in-text-mode.patch"
-    patch -p1 < "$srcdir/0002-fix-python-don-t-cache-prefix-during-install.patch"
-
-#    cd "$srcdir/$_source_dir/python"
-#    # --gpr-opts reads all remaining arguments, so no quotes
-#    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
-
     cd "$srcdir/$_source_dir/python3"
     python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
@@ -92,19 +88,6 @@ _install_license()
        "$pkgdir/usr/share/licenses/$pkgname/COPYING.RUNTIME"
 }
 
-#package_gnatcoll-python2()
-#{
-#    pkgdesc='GNAT Components Collection - Interface to the python 2 interpreter.'
-#    depends=('python2' 'gnatcoll-core')
-#    provides=('gnatcoll-python')
-#    replaces=('gnatcoll-python')
-#
-#    cd "$srcdir/$_source_dir/python"
-#    python setup.py install --prefix="$pkgdir/usr"
-#
-#    _install_license
-#}
-
 package_gnatcoll-python()
 {
     pkgdesc='GNAT Components Collection - Interface to the python 3 interpreter.'