Use 'gnatstudio-sources' directly.

2 files changed, 22 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93e56c6a4999..02333f102e17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,14 +9,8 @@ pkgbase = gprbuild-bootstrap
 	license = GPL3
 	license = custom
 	makedepends = gcc-ada
-	makedepends = gnatstudio-sources
 	depends = gcc-ada
-	depends = gnatstudio-sources
-	source = file:///opt/gnatstudio-sources/gprbuild-24.0w-20230324-1649D-src.tar.gz
-	source = file:///opt/gnatstudio-sources/xmlada-24.0w-20230324-1684A-src.tar.gz
-	source = file:///opt/gnatstudio-sources/gprconfig-kb-24.0w-20230324-16644-src.tar.gz
-	sha256sums = efeb12ab26ca687a000ca781f3bce0e4ec2d4efd62b996116f2f505e50239b4f
-	sha256sums = c243de68f3f7c0f5e8a23d24ab0725d038f4dd2b7798855a3b91b574e44e2dc1
-	sha256sums = 7de5388f05168fb32577556989f0bc0f4f4d615cbd6a79ad544127a090aba5f4
+	source = https://github.com/AdaCore/gnatstudio/releases/download/gnatstudio-cr-20230501/gnatstudio-sources-x86_64-linux.tar.gz
+	sha256sums = acacf5f971dd94dd08a464a05f4e02cf0f1fc5e81028bf7c13091ed08ad97218
 
 pkgname = gprbuild-bootstrap
diff --git a/PKGBUILD b/PKGBUILD
index 30deaaf6e2b4..54699dd7cfe3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,27 +4,21 @@
 # Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 # Contributor: Earnestly <zibeon AT googlemail.com>
 
-epoch=1
-
 pkgname=gprbuild-bootstrap
+pkgdesc="Static GPRbuild to bootstrap XML/Ada and GPRbuild itself."
 pkgver=24.0w
 pkgrel=1
-pkgdesc="Static GPRbuild to bootstrap XML/Ada and GPRbuild itself."
+epoch=1
 
 arch=(i686 x86_64)
 url=https://github.com/AdaCore/gprbuild
 license=(GPL3 custom)
 
-depends=(gcc-ada gnatstudio-sources)
-makedepends=(gcc-ada gnatstudio-sources)
+depends=(gcc-ada)
+makedepends=(gcc-ada)
 
-source=(file:///opt/gnatstudio-sources/gprbuild-$pkgver-20230324-1649D-src.tar.gz
-        file:///opt/gnatstudio-sources/xmlada-$pkgver-20230324-1684A-src.tar.gz
-        file:///opt/gnatstudio-sources/gprconfig-kb-$pkgver-20230324-16644-src.tar.gz)
-
-sha256sums=(efeb12ab26ca687a000ca781f3bce0e4ec2d4efd62b996116f2f505e50239b4f
-            c243de68f3f7c0f5e8a23d24ab0725d038f4dd2b7798855a3b91b574e44e2dc1
-            7de5388f05168fb32577556989f0bc0f4f4d615cbd6a79ad544127a090aba5f4)
+source=(https://github.com/AdaCore/gnatstudio/releases/download/gnatstudio-cr-20230501/gnatstudio-sources-x86_64-linux.tar.gz)
+sha256sums=(acacf5f971dd94dd08a464a05f4e02cf0f1fc5e81028bf7c13091ed08ad97218)
 
 _gprbuild_src=gprbuild-$pkgver-20230430-16222-src
 _gprconfig_kb_src=gprconfig-kb-$pkgver-20230428-16586-src
@@ -33,6 +27,20 @@ _xmlada_src=xmlada-$pkgver-20230428-16463-src
 
 prepare()
 {
+    cd $srcdir/gnatstudio-sources-x86_64-linux
+    
+    tar --extract                                             \
+        --file=gprbuild-$pkgver-20230324-1649D-src.tar.gz     \
+        --directory $srcdir
+
+    tar --extract                                             \
+        --file=xmlada-$pkgver-20230324-1684A-src.tar.gz       \
+        --directory $srcdir
+
+    tar --extract                                             \
+        --file=gprconfig-kb-$pkgver-20230324-16644-src.tar.gz \
+        --directory $srcdir
+
     cd $srcdir/$_gprbuild_src
 
     # GPRbuild hard-codes references to /usr/libexec, but ArchLinux packages