From 8635fbafbff8556f3ec16e1420a1f6785093b484 Mon Sep 17 00:00:00 2001 From: TheDevKiller Date: Sat, 27 Apr 2019 22:50:48 +0200 Subject: [PATCH] Try to fix patch --- app-editors/vscode/Manifest | 2 +- app-editors/vscode/files/gentoo-vscode.patch | 47 -------------------- app-editors/vscode/vscode-1.33.1.ebuild | 8 +--- 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 app-editors/vscode/files/gentoo-vscode.patch diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest index 11c7334..347d8b1 100644 --- a/app-editors/vscode/Manifest +++ b/app-editors/vscode/Manifest @@ -1,3 +1,3 @@ AUX gentoo-vscode.patch 1451 BLAKE2B c724cec42c7739823c84ed6dacd44b7c023382bc327681031f49d8e019cbdb5b2ffed88b6ad6ddb0a54c8b37107f8ab9c6ceb7f43ce7892f776b2abb5c3eb01a SHA512 5aac13bfd79355de3d8a4c1dd5ec64083f71ff052ab362fcdebf722e2e8fc283080ae79d4537706f3dc832b7e26c1302e221e41fbe2ae26d6ca58bf7c2ac0de1 DIST 1.33.1.tar.gz 8704440 BLAKE2B de46124000cb2bdef2221f586a6e9b82dd7ee90bc1c3b1150614efbbc74d891aa72746b6986b49e359e920c8298aabc86f96174159f9bc74dcd5796eb342d994 SHA512 dda0932589cb80ea057c8d05d20e81a085d070fc995c71d2f24d641bbd00de535799047b289ddf774b3880c1b05a252ffd68580dba87265df9ddbdb3f737a9cf -EBUILD vscode-1.33.1.ebuild 1021 BLAKE2B 5649cd3cce166e843945c5ce5accfec9b83a739e85923515a3f007536c4ca072dd1fc6c97c6d5a0715fd038b51ff6df250136e7393fb2946253b3b4db4da6127 SHA512 447649a185bea65df8de40852b9799a74a52f624fe9bf544540f617842aba944eadb7fc17d50043f467917b63c9d445ee6498f0669dd701a714cf22a4e98398a +EBUILD vscode-1.33.1.ebuild 1024 BLAKE2B e020d9fe1e055df292a96cd62e7ec2b602f6718e3b4ab227a507669087f86e36603764d0bd7214a6fadcb066a2dd41aaf3a2e775153ec3d2ddcabfd7c62ca0d2 SHA512 bf72cb2f43ca3971382f86bb640611b0d8198da59683e459d7b9887cc713c75f18575f5eb8e6eccd246e4355e322c8db17c3bc1fcaad54f4e452e6080fb56eb5 diff --git a/app-editors/vscode/files/gentoo-vscode.patch b/app-editors/vscode/files/gentoo-vscode.patch deleted file mode 100644 index 70235c1..0000000 --- a/app-editors/vscode/files/gentoo-vscode.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/product.json b/product.json -index 4103352af8..3d48bbee02 100644 ---- a/product.json -+++ b/product.json -@@ -22,5 +22,10 @@ - "urlProtocol": "code-oss", - "extensionAllowedProposedApi": [ - "ms-vscode.references-view" -- ] --} -\ No newline at end of file -+ ], -+ "extensionsGallery": { -+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", -+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", -+ "itemUrl": "https://marketplace.visualstudio.com/items" -+ } -+} -diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop -index dbc7818cec..fc2044fa18 100644 ---- a/resources/linux/code.desktop -+++ b/resources/linux/code.desktop -@@ -1,12 +1,12 @@ - [Desktop Entry] --Name=@@NAME_LONG@@ -+Name=Code - Git - Comment=Code Editing. Redefined. - GenericName=Text Editor --Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F --Icon=@@ICON@@ -+Exec=/usr/share/code/code --unity-launch %F -+Icon=/usr/share/code/resources/linux/code.png - Type=Application - StartupNotify=false --StartupWMClass=@@NAME_SHORT@@ -+StartupWMClass=Code - Categories=Utility;TextEditor;Development;IDE; - MimeType=text/plain;inode/directory; - Actions=new-empty-window; -@@ -14,5 +14,5 @@ Keywords=vscode; - - [Desktop Action new-empty-window] - Name=New Empty Window --Exec=/usr/share/@@NAME@@/@@NAME@@ --new-window %F --Icon=@@ICON@@ -+Exec=/usr/share/code/code --new-window %F -+Icon=/usr/share/resources/linux/code.png diff --git a/app-editors/vscode/vscode-1.33.1.ebuild b/app-editors/vscode/vscode-1.33.1.ebuild index 3c33e54..5239e6d 100644 --- a/app-editors/vscode/vscode-1.33.1.ebuild +++ b/app-editors/vscode/vscode-1.33.1.ebuild @@ -18,15 +18,9 @@ RDEPEND="${DEPEND}" BDEPEND=">=sys-apps/yarn-1.15.2" PATCHES=( - "files/gentoo-vscode.patch" + "${FILESDIR}/${PN}-gentoo.patch" ) -src_unpack() { - unpack ${A} - cd "${S}" - epatch "files/gentoo-vscode.patch" -} - src_compile() { yarn yarn watch