Update to 2023.2.1 and attempt to fix aarch64 build

2 files changed, 24 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aae82e1f5822..9da5a2773f1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = clion
 	pkgdesc = C/C++ IDE. Free 30-day trial.
-	pkgver = 2023.2
-	pkgrel = 2
+	pkgver = 2023.2.1
+	pkgrel = 1
 	epoch = 1
 	url = http://www.jetbrains.com/clion
 	arch = x86_64
 	arch = aarch64
 	license = custom
 	makedepends = rsync
-	noextract = CLion-2023.2.tar.gz
+	noextract = CLion-2023.2.1.tar.gz
+	noextract = CLion-2023.2.1-aarch64.tar.gz
 	options = !strip
 	source = jetbrains-clion.desktop
 	sha256sums = 13c9e7c7f6ef57ee573d133bf30a599390a99087a1f578caea62020e0f742587
-	source_x86_64 = https://download.jetbrains.com/cpp/CLion-2023.2.tar.gz
-	sha256sums_x86_64 = 45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819
-	source_aarch64 = https://download.jetbrains.com/cpp/CLion-2023.2-aarch64.tar.gz
-	sha256sums_aarch64 = 3088fe06e75af6f1bc2374843360a9b7242684802727aa3ce9900063d4dd9b4b
+	source_x86_64 = https://download.jetbrains.com/cpp/CLion-2023.2.1.tar.gz
+	sha256sums_x86_64 = 3dad580f2d4b40815c64da602e37d874bef03bdf50bd70ce63efb4005006cf19
+	source_aarch64 = https://download.jetbrains.com/cpp/CLion-2023.2.1-aarch64.tar.gz
+	sha256sums_aarch64 = 724a7940ab556c4cafcab2b4b7bce2081a38c60b0c6978e7bf1397dd012e0aa1
 
 pkgname = clion
 	depends = libdbusmenu-glib
diff --git a/PKGBUILD b/PKGBUILD
index f81f8f57ead4..3383458bf57b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ pkgbase=clion
 pkgname=(clion clion-jre clion-cmake clion-gdb clion-lldb)
 _pkgname=clion
 _dlname=CLion
-pkgver=2023.2
-pkgrel=2
+pkgver=2023.2.1
+pkgrel=1
 epoch=1
 pkgdesc="C/C++ IDE. Free 30-day trial."
 arch=('x86_64' 'aarch64')
@@ -22,15 +22,24 @@ source=("jetbrains-${pkgbase}.desktop")
 source_x86_64=("https://download.jetbrains.com/cpp/${_dlname}-${pkgver}.tar.gz")
 source_aarch64=("https://download.jetbrains.com/cpp/${_dlname}-${pkgver}-aarch64.tar.gz")
 sha256sums=('13c9e7c7f6ef57ee573d133bf30a599390a99087a1f578caea62020e0f742587')
-sha256sums_x86_64=('45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819')
-sha256sums_aarch64=('3088fe06e75af6f1bc2374843360a9b7242684802727aa3ce9900063d4dd9b4b')
-noextract=("${_dlname}-${pkgver}.tar.gz")
+sha256sums_x86_64=('3dad580f2d4b40815c64da602e37d874bef03bdf50bd70ce63efb4005006cf19')
+sha256sums_aarch64=('724a7940ab556c4cafcab2b4b7bce2081a38c60b0c6978e7bf1397dd012e0aa1')
+noextract=("${_dlname}-${pkgver}.tar.gz"
+           "${_dlname}-${pkgver}-aarch64.tar.gz")
 
 build() {
+    case "$CARCH" in
+    x86_64)
+        _tarname="${_dlname}-${pkgver}.tar.gz"
+        ;;
+    *)
+        _tarname="${_dlname}-${pkgver}-${CARCH}.tar.gz"
+        ;;
+    esac
+
     rm -rf "${srcdir}/opt"
     mkdir -p "${srcdir}/opt/${pkgbase}"
-    bsdtar --strip-components 1 -xf "${_dlname}-${pkgver}.tar.gz" \
-           -C "${srcdir}/opt/${pkgbase}"
+    bsdtar --strip-components 1 -xf "$_tarname" -C "${srcdir}/opt/${pkgbase}"
 }
 
 package_clion() {