Make pycharm professional not conflict with any other version of Pycharm

4 files changed, 55 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8daf78f9486..1c3cd1f165b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pycharm-professional
 	pkgdesc = Python IDE for Professional Developers. Professional Edition
-	pkgver = 2023.3.3
+	pkgver = 2023.3.4
 	pkgrel = 1
 	url = https://www.jetbrains.com/pycharm/
 	install = pycharm-professional_x86_64.install
@@ -11,14 +11,12 @@ pkgbase = pycharm-professional
 	depends = giflib
 	depends = glibc
 	depends = sh
-	depends = libxtst
-	depends = libxslt
-	depends = libxss
-	depends = nss
 	depends = python
-	depends = libdbusmenu-glib
 	depends = python-setuptools
 	depends = cython
+	depends = libdbusmenu-glib
+	depends = ttf-font
+	depends = fontconfig
 	optdepends = ipython: For enhanced interactive Python shell inside Pycharm
 	optdepends = openssh: For deployment and remote connections
 	optdepends = python-setuptools: Packages manager for Python, for project interpreter
@@ -29,25 +27,18 @@ pkgbase = pycharm-professional
 	optdepends = python-pytest: For support testing inside Pycharm
 	optdepends = python-tox: Python environments for testing tool
 	optdepends = jupyter-server: For Jupyter notebooks and apps
-	provides = pycharm
-	conflicts = pycharm
-	conflicts = pycharm-community-edition
-	conflicts = pycharm-community-jre
-	conflicts = pycharm-community-eap
-	conflicts = pycharm-eap
-	conflicts = pycharm-community-jre-aarch64
 	options = !strip
 	backup = opt/pycharm-professional/bin/pycharm64.vmoptions
 	backup = opt/pycharm-professional/bin/idea.properties
 	source = pycharm-professional.desktop
-	source = ltedit.desktop
-	sha256sums = a75264959b06a45ea0801729bc1688bfbd52da3c5fbf3d5b1ad9267860439291
-	sha256sums = 41f0e64dc7ec5ab85e7b0df1dc8237b56c94ccf9e4f2fa033eaadcc7756df3d3
-	source_x86_64 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.3.tar.gz
-	sha256sums_x86_64 = 29c4955410b2ea26f0cd0f44e02c8fe2b1b7dad075f0739652051faa6f84797b
-	source_x86_64_v3 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.3.tar.gz
-	sha256sums_x86_64_v3 = 29c4955410b2ea26f0cd0f44e02c8fe2b1b7dad075f0739652051faa6f84797b
-	source_aarch64 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.3-aarch64.tar.gz
-	sha256sums_aarch64 = bf0d8935b316ca2ce2b27a8ee98042f50a0b69ab1a7bb7bb1278941178d54fcf
+	source = ltedit-professional.desktop
+	sha256sums = 6ff245b42b475a5b97c359d97bc48d573c2988170fc195073c9187d5abe1c576
+	sha256sums = 21e9d192712fb537d9e5abccc54970becb347b32ad2be469a35b2585f45a9116
+	source_x86_64 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.4.tar.gz
+	sha256sums_x86_64 = 41367c6d92f69d33c0f375e4a058fef799be00d14437402371dc8ca3e5f1161e
+	source_x86_64_v3 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.4.tar.gz
+	sha256sums_x86_64_v3 = 41367c6d92f69d33c0f375e4a058fef799be00d14437402371dc8ca3e5f1161e
+	source_aarch64 = https://download-cf.jetbrains.com/python/pycharm-professional-2023.3.4-aarch64.tar.gz
+	sha256sums_aarch64 = 4800ba2575ba2b277785f9d3c9fce05d552c623b41db220f7dfdd886874b7042
 
 pkgname = pycharm-professional
diff --git a/PKGBUILD b/PKGBUILD
index 77f50513edb9..053ba18465f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,7 @@
 # Maintainer: XavierCLL <xavier.corredor.llano at gmail.com>
 # Maintainer for aarch64: Ethan Reece <aur at ethanreece dot com>
+# Contributor: Frederik Olesen
+# Contributor: Andrew Shark
 
 pkgname=pycharm-professional
 pkgver=2023.3.4
@@ -7,34 +9,46 @@ pkgrel=1
 pkgdesc="Python IDE for Professional Developers. Professional Edition"
 arch=('x86_64' 'x86_64_v3' 'aarch64')
 url='https://www.jetbrains.com/pycharm/'
-conflicts=('pycharm' 'pycharm-community-edition' 'pycharm-community-jre' 'pycharm-community-eap' 'pycharm-eap' 'pycharm-community-jre-aarch64')
-provides=('pycharm')
 license=('custom')
-backup=("opt/${pkgname}/bin/pycharm64.vmoptions"
-        "opt/${pkgname}/bin/idea.properties")
-depends=('giflib' 'glibc' 'sh' 'libxtst' 'libxslt' 'libxss' 'nss' 'python' 'libdbusmenu-glib' 'python-setuptools' 'cython')
 options=('!strip')
+backup=(
+    "opt/${pkgname}/bin/pycharm64.vmoptions"
+    "opt/${pkgname}/bin/idea.properties"
+)
+depends=(
+    giflib
+    glibc
+    sh
+    python
+    python-setuptools
+    cython
+    libdbusmenu-glib
+    ttf-font
+    fontconfig
+)
+
+source=("pycharm-professional.desktop" "ltedit-professional.desktop")
 source_x86_64=("https://download-cf.jetbrains.com/python/${pkgname}-${pkgver}.tar.gz")
 source_x86_64_v3=($source_x86_64)
 source_aarch64=("https://download-cf.jetbrains.com/python/${pkgname}-${pkgver}-aarch64.tar.gz")
-source=("pycharm-professional.desktop"
-        "ltedit.desktop")
-sha256sums=('a75264959b06a45ea0801729bc1688bfbd52da3c5fbf3d5b1ad9267860439291'
-            '41f0e64dc7ec5ab85e7b0df1dc8237b56c94ccf9e4f2fa033eaadcc7756df3d3')
+sha256sums=('6ff245b42b475a5b97c359d97bc48d573c2988170fc195073c9187d5abe1c576'
+            '21e9d192712fb537d9e5abccc54970becb347b32ad2be469a35b2585f45a9116')
 sha256sums_x86_64=('41367c6d92f69d33c0f375e4a058fef799be00d14437402371dc8ca3e5f1161e')
 sha256sums_x86_64_v3=('41367c6d92f69d33c0f375e4a058fef799be00d14437402371dc8ca3e5f1161e')
 sha256sums_aarch64=('4800ba2575ba2b277785f9d3c9fce05d552c623b41db220f7dfdd886874b7042')
 # makedepends=('python-setuptools' 'cython')
-optdepends=('ipython: For enhanced interactive Python shell inside Pycharm'
-            'openssh: For deployment and remote connections'
-            'python-setuptools: Packages manager for Python, for project interpreter'
-            'python-coverage: For support code coverage measurement'
-            'docker-machine: For support docker inside Pycharm'
-            'docker-compose: For support docker inside Pycharm'
-            'vagrant: For support virtualized development environments'
-            'python-pytest: For support testing inside Pycharm'
-            'python-tox: Python environments for testing tool'
-            'jupyter-server: For Jupyter notebooks and apps')
+optdepends=(
+    'ipython: For enhanced interactive Python shell inside Pycharm'
+    'openssh: For deployment and remote connections'
+    'python-setuptools: Packages manager for Python, for project interpreter'
+    'python-coverage: For support code coverage measurement'
+    'docker-machine: For support docker inside Pycharm'
+    'docker-compose: For support docker inside Pycharm'
+    'vagrant: For support virtualized development environments'
+    'python-pytest: For support testing inside Pycharm'
+    'python-tox: Python environments for testing tool'
+    'jupyter-server: For Jupyter notebooks and apps'
+)
             
 if [[ "${CARCH}" == "x86_64" ]]; then
     install=pycharm-professional_x86_64.install
@@ -57,16 +71,16 @@ package() {
     mv "pycharm-${pkgver}/"* "${pkgdir}/opt/${pkgname}/"
     install -dm 755 "${pkgdir}/usr/share/applications"
     install -Dm 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
-    install -Dm 644 ltedit.desktop "${pkgdir}/usr/share/applications/"
+    install -Dm 644 "ltedit-professional.desktop" "${pkgdir}/usr/share/applications/"
     install -dm 755 "${pkgdir}/usr/share/icons/hicolor/"{128x128,scalable}"/apps/"
-    install -Dm 644 "${pkgdir}/opt/${pkgname}/bin/pycharm.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/pycharm.png"
-    install -Dm 644 "${pkgdir}/opt/${pkgname}/bin/pycharm.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/pycharm.svg"
+    install -Dm 644 "${pkgdir}/opt/${pkgname}/bin/pycharm.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/pycharm-professional.png"
+    install -Dm 644 "${pkgdir}/opt/${pkgname}/bin/pycharm.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/pycharm-professional.svg"
 
     # issue https://youtrack.jetbrains.com/issue/IDEA-313202
     chmod 4755 "${pkgdir}/opt/pycharm-professional/jbr/lib/chrome-sandbox"
 
     # exec
     install -dm 755 "${pkgdir}/usr/bin/"
-    ln -s "/opt/${pkgname}/bin/pycharm.sh" "${pkgdir}/usr/bin/pycharm"
-    ln -s "/opt/${pkgname}/bin/ltedit.sh" "${pkgdir}/usr/bin/ltedit"
+    ln -s "/opt/${pkgname}/bin/pycharm.sh" "${pkgdir}/usr/bin/pycharm-professional"
+    ln -s "/opt/${pkgname}/bin/ltedit.sh" "${pkgdir}/usr/bin/ltedit-professional"
 }
diff --git a/ltedit.desktop b/ltedit-professional.desktop
index 7e240dddb8bc..1a6698f1ce9a 100644
--- a/ltedit.desktop
+++ b/ltedit-professional.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=Pycharm Light Edit
-Icon=pycharm
-Exec=ltedit %f
+Icon=pycharm-professional
+Exec=/usr/bin/ltedit-professional %f
 MimeType=text/x-python;application/x-ipynb+json
 NoDisplay=true
 Terminal=false
diff --git a/pycharm-professional.desktop b/pycharm-professional.desktop
index 8e885a5a5060..46264e411da8 100644
--- a/pycharm-professional.desktop
+++ b/pycharm-professional.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=PyCharm Professional Edition
-Icon=pycharm
+Icon=pycharm-professional
 Comment=Python IDE for Professional Developers.
-Exec=pycharm %f
+Exec=/usr/bin/pycharm-professional %f
 Terminal=false
 Categories=Development;IDE;Python;
 StartupNotify=true