summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanek Thomaschewski2018-08-15 23:09:28 +0200
committerJanek Thomaschewski2018-08-15 23:14:34 +0200
commit6de5a68cdb398a54947d712e60ab5c8f6b1fa47b (patch)
tree52c842da5cde7123f861052ece2fe5bcdbd646de
parentbcb17c60858ede2fab430128ddb215455fce37f4 (diff)
downloadaur-6de5a68cdb398a54947d712e60ab5c8f6b1fa47b.tar.gz
Do not shring rpath
Fixes weird issues with binary in some cases after patching
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD24
2 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c81d6b5bbae..4fd47dbb80b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = signal-desktop-bin
pkgdesc = Private messaging from your desktop
pkgver = 1.15.4
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/signalapp/Signal-Desktop
arch = x86_64
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 6594721d36ef..d59303078ddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=signal-desktop-bin
pkgver=1.15.4
-pkgrel=2
+pkgrel=3
pkgdesc='Private messaging from your desktop'
arch=('x86_64')
url='https://github.com/signalapp/Signal-Desktop'
@@ -28,18 +28,18 @@ package() {
# fix permissions in 1.9.0+ (Some directories have now 775; changing them back to 755)
find "${pkgdir}" -type d -not -perm 755 -exec chmod 755 {} \;
+ # install alias in /usr/bin
+ mkdir "${pkgdir}/usr/bin"
+ install -D -m755 signal-desktop "${pkgdir}/usr/bin/signal-desktop"
+
# Patch Signal to use glibc 2.27
_idir="/opt/Signal"
- _pdir="${pkgdir}/${_idir}"
+ _pdir="${pkgdir}${_idir}"
_pbin="${_pdir}/signal-desktop"
- mkdir -p "$_pdir/glibc"
- tar -xJf "glibc-2.27-3-x86_64.pkg.tar.xz" -C "$_pdir/glibc"
- rm "$_pdir/glibc/"{.BUILDINFO,.INSTALL,.MTREE,.PKGINFO}
- patchelf --set-interpreter "$_idir/glibc/usr/lib/ld-linux-x86-64.so.2" "$_pbin"
- patchelf --set-rpath "$_idir:$_idir/glibc/usr/lib" "$_pbin"
- patchelf --shrink-rpath "$_pbin"
+ mkdir -p "${_pdir}/glibc"
+ tar -xJf "glibc-2.27-3-x86_64.pkg.tar.xz" -C "${_pdir}/glibc"
+ rm "${_pdir}/glibc/"{.BUILDINFO,.INSTALL,.MTREE,.PKGINFO}
- # install alias in /usr/bin
- mkdir "${pkgdir}/usr/bin"
- install -D -m755 signal-desktop "${pkgdir}/usr/bin/signal-desktop"
-}
+ patchelf --set-interpreter "${_idir}/glibc/usr/lib/ld-linux-x86-64.so.2" "${_pbin}"
+ patchelf --set-rpath "${_idir}:${_idir}/glibc/usr/lib" "${_pbin}"
+} \ No newline at end of file