Use python 3

4 files changed, 144 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c22770ad9790..9ac3fb81d139 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,29 +3,26 @@ pkgbase = gnatcoll-bindings
 	pkgver = 22.0.0
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/AdaCore/gnatcoll-bindings/
+	url = https://github.com/AdaCore/gnatcoll-bindings
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	license = custom
-	makedepends = python2
+	makedepends = python
 	makedepends = gprbuild
 	makedepends = gnatcoll-core
 	makedepends = libiconv
 	makedepends = syslog-ng
-	source = https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz
+	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 = 0002-fix-python-don-t-cache-prefix-during-install.patch
 	sha1sums = d1d3b80331dd097bb4e07289d53cd33fad247794
+	sha1sums = ca00377ecc3e05e5b89f947e0806631fd4e6b48c
+	sha1sums = 575d5d17bcf3983bea31bd75a32035b5005ab805
 
-pkgname = gnatcoll-python2
-	pkgdesc = GNAT Components Collection - Interface to the python 2 interpreter.
-	depends = python2
-	depends = gnatcoll-core
-	provides = gnatcoll-python
-	replaces = gnatcoll-python
-
-pkgname = gnatcoll-readline
-	pkgdesc = GNAT Components Collection - Bindings to readline
-	depends = readline
+pkgname = gnatcoll-gmp
+	pkgdesc = GNAT Components Collection - Bindings to GMP
+	depends = gmp
 	depends = gnatcoll-core
 
 pkgname = gnatcoll-iconv
@@ -33,11 +30,6 @@ pkgname = gnatcoll-iconv
 	depends = libiconv
 	depends = gnatcoll-core
 
-pkgname = gnatcoll-gmp
-	pkgdesc = GNAT Components Collection - Bindings to GMP
-	depends = gmp
-	depends = gnatcoll-core
-
 pkgname = gnatcoll-lzma
 	pkgdesc = GNAT Components Collection - Bindings to LZMA
 	depends = xz
@@ -47,6 +39,18 @@ pkgname = gnatcoll-omp
 	pkgdesc = GNAT Components Collection - Bindings to OpenMP
 	depends = gnatcoll-core
 
+pkgname = gnatcoll-python2
+	pkgdesc = GNAT Components Collection - Interface to the python 2 interpreter.
+	depends = python2
+	depends = gnatcoll-core
+	provides = gnatcoll-python
+	replaces = gnatcoll-python
+
+pkgname = gnatcoll-readline
+	pkgdesc = GNAT Components Collection - Bindings to readline
+	depends = readline
+	depends = gnatcoll-core
+
 pkgname = gnatcoll-syslog
 	pkgdesc = GNAT Components Collection - Bindings to the Syslog the system logger on Unix systems.
 	depends = syslog-ng
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
new file mode 100644
index 000000000000..396daca845d9
--- /dev/null
+++ b/0001-fix-omp-read-version-information-file-in-text-mode.patch
@@ -0,0 +1,27 @@
+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/0002-fix-python-don-t-cache-prefix-during-install.patch b/0002-fix-python-don-t-cache-prefix-during-install.patch
new file mode 100644
index 000000000000..48f876fc61b1
--- /dev/null
+++ b/0002-fix-python-don-t-cache-prefix-during-install.patch
@@ -0,0 +1,44 @@
+From 6f69e67914ec7ce2150588de9892c9787554ef6f Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+Date: Sun, 15 May 2022 11:36:11 +0200
+Subject: [PATCH 2/2] fix(python): don't cache --prefix during install
+
+The build system is missing a DESTDIR mechanic, so --prefix has to be
+hacked into serving both roles, which only works if the --prefix passed
+to install is actually used instead of the cached value from build.
+---
+ python/setup.py  | 3 +++
+ python3/setup.py | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/python/setup.py b/python/setup.py
+index 18a29157..7c191ed9 100755
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -195,6 +195,9 @@ class GNATCollPython(SetupApp):
+     def install(self, args):
+         config = Config()
+         has_static_python = "GNATCOLL_PYTHON_STATIC_LIB" in config.data["gprbuild"]
++        if args.prefix is not None:
++            config.set_data('prefix', args.prefix)
++
+         if has_static_python:
+             python_la = config.data["gprbuild"]["GNATCOLL_PYTHON_STATIC_LIB"]
+             prefix = config.data["prefix"]
+diff --git a/python3/setup.py b/python3/setup.py
+index 18a29157..7c191ed9 100755
+--- a/python3/setup.py
++++ b/python3/setup.py
+@@ -195,6 +195,9 @@ class GNATCollPython(SetupApp):
+     def install(self, args):
+         config = Config()
+         has_static_python = "GNATCOLL_PYTHON_STATIC_LIB" in config.data["gprbuild"]
++        if args.prefix is not None:
++            config.set_data('prefix', args.prefix)
++
+         if has_static_python:
+             python_la = config.data["gprbuild"]["GNATCOLL_PYTHON_STATIC_LIB"]
+             prefix = config.data["prefix"]
+-- 
+2.36.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 3e75c5e1ab0e..7073f68a67e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,38 @@
 # Maintainer: Rod Kay <rodakay5 at gmail dot com>
 
 pkgbase=gnatcoll-bindings
-pkgname=(gnatcoll-python2 gnatcoll-readline gnatcoll-iconv  gnatcoll-gmp 
-         gnatcoll-lzma    gnatcoll-omp      gnatcoll-syslog gnatcoll-zlib)
+pkgname=(
+    gnatcoll-gmp
+    gnatcoll-iconv
+    gnatcoll-lzma
+    gnatcoll-omp
+    gnatcoll-python2
+    gnatcoll-readline
+    gnatcoll-syslog
+    gnatcoll-zlib
+)
 epoch=1
 pkgver=22.0.0
 pkgrel=1
 
 pkgdesc='GNAT Components Collection - Language and library bindings'
-url='https://github.com/AdaCore/gnatcoll-bindings/'
+url='https://github.com/AdaCore/gnatcoll-bindings'
 arch=('i686' 'x86_64')
 license=('GPL3' 'custom')
 
-makedepends=('python2' 'gprbuild' 'gnatcoll-core' 'libiconv' 'syslog-ng')
+makedepends=('python' 'gprbuild' 'gnatcoll-core' 'libiconv' 'syslog-ng')
 
-source=("https://github.com/AdaCore/gnatcoll-bindings/archive/refs/tags/v22.0.0.tar.gz")
-sha1sums=("d1d3b80331dd097bb4e07289d53cd33fad247794")
+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_dir="gnatcoll-bindings-22.0.0"
 
-
 build()
 {
     ADA_FLAGS="$CFLAGS"
@@ -29,30 +42,35 @@ build()
 
    _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
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/readline"
-    python2 setup.py build --prefix=/usr --accept-gpl --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --accept-gpl --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/iconv"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/gmp"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/lzma"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/omp"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/syslog"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 
     cd "$srcdir/$_source_dir/zlib"
-    python2 setup.py build --prefix=/usr --gpr-opts $_gpr_opts
+    python setup.py build --prefix=/usr --gpr-opts $_gpr_opts
 }
 
 _install_license()
@@ -78,12 +96,9 @@ package_gnatcoll-python2()
     replaces=('gnatcoll-python')
 
     cd "$srcdir/$_source_dir/python"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    GNATCOLL_VERSION=0.0     \
-    LIBRARY_TYPE=relocatable \
-    gprinstall -P gnatcoll_python -p --prefix=$pkgdir/usr
-
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-readline()
@@ -92,9 +107,9 @@ package_gnatcoll-readline()
     depends=('readline' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/readline"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-iconv()
@@ -103,9 +118,9 @@ package_gnatcoll-iconv()
     depends=('libiconv' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/iconv"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-gmp()
@@ -114,9 +129,9 @@ package_gnatcoll-gmp()
     depends=('gmp' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/gmp"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-lzma()
@@ -125,9 +140,9 @@ package_gnatcoll-lzma()
     depends=('xz' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/lzma"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-omp()
@@ -136,9 +151,9 @@ package_gnatcoll-omp()
     depends=('gnatcoll-core')
 
     cd "$srcdir/$_source_dir/omp"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-syslog()
@@ -147,9 +162,9 @@ package_gnatcoll-syslog()
     depends=('syslog-ng' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/syslog"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
 
 package_gnatcoll-zlib()
@@ -158,7 +173,9 @@ package_gnatcoll-zlib()
     depends=('zlib' 'gnatcoll-core')
 
     cd "$srcdir/$_source_dir/zlib"
-    python2 setup.py install --prefix="$pkgdir/usr"
+    python setup.py install --prefix="$pkgdir/usr"
 
-    _install_license    
+    _install_license
 }
+
+# vim: set et ts=4: