From bb6cf0e34510fc7ec32f2bd655f83fa42b0da92a Mon Sep 17 00:00:00 2001
From: xiota <aur@mentalfossa.com>
Date: Sat, 13 Sep 2025 03:37:19 +0000
Subject: [PATCH] 2025.09.0.387

---
 .SRCINFO | 14 +++++++++-----
 PKGBUILD | 28 ++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 043364a5ced8d..5a0449234aa97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = rstudio-desktop
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 2025.05.1.513
+	pkgver = 2025.09.0.387
 	pkgrel = 1
 	url = https://github.com/rstudio/rstudio
 	arch = x86_64
 	license = AGPL-3.0-only
-	makedepends = apache-ant
+	makedepends = java-environment=17
+	makedepends = ant
 	makedepends = boost
 	makedepends = cmake
 	makedepends = git
-	makedepends = java-environment
 	makedepends = libcups
 	makedepends = ninja
 	makedepends = nvm
@@ -43,14 +43,18 @@ pkgbase = rstudio-desktop
 	optdepends = subversion: for subversion support
 	provides = rstudio-desktop
 	conflicts = rstudio-desktop
+	noextract = gwt-2.12.2.tar.gz
 	options = !emptydirs
 	options = !debug
-	source = rstudio-2025.05.1.513-ab7c1bc.tar.gz::https://github.com/rstudio/rstudio/archive/ab7c1bc795c7dcff8f26215b832a3649a19fc16c.tar.gz
+	options = !strip
+	source = rstudio-2025.09.0.387-af5fc22.tar.gz::https://github.com/rstudio/rstudio/archive/af5fc22a687c0f462ee27c6afeeee38ee46507b9.tar.gz
 	source = quarto::git+https://github.com/quarto-dev/quarto.git#branch=release/rstudio-cranberry-hibiscus
+	source = https://rstudio-buildtools.s3.us-east-1.amazonaws.com/gwt/gwt-2.12.2.tar.gz
 	source = soci-4.0.3.tar.gz::https://github.com/SOCI/soci/archive/refs/tags/v4.0.3.tar.gz
-	source = https://github.com/github/copilot-language-server-release/releases/download/1.300.0/copilot-language-server-linux-x64-1.300.0.zip
+	source = https://github.com/github/copilot-language-server-release/releases/download/1.371.0/copilot-language-server-linux-x64-1.371.0.zip
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 27284accdad05ff8919a7ac6dc5f939a511a90842a35f6393517506d74809e76
 	sha256sums = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 07e8052156dfe..4e31aa11b388a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,19 +6,22 @@
 # https://github.com/rstudio/rstudio
 
 ## options
+: ${_gwt_version:=2.12.2}
+: ${_java_version:=17}
 : ${_nodeversion:=23}
 : ${_pandocver:=current}
 : ${_soci_version:=4.0.3}
+
 : ${_quarto_branch:=release/rstudio-cranberry-hibiscus}
 : ${_quarto:=false}
 
-: ${_copilot_version:=1.300.0}
+: ${_copilot_version:=1.371.0}
 
-: ${_commit:=ab7c1bc795c7dcff8f26215b832a3649a19fc16c}
+: ${_commit:=af5fc22a687c0f462ee27c6afeeee38ee46507b9}
 
 _pkgname="rstudio-desktop"
 pkgname="$_pkgname"
-pkgver=2025.05.1.513
+pkgver=2025.09.0.387
 pkgrel=1
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 url="https://github.com/rstudio/rstudio"
@@ -43,11 +46,11 @@ depends=(
   'r'
 )
 makedepends=(
-  'apache-ant'
+  "java-environment${_java_version:+=$_java_version}"
+  'ant'
   'boost'
   'cmake'
   'git'
-  'java-environment'
   'libcups'
   'ninja'
   'nvm'
@@ -75,7 +78,7 @@ fi
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 
-options=('!emptydirs' '!debug')
+options=('!emptydirs' '!debug' '!strip')
 
 _source_main() {
   _pkgsrc="rstudio-$_commit"
@@ -90,6 +93,13 @@ _source_main() {
   )
 }
 
+_source_gwt() {
+  _pkgext_gwt="tar.gz"
+  noextract+=("gwt-${_gwt_version}.$_pkgext_gwt")
+  source+=("https://rstudio-buildtools.s3.us-east-1.amazonaws.com/gwt/gwt-${_gwt_version}.$_pkgext_gwt")
+  sha256sums+=('27284accdad05ff8919a7ac6dc5f939a511a90842a35f6393517506d74809e76')
+}
+
 _source_soci() {
   local _pkgext_soci="tar.gz"
   source+=("soci-$_soci_version.$_pkgext_soci"::"https://github.com/SOCI/soci/archive/refs/tags/v$_soci_version.$_pkgext_soci")
@@ -129,6 +139,7 @@ _source_copilot() {
 }
 
 _source_main
+_source_gwt
 _source_soci
 _source_copilot
 
@@ -199,6 +210,11 @@ prepare() (
 
   # Panmirror is picked up now from Quarto repo
   ln -sfT "$srcdir/quarto" "$srcdir/$_pkgsrc/src/gwt/lib/quarto"
+
+  # GWT
+  mkdir -p common/gwtproject
+  cd common/gwtproject
+  bsdtar -xf "$srcdir/gwt-$_gwt_version.$_pkgext_gwt"
 )
 
 build() (