[visual-studio-code-bin] Update to 1.26.1

- Remove various glibc workarounds and add dependency for glibc>=2.28-4
- Replace gtk2 dependency with gtk3
This commit is contained in:
D. Can Celasun
2018-08-17 17:48:24 +02:00
parent 5637b934b1
commit 45ba453ab8
2 changed files with 15 additions and 53 deletions

View File

@@ -2,8 +2,8 @@
pkgname=visual-studio-code-bin
_pkgname=visual-studio-code
pkgver=1.26.0
pkgrel=3
pkgver=1.26.1
pkgrel=1
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/"
@@ -12,25 +12,19 @@ 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)
depends=(fontconfig libxtst gtk3 python cairo alsa-lib nss gcc-libs libnotify libxss gconf 'glibc>=2.28-4')
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
https://archive.archlinux.org/packages/l/libxml2/libxml2-2.9.8-2-${CARCH}.pkg.tar.xz
https://archive.archlinux.org/packages/i/icu/icu-61.1-1-${CARCH}.pkg.tar.xz
)
source_i686=(code_ia32_${pkgver}.tar.gz::https://vscode-update.azurewebsites.net/${pkgver}/linux-ia32/stable
${_pkgname}.desktop
)
options=("!strip" "staticlibs")
noextract=("glibc-2.27-3-${CARCH}.pkg.tar.xz")
sha256sums_x86_64=('618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0'
'488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212'
'a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc'
'9a860e1dcc4f1686d5764cf1e9dd59fcdb4f07ca018aecd6631564ee33e6d6ab'
'5f35b1bf4cd2b13050e53a2c98016defa97232b1c838e91d0413a1c84b803a2c')
sha256sums_i686=('fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b'
sha256sums_x86_64=('5ef2f82e1272b0008a446fc8f62f9693e2af7c83d5922883ecbfd8a9986fd40b'
'488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212')
sha256sums_i686=('16a9eb4582767c31ca92fce9d7ed97b960175d8a97db25fab3c8e56afec2f3bc'
'488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212')
package() {
_pkg=VSCode-linux-x64
@@ -50,31 +44,4 @@ package() {
cp -r "${srcdir}/${_pkg}/"* "${pkgdir}/opt/${_pkgname}" -R
ln -s /opt/${_pkgname}/bin/code "${pkgdir}"/usr/bin/code
if [ "${CARCH}" = "i686" ]; then
return 0;
fi
_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"
mkdir -p "${pkgdir}"/opt/${_pkgname}/libs
tar -xJC "${srcdir}" -f "libxml2-2.9.8-2-${CARCH}.pkg.tar.xz" > /dev/null 2>&1
tar -xJC "${srcdir}" -f "icu-61.1-1-${CARCH}.pkg.tar.xz" > /dev/null 2>&1
cp "${srcdir}"/usr/lib/* "${pkgdir}"/opt/${_pkgname}/libs -r
cat <<- EOF > "${pkgdir}"/opt/${_pkgname}/code_libs
#!/bin/sh
LD_LIBRARY_PATH=/opt/${_pkgname}/libs code
EOF
chmod +x "${pkgdir}"/opt/${_pkgname}/code_libs
sed -i 's|/opt/visual-studio-code/code|/opt/visual-studio-code/code_libs|' "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
sed -i '35s|^|LD_LIBRARY_PATH=/opt/visual-studio-code/libs |' "${pkgdir}"/opt/${_pkgname}/bin/code
}