summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Blakeney2018-08-17 07:58:31 +1000
committerMark Blakeney2018-08-17 07:59:54 +1000
commit83e9699a5150a3397cd258811d45df630f9ad10a (patch)
tree5cada5f46716a650cdbb24dbcca8389e656ab114
parent03aaf11f4d428953a147154a0a138c08377ac70f (diff)
downloadaur-83e9699a5150a3397cd258811d45df630f9ad10a.tar.gz
Revert glibc hack now glibc 2.28-4 includes fix
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD22
2 files changed, 7 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 09b7cbf2fff6..fba238f29aae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
pkgbase = skypeforlinux-stable-bin
pkgdesc = Skype for Linux - Stable/Release Version
pkgver = 8.28.0.41
- pkgrel = 1
+ pkgrel = 2
url = http://www.skype.com
arch = x86_64
license = custom
- makedepends = patchelf
depends = gtk3
depends = libxss
depends = gconf
@@ -13,6 +12,7 @@ pkgbase = skypeforlinux-stable-bin
depends = libxtst
depends = libsecret
depends = nss
+ depends = glibc>=2.28-4
optdepends = gnome-keyring
provides = skypeforlinux
provides = skype
@@ -21,13 +21,8 @@ pkgbase = skypeforlinux-stable-bin
conflicts = skypeforlinux-preview-bin
conflicts = skypeforlinux-beta-bin
conflicts = skype
- noextract = glibc-2.27-3-x86_64.pkg.tar.xz
- options = !strip
- options = staticlibs
source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.28.0.41_amd64.deb
- source = https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz
sha256sums = 5df85705c6844552a201e9040184990829d45db7039263486f65fc85c371cdcf
- sha256sums = a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc
pkgname = skypeforlinux-stable-bin
diff --git a/PKGBUILD b/PKGBUILD
index a5a16c7ffba9..0b53d8cf76c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,38 +4,26 @@
_pkgname=skypeforlinux
pkgname=$_pkgname-stable-bin
pkgver=8.28.0.41
-pkgrel=1
+pkgrel=2
pkgdesc="Skype for Linux - Stable/Release Version"
arch=("x86_64")
url="http://www.skype.com"
license=("custom")
-depends=("gtk3" "libxss" "gconf" "alsa-lib" "libxtst" "libsecret" "nss")
+depends=("gtk3" "libxss" "gconf" "alsa-lib" "libxtst" "libsecret" "nss" "glibc>=2.28-4")
optdepends=("gnome-keyring")
-makedepends=("patchelf")
-options=("!strip" "staticlibs")
conflicts=("$_pkgname" "$_pkgname-bin" "$_pkgname-preview-bin" "$_pkgname-beta-bin" "skype")
provides=("$_pkgname" "skype")
source=(
"https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb"
-"https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-${CARCH}.pkg.tar.xz"
)
-noextract=("glibc-2.27-3-${CARCH}.pkg.tar.xz")
-sha256sums=('5df85705c6844552a201e9040184990829d45db7039263486f65fc85c371cdcf'
- 'a9e1b18d7f613be660556dbd6883781e88a0f5113230147e230d3e2f268792dc')
+sha256sums=('5df85705c6844552a201e9040184990829d45db7039263486f65fc85c371cdcf')
package() {
- _ldir="/usr/share/$_pkgname"
- _pdir="$pkgdir/$_ldir"
- _pexe="$_pdir/$_pkgname"
tar -xJC "$pkgdir" -f data.tar.xz
install -d "$pkgdir/usr/share/licenses/$pkgname"
- mv "$_pdir/LICENSES.chromium.html" "$pkgdir/usr/share/licenses/$pkgname/"
+ mv "$pkgdir/usr/share/$_pkgname/LICENSES.chromium.html" \
+ "$pkgdir/usr/share/licenses/$pkgname/"
rm -rf "$pkgdir/opt"
- 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"
}
# vim:set ts=2 sw=2 et: