New version.

4 files changed, 32 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3c076745319..926b221dd630 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnatstudio
 	pkgdesc = GNAT Programming Studio for Ada.
-	pkgver = 24.0w
-	pkgrel = 3
+	pkgver = 25.0w
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/AdaCore/gps
 	arch = i686
@@ -24,19 +24,19 @@ pkgbase = gnatstudio
 	depends = python-sphinx_rtd_theme
 	conflicts = gnat-gps
 	conflicts = gnatstudio-bin
-	source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/gnatstudio-24.0w-20230428-16588-src.tar.gz
+	source = https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources-2024/gnatstudio-25.0w-20240506-161C6-src.tar.gz
 	source = 0003-Honour-DESTDIR-in-installation-targets.patch
 	source = gs_utils.patch
-	source = patch-dap.gpr
 	source = os-utils.c-patch
 	source = building_executable_programs_with_gnat.rst
 	source = gps.desktop
-	sha256sums = ae17d963f063657fe665be243362eccb6b3f122fe846fe64dd1270775120fb52
+	source = rid_failing_test_for_gtkada_in_configure.ac-patch
+	sha256sums = 9c6251efc37f424ec650d92cea3023c6b782ea3dc6dc444653a2e474e932e730
 	sha256sums = 5607c451dbf63dba346eeb2ef602a86321d310bdfb6ef777870bb32761b596d5
 	sha256sums = 7f5196621ca8f1dfe15ada96af63b10d70a56727c103459864a0e3f6b510d182
-	sha256sums = b4701fa61cdd64f2fb689e68de06e209d2bb809fd5d98d81d9ccd7a77c6caff8
 	sha256sums = 6626d93c5d0016280a31411a3dcc5ec80fd1a69c85f4c48a1334ae3f950008b2
 	sha256sums = f29080c1d283929cedaa630df27d1688b2099ab5f82601fbf98028a528e935ae
 	sha256sums = e21894fc1a0fbc90c25b0c524969703d685f283adc09225744d9013de3b00533
+	sha256sums = 9d454434aecbc6bb6ce70985feabb97417291c831ae0ac4deec69a5b79fe722f
 
 pkgname = gnatstudio
diff --git a/PKGBUILD b/PKGBUILD
index 89144c7286c3..07cc9fb4ad06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=gnatstudio
 pkgdesc='GNAT Programming Studio for Ada.'
-pkgver=24.0w
-pkgrel=3
+pkgver=25.0w
+pkgrel=1
 epoch=1
 
 arch=(i686 x86_64)
@@ -29,35 +29,34 @@ depends=(clang
          python-sphinx_rtd_theme)
 
 makedepends=(gprbuild
-#             texlive-latexextra
              texlive-meta
              graphviz)
 
-source=(https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources/$pkgname-$pkgver-20230428-16588-src.tar.gz
+source=(https://github.com/charlie5/archlinux-gnatstudio-support/raw/main/gnatstudio-sources-2024/$pkgname-$pkgver-20240506-161C6-src.tar.gz
         0003-Honour-DESTDIR-in-installation-targets.patch
         gs_utils.patch
-        patch-dap.gpr
         os-utils.c-patch
         building_executable_programs_with_gnat.rst
-        gps.desktop)
+        gps.desktop
+        rid_failing_test_for_gtkada_in_configure.ac-patch)
 
-sha256sums=(ae17d963f063657fe665be243362eccb6b3f122fe846fe64dd1270775120fb52
+sha256sums=(9c6251efc37f424ec650d92cea3023c6b782ea3dc6dc444653a2e474e932e730
             5607c451dbf63dba346eeb2ef602a86321d310bdfb6ef777870bb32761b596d5
             7f5196621ca8f1dfe15ada96af63b10d70a56727c103459864a0e3f6b510d182
-            b4701fa61cdd64f2fb689e68de06e209d2bb809fd5d98d81d9ccd7a77c6caff8
             6626d93c5d0016280a31411a3dcc5ec80fd1a69c85f4c48a1334ae3f950008b2
             f29080c1d283929cedaa630df27d1688b2099ab5f82601fbf98028a528e935ae
-            e21894fc1a0fbc90c25b0c524969703d685f283adc09225744d9013de3b00533)
+            e21894fc1a0fbc90c25b0c524969703d685f283adc09225744d9013de3b00533
+            9d454434aecbc6bb6ce70985feabb97417291c831ae0ac4deec69a5b79fe722f)
 
 
 prepare()
 {
-   cd $srcdir/$pkgname-$pkgver-20230428-16588-src
-
+   cd $srcdir/gnatstudio-25.0w-20240506-161C6-src
+   
    patch -p1 < $srcdir/0003-Honour-DESTDIR-in-installation-targets.patch
    patch -p0 < $srcdir/gs_utils.patch
-   patch -p0 < $srcdir/patch-dap.gpr
    patch -p0 < $srcdir/os-utils.c-patch
+   patch -Np0 -i $srcdir/rid_failing_test_for_gtkada_in_configure.ac-patch
 
    cp $srcdir/building_executable_programs_with_gnat.rst gnat
 }
@@ -65,11 +64,12 @@ prepare()
 
 build() 
 {
-   cd $srcdir/$pkgname-$pkgver-20230428-16588-src
+   cd $srcdir/gnatstudio-25.0w-20240506-161C6-src
 
    export OS=unix
    export LC_ALL=C
    
+   autoconf
    ./configure --prefix=/usr
 
    # The release tarball contains a bunch of sphinx build artefacts.
@@ -98,8 +98,8 @@ build()
 
 package() 
 {
-   cd $srcdir/$pkgname-$pkgver-20230428-16588-src
-
+   cd $srcdir/gnatstudio-25.0w-20240506-161C6-src
+   
    export OS=unix
    
    make DESTDIR=$pkgdir         install
diff --git a/patch-dap.gpr b/patch-dap.gpr
deleted file mode 100644
index 6fb4a806dea9..000000000000
--- a/patch-dap.gpr
+++ /dev/null
@@ -1,11 +0,0 @@
---- dap/dap.gpr-orig	2022-10-07 00:20:05.000000000 +1100
-+++ dap/dap.gpr	2022-11-22 14:27:09.005758016 +1100
-@@ -7,7 +7,7 @@
- with "../views/views";
- with "../browsers/browsers";
- with "../gvd/gvd";
--with "../subprojects/VSS/gnat/vss_text";
-+with "vss_text";
- 
- project DAP is
- 
diff --git a/rid_failing_test_for_gtkada_in_configure.ac-patch b/rid_failing_test_for_gtkada_in_configure.ac-patch
new file mode 100644
index 000000000000..790abe1c1ffb
--- /dev/null
+++ b/rid_failing_test_for_gtkada_in_configure.ac-patch
@@ -0,0 +1,11 @@
+--- configure.ac	2024-04-04 19:50:22.578094500 +1100
++++ configure.ac-new	2024-05-21 02:12:56.432159762 +1000
+@@ -88,7 +88,7 @@
+ 
+ ######### checking for gtk
+ AM_PATH_GTK
+-AM_PATH_GTKADA(17.0,,AC_MSG_ERROR(Test for GtkAda failed. See the file 'INSTALL' for help.))
++#AM_PATH_GTKADA(17.0,,AC_MSG_ERROR(Test for GtkAda failed. See the file 'INSTALL' for help.))
+ AM_TO_GPR($GTK_GCC_FLAGS,   GTK_GCC_FLAGS_GPR)
+ 
+ ######### checking for python