[visual-studio-code-bin] Broken glibc workaround

https://github.com/Microsoft/vscode/issues/55934

https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/glibc&id=f2aaaac68876f6959c62ea09dcdda5d441bf4ff7

2 files changed, 29 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c2cf3c09bf6..746836870c6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 # Generated by mksrcinfo v8
-# Mon Aug 13 20:44:33 UTC 2018
+# Tue Aug 14 06:06:24 UTC 2018
 pkgbase = visual-studio-code-bin
 	pkgdesc = Visual Studio Code: Editor for building and debugging modern web and cloud applications (official binary version)
 	pkgver = 1.26.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://code.visualstudio.com/
 	arch = x86_64
 	arch = i686
 	license = custom: commercial
+	makedepends = patchelf
 	depends = fontconfig
 	depends = libxtst
 	depends = gtk2
@@ -25,14 +26,21 @@ pkgbase = visual-studio-code-bin
 	provides = visual-studio-code
 	conflicts = visual-studio-code
 	replaces = visual-studio-code
+	noextract = glibc-2.27-3-.pkg.tar.xz
+	options = !strip
+	options = staticlibs
 	source_x86_64 = code_x64_1.26.0.tar.gz::https://vscode-update.azurewebsites.net/1.26.0/linux-x64/stable
 	source_x86_64 = visual-studio-code.desktop
+	source_x86_64 = https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-.pkg.tar.xz
 	sha256sums_x86_64 = 618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0
 	sha256sums_x86_64 = 488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212
+	sha256sums_x86_64 = a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc
 	source_i686 = code_ia32_1.26.0.tar.gz::https://vscode-update.azurewebsites.net/1.26.0/linux-ia32/stable
 	source_i686 = visual-studio-code.desktop
+	source_i686 = https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-.pkg.tar.xz
 	sha256sums_i686 = fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b
 	sha256sums_i686 = 488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212
+	sha256sums_i686 = a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc
 
 pkgname = visual-studio-code-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index fcc819cf0cbe..0d31cee8c769 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=visual-studio-code-bin
 _pkgname=visual-studio-code
 pkgver=1.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Visual Studio Code: Editor for building and debugging modern web and cloud applications (official binary version)"
 arch=('x86_64' 'i686')
 url="https://code.visualstudio.com/"
@@ -11,18 +11,25 @@ license=('custom: commercial')
 provides=('vscode' 'visualstudiocode' 'visual-studio-code')
 replaces=('visual-studio-code')
 conflicts=('visual-studio-code')
+makedepends=(patchelf)
 depends=(fontconfig libxtst gtk2 python cairo alsa-lib nss gcc-libs libnotify libxss gconf)
 optdepends=('gvfs: Needed for move to trash functionality')
 source_x86_64=(code_x64_${pkgver}.tar.gz::https://vscode-update.azurewebsites.net/${pkgver}/linux-x64/stable
                ${_pkgname}.desktop
+               https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-${CARCH}.pkg.tar.xz
                )
 source_i686=(code_ia32_${pkgver}.tar.gz::https://vscode-update.azurewebsites.net/${pkgver}/linux-ia32/stable
               ${_pkgname}.desktop
+              https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-${CARCH}.pkg.tar.xz
               )
+options=("!strip" "staticlibs")
+noextract=("glibc-2.27-3-${CARCH}.pkg.tar.xz")
 sha256sums_x86_64=('618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0'
-                   '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212')
+                   '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212'
+                   'a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc')
 sha256sums_i686=('fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b'
-                 '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212')
+                 '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212'
+                 'a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc')
 package() {
   _pkg=VSCode-linux-x64
   if [ "${CARCH}" = "i686" ]; then
@@ -41,4 +48,13 @@ package() {
 
   cp -r "${srcdir}/${_pkg}/"* "${pkgdir}/opt/${_pkgname}" -R
   ln -s /opt/${_pkgname}/bin/code "${pkgdir}"/usr/bin/code
+
+  _ldir="/opt/$_pkgname"
+  _pdir="$pkgdir/$_ldir"
+  _pexe="$_pdir/code"
+  mkdir -p "$_pdir/glibc"
+  tar -xJC "$_pdir/glibc" -f "glibc-2.27-3-$CARCH.pkg.tar.xz"
+  rm "$_pdir/glibc/"{.BUILDINFO,.INSTALL,.MTREE,.PKGINFO}
+  patchelf --set-interpreter "$_ldir/glibc/usr/lib/ld-linux-x86-64.so.2" "$_pexe"
+  patchelf --set-rpath "$_ldir:$_ldir/glibc/usr/lib" "$_pexe"
 }