upgpkg: code-transparent 1.54.2-1

upstream release

3 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a781933419e..b5ee006edfc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = code-transparent
 	pkgdesc = The Open Source build of Visual Studio Code (vscode) editor - with transparency enabled.
-	pkgver = 1.52.1
+	pkgver = 1.54.2
 	pkgrel = 1
 	url = https://github.com/microsoft/vscode
 	install = code-transparent.install
@@ -12,7 +12,7 @@ pkgbase = code-transparent
 	makedepends = python2
 	makedepends = yarn
 	makedepends = nodejs-lts-erbium
-	depends = electron9
+	depends = electron
 	depends = libsecret
 	depends = libx11
 	depends = libxkbfile
@@ -20,9 +20,9 @@ pkgbase = code-transparent
 	optdepends = bash-completion: Bash completions
 	optdepends = zsh-completions: ZSH completitons
 	optdepends = x11-ssh-askpass: SSH authentication
-	provides = code
+	provides = vscode
 	conflicts = code
-	source = code::git+https://github.com/microsoft/vscode.git#tag=1.52.1
+	source = code::git+https://github.com/microsoft/vscode.git#tag=1.54.2
 	source = code.js
 	source = code.sh
 	source = product_json.diff
@@ -32,7 +32,7 @@ pkgbase = code-transparent
 	sha512sums = 814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f
 	sha512sums = 0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1
 	sha512sums = b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7
-	sha512sums = ae7fc5d2d1851bf9353c3f531a4de05cc5b41496468e908776b7a17cf85e889c601b94499bd6165efb902578af1ebf37443a03881f98d8c6120cb4f8667d8fe7
+	sha512sums = 1ad5dd5090f33fe4f45f13ac7f20384869bb26f5e207933de8bfdea503386a331be9fd233205502aa742a7b90a3c15f8bd02a70a3c046c759c59d0d0b9f7f4bc
 	sha512sums = e662f0bf3f55a82ce9bce98f22c6be80ee83c1e2241d2eca596326478887ec6b73c7d0041903e17f35a424578ccc22674354931166dc7c7d7e76bb97135e009e
 
 pkgname = code-transparent
diff --git a/PKGBUILD b/PKGBUILD
index d8a30fe40e2b..a79ec2069d0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgdesc='The Open Source build of Visual Studio Code (vscode) editor - with tran
 #   - ?: 11 (not in repos)
 #   - erbium: 12
 # Important: Remember to check https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) for target electron version
-_electron=electron9
-pkgver=1.52.1
+_electron=electron
+pkgver=1.54.2
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
@@ -25,7 +25,7 @@ optdepends=('bash-completion: Bash completions'
             'x11-ssh-askpass: SSH authentication')
 makedepends=('git' 'gulp' 'npm' 'python2' 'yarn' 'nodejs-lts-erbium')
 conflicts=('code')
-provides=('code')
+provides=('vscode')
 install='code-transparent.install'
 source=("$_pkgname::git+$url.git#tag=$pkgver"
         'code.js'
@@ -37,7 +37,7 @@ sha512sums=('SKIP'
             '814c9554427183cd893a33cd2cbe91f6e0ea71921ef0717c86217b1d3058d265f9ff7a9ace3e7b76f122e60b7686475cf4d999e581a1845face3033afb9f745f'
             '0e75ee88274cbaf48c59ef6f363f6b8ac2ea83f8b17a61155008db773b709a1f0233754fa63a136ec0417313ba90a7eb17db000ec22a38ca8840d8ba6c47cab1'
             'b1aa0d7c5b3e3e8ba1172822d75ea38e90efc431b270e0b4ca9e45bf9c0be0f60922c8618969ef071b5b6dbd9ac9f030294f1bf49bcc28c187b46d113dca63a7'
-            'ae7fc5d2d1851bf9353c3f531a4de05cc5b41496468e908776b7a17cf85e889c601b94499bd6165efb902578af1ebf37443a03881f98d8c6120cb4f8667d8fe7'
+            '1ad5dd5090f33fe4f45f13ac7f20384869bb26f5e207933de8bfdea503386a331be9fd233205502aa742a7b90a3c15f8bd02a70a3c046c759c59d0d0b9f7f4bc'
             'e662f0bf3f55a82ce9bce98f22c6be80ee83c1e2241d2eca596326478887ec6b73c7d0041903e17f35a424578ccc22674354931166dc7c7d7e76bb97135e009e')
 
 # Even though we don't officially support other archs, let's
@@ -168,3 +168,4 @@ package() {
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/ThirdPartyNotices.txt "$pkgdir"/usr/share/licenses/$_pkgname/ThirdPartyNotices.txt
 }
+
diff --git a/transparent.diff b/transparent.diff
index be07c42fb336..3043379192d2 100644
--- a/transparent.diff
+++ b/transparent.diff
@@ -1,19 +1,20 @@
 diff --git a/src/main.js b/src/main.js
 --- a/src/main.js
 +++ b/src/main.js
-@@ -157,6 +157,9 @@ function configureCommandlineSwitchesSync(cliArgs) {
- 		}
- 	});
+@@ -157,6 +157,10 @@ 			}
+		}
+	});
  
 +	// enable transparent
 +	app.commandLine.appendSwitch('enable-transparent-visuals');
++	app.commandLine.appendSwitch('disable-gpu');
 +
  	// Support JS Flags
  	const jsFlags = getJSFlags(cliArgs);
  	if (jsFlags) {
-diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
---- a/src/vs/code/electron-main/window.ts
-+++ b/src/vs/code/electron-main/window.ts
+diff --git a/src/vs/platform/windows/electron-main/window.ts b/src/vs/platform/windows/electron-main/window.ts
+--- a/src/vs/platform/windows/electron-main/window.ts
++++ b/src/vs/platform/windows/electron-main/window.ts
 @@ -157,7 +157,8 @@					width: this.windowState.width,
  				height: this.windowState.height,
  				x: this.windowState.x,
@@ -28,7 +29,7 @@ diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
 --- a/src/vs/workbench/common/theme.ts	2020-04-21 11:28:02.140938188 +0800
 +++ b/src/vs/workbench/common/theme.ts	2020-04-21 11:36:36.133491755 +0800
 @@ -6,20 +6,24 @@
- import * as nls from 'vs/nls';
+ import { localize } from 'vs/nls';
  import { registerColor, editorBackground, contrastBorder, transparent, editorWidgetBackground, textLinkForeground, lighten, darken, focusBorder, activeContrastBorder, editorWidgetForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground } from 'vs/platform/theme/common/colorRegistry';
  import { IColorTheme } from 'vs/platform/theme/common/themeService';
 -import { Color } from 'vs/base/common/color';
@@ -54,7 +55,7 @@ diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
 +			light: '#F3F3F3',
 +			hc: '#000000'
 +		},
-+		nls.localize(
++		localize(
 +			'workbenchBackground',
 +			'Top-level background color. Not seen unless other elements have a transparent color.'
 +		)