Add additional optimisation for x86_64 CARCHs

Building things belongs in build() in the PKGBUILD and placing them in
the filesystem belongs in package() and removing package files belongs
to the package manager… none of these are the .install files, so
removing the .install files in favour of moving these things into the
PKGBUILD’s functions.

.SRCINFO

@@ -1,9 +1,8 @@
 pkgbase = pycharm-professional
 	pkgdesc = Python IDE for Professional Developers. Professional Edition
-	pkgver = 2024.3
+	pkgver = 2024.3.1
 	pkgrel = 1
 	url = https://www.jetbrains.com/pycharm/
-	install = pycharm-professional_x86_64.install
 	arch = x86_64
 	arch = x86_64_v3
 	arch = aarch64
@@ -34,11 +33,11 @@ pkgbase = pycharm-professional
 	source = ltedit-professional.desktop
 	sha256sums = 6ff245b42b475a5b97c359d97bc48d573c2988170fc195073c9187d5abe1c576
 	sha256sums = 21e9d192712fb537d9e5abccc54970becb347b32ad2be469a35b2585f45a9116
-	source_x86_64 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3.tar.gz
+	source_x86_64 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3.1.tar.gz
-	sha256sums_x86_64 = 142d7033f0548fd4f3e26bb2f8507f5d16048d9dfbe2f3a3de5246042e269ff7
+	sha256sums_x86_64 = 7bd9ea5c4eae1d1fc71cd538b1443c809c77c05fb8c793f3ebb5b1abd898a70f
-	source_x86_64_v3 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3.tar.gz
+	source_x86_64_v3 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3.1.tar.gz
-	sha256sums_x86_64_v3 = 142d7033f0548fd4f3e26bb2f8507f5d16048d9dfbe2f3a3de5246042e269ff7
+	sha256sums_x86_64_v3 = 7bd9ea5c4eae1d1fc71cd538b1443c809c77c05fb8c793f3ebb5b1abd898a70f
-	source_aarch64 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3-aarch64.tar.gz
+	source_aarch64 = https://download-cf.jetbrains.com/python/pycharm-professional-2024.3.1-aarch64.tar.gz
-	sha256sums_aarch64 = 7394972b57d04d3e1f147a9802661ee6600d6b0213576a551eac9b88939ebd6e
+	sha256sums_aarch64 = 2483768c690f6caa9c1c3e3ef948fbd88e2b1ebb6f77ebd3f6c80e12e406e6c9
 
 pkgname = pycharm-professional

PKGBUILD

@@ -4,8 +4,8 @@
 # Contributor: Andrew Shark
 
 pkgname=pycharm-professional
-pkgver=2024.3
+pkgver=2024.3.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Python IDE for Professional Developers. Professional Edition"
 arch=('x86_64' 'x86_64_v3' 'aarch64')
 url='https://www.jetbrains.com/pycharm/'
@@ -32,9 +32,9 @@ source_x86_64_v3=($source_x86_64)
 source_aarch64=("https://download-cf.jetbrains.com/python/${pkgname}-${pkgver}-aarch64.tar.gz")
 sha256sums=('6ff245b42b475a5b97c359d97bc48d573c2988170fc195073c9187d5abe1c576'
             '21e9d192712fb537d9e5abccc54970becb347b32ad2be469a35b2585f45a9116')
-sha256sums_x86_64=('142d7033f0548fd4f3e26bb2f8507f5d16048d9dfbe2f3a3de5246042e269ff7')
+sha256sums_x86_64=('7bd9ea5c4eae1d1fc71cd538b1443c809c77c05fb8c793f3ebb5b1abd898a70f')
-sha256sums_x86_64_v3=('142d7033f0548fd4f3e26bb2f8507f5d16048d9dfbe2f3a3de5246042e269ff7')
+sha256sums_x86_64_v3=('7bd9ea5c4eae1d1fc71cd538b1443c809c77c05fb8c793f3ebb5b1abd898a70f')
-sha256sums_aarch64=('7394972b57d04d3e1f147a9802661ee6600d6b0213576a551eac9b88939ebd6e')
+sha256sums_aarch64=('2483768c690f6caa9c1c3e3ef948fbd88e2b1ebb6f77ebd3f6c80e12e406e6c9')
 # makedepends=('python-setuptools' 'cython')
 optdepends=(
     'ipython: For enhanced interactive Python shell inside Pycharm'
@@ -48,23 +48,39 @@ optdepends=(
     'python-tox: Python environments for testing tool'
     'jupyter-server: For Jupyter notebooks and apps'
 )
-            
+
-if [[ "${CARCH}" == "x86_64" ]] ||  [[ "${CARCH}" == "x86_64_v3" ]] ; then
-    install=pycharm-professional_x86_64.install
-elif [ "${CARCH}" == "aarch64" ]; then
-    install=pycharm-professional_aarch64.install
-fi
-            
 prepare() {
     # clean up for PyDev debugger
     find pycharm-${pkgver}/plugins/python-ce/helpers/pydev/ \( -name *.so -o -name *.pyd -o -name *.dll \) -delete
 }
 
+build(){
+    cd "pycharm-${pkgver}"
+    echo ":: Building Cython speed-ups"
+    # compile PyDev debugger used by PyCharm to speedup debugging
+    python ./plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace --force-cython
+
+    _gccarch='-m64'
+    if [ "${CARCH}" == "aarch64" ]; then
+        _gccarch='-march=armv8-a+crypto'
+    elif [[ "${CARCH}" =~ ^x86_64(|_v[0-9]+)$ ]]; then
+        _gccarch="-march=${CARCH//_/-}"
+    fi
+
+    # for attach debugger
+    pushd ./plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac
+    g++ $_gccarch -shared -o ../attach_linux_amd64.so -fPIC -nostartfiles attach.cpp
+    popd
+
+    rm -rf ./plugins/python-ce/helpers/pydev/build
+    echo ":: Cython speed-ups done"
+}
+
 package() {
     # licenses
     install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}/"
     install -m 644 "pycharm-${pkgver}/license/"* "${pkgdir}/usr/share/licenses/${pkgname}/"
-    
+
     # base
     install -dm 755 "${pkgdir}/opt/${pkgname}"
     mv "pycharm-${pkgver}/"* "${pkgdir}/opt/${pkgname}/"

pycharm-professional_aarch64.install

@@ -1,21 +0,0 @@
-post_install() {
-    echo ":: Building Cython speed-ups" 
-    # compile PyDev debugger used by PyCharm to speedup debugging
-    python /opt/pycharm-professional/plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace --force-cython
-    
-    # for attach debugger
-    pushd /opt/pycharm-professional/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac
-    g++ -march=armv8-a+crypto -shared -o ../attach_linux_amd64.so -fPIC -nostartfiles attach.cpp
-    popd
-    
-    rm -rf /opt/pycharm-professional/plugins/python-ce/helpers/pydev/build
-    echo ":: Cython speed-ups done" 
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    rm -rf /opt/pycharm-professional
-}

pycharm-professional_x86_64.install

@@ -1,21 +0,0 @@
-post_install() {
-    echo ":: Building Cython speed-ups" 
-    # compile PyDev debugger used by PyCharm to speedup debugging
-    python /opt/pycharm-professional/plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace --force-cython
-    
-    # for attach debugger
-    pushd /opt/pycharm-professional/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/linux_and_mac
-    g++ -m64 -shared -o ../attach_linux_amd64.so -fPIC -nostartfiles attach.cpp
-    popd
-    
-    rm -rf /opt/pycharm-professional/plugins/python-ce/helpers/pydev/build
-    echo ":: Cython speed-ups done" 
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    rm -rf /opt/pycharm-professional
-}