[visual-studio-code-bin] Remove conflict with code

This commit is contained in:
D. Can Celasun
2021-03-04 20:28:26 +00:00
parent ed5b3310fd
commit e3a6200076
2 changed files with 2 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
pkgbase = visual-studio-code-bin pkgbase = visual-studio-code-bin
pkgdesc = Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version) pkgdesc = Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)
pkgver = 1.54.0 pkgver = 1.54.0
pkgrel = 1 pkgrel = 2
url = https://code.visualstudio.com/ url = https://code.visualstudio.com/
arch = x86_64 arch = x86_64
arch = i686 arch = i686
@@ -21,7 +21,6 @@ pkgbase = visual-studio-code-bin
optdepends = glib2: Needed for move to trash functionality optdepends = glib2: Needed for move to trash functionality
optdepends = libdbusmenu-glib: Needed for KDE global menu optdepends = libdbusmenu-glib: Needed for KDE global menu
provides = code provides = code
conflicts = code
source = visual-studio-code.desktop source = visual-studio-code.desktop
source = visual-studio-code-url-handler.desktop source = visual-studio-code-url-handler.desktop
sha256sums = 0deefcb638e06c35a52e7e9fb8e19b2dc393f01e5c1c122d2938cddeb22cf8de sha256sums = 0deefcb638e06c35a52e7e9fb8e19b2dc393f01e5c1c122d2938cddeb22cf8de

View File

@@ -3,13 +3,12 @@
pkgname=visual-studio-code-bin pkgname=visual-studio-code-bin
_pkgname=visual-studio-code _pkgname=visual-studio-code
pkgver=1.54.0 pkgver=1.54.0
pkgrel=1 pkgrel=2
pkgdesc="Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)" pkgdesc="Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)"
arch=('x86_64' 'i686' 'aarch64' 'armv7h') arch=('x86_64' 'i686' 'aarch64' 'armv7h')
url="https://code.visualstudio.com/" url="https://code.visualstudio.com/"
license=('custom: commercial') license=('custom: commercial')
provides=('code') provides=('code')
conflicts=('code')
# lsof: need for terminal splitting, see https://github.com/Microsoft/vscode/issues/62991 # lsof: need for terminal splitting, see https://github.com/Microsoft/vscode/issues/62991
depends=(libxkbfile gnupg gtk3 libsecret nss gcc-libs libnotify libxss glibc lsof) depends=(libxkbfile gnupg gtk3 libsecret nss gcc-libs libnotify libxss glibc lsof)
optdepends=('glib2: Needed for move to trash functionality' optdepends=('glib2: Needed for move to trash functionality'