Revert binary patching

Arch released upgrade of glibc to 2.28.4 which resolves this issue

2 files changed, 3 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18795db6acc3..dae05e24a3eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = signal-desktop-bin
 	pkgdesc = Private messaging from your desktop
 	pkgver = 1.15.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/signalapp/Signal-Desktop
 	arch = x86_64
 	license = GPL3
-	makedepends = patchelf
 	depends = gconf
 	depends = gtk3
 	depends = libnotify
@@ -14,14 +13,10 @@ pkgbase = signal-desktop-bin
 	depends = libxss
 	provides = signal-desktop
 	conflicts = signal
-	noextract = glibc-2.27-3-x86_64.pkg.tar.xz
 	options = !strip
-	options = staticlibs
 	source = https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.15.5_amd64.deb
-	source = https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz
 	source = signal-desktop
 	sha512sums = 91c38d04e949168d01a04636ac01abea52499432e1d898b04741bacb2509c3595001e785ff92e3e23371bf0ea94d304da83b3f1d50b93dbbf8e2a1128388a16e
-	sha512sums = e2f230f2558f24d13f2fef8987c3d5d8dd440f65131809052b6f243309f8b43be17134ef9a6848dc3631ec1fb37bc5a056efe5dd19a52ea28cc338cd8775c99c
 	sha512sums = 7db7ee79a07fb86fec471e63c5189d61e8a2ca8fc2e659ea89ef22516e24e0a3c9f32c93f8ee520f56abc187b9b9304355e8aadb427c4920cda4f663ab1489fa
 
 pkgname = signal-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index b3be174bfabf..170e46e72922 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,19 @@
 
 pkgname=signal-desktop-bin
 pkgver=1.15.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Private messaging from your desktop'
 arch=('x86_64')
 url='https://github.com/signalapp/Signal-Desktop'
 license=('GPL3')
 provides=('signal-desktop')
 conflicts=('signal')
-options=('!strip' 'staticlibs')
-noextract=("glibc-2.27-3-${CARCH}.pkg.tar.xz")
+options=('!strip')
 depends=('gconf' 'gtk3' 'libnotify' 'nss' 'xdg-utils' 'libxss')
-makedepends=('patchelf')
 
 sha512sums=('91c38d04e949168d01a04636ac01abea52499432e1d898b04741bacb2509c3595001e785ff92e3e23371bf0ea94d304da83b3f1d50b93dbbf8e2a1128388a16e'
-            'e2f230f2558f24d13f2fef8987c3d5d8dd440f65131809052b6f243309f8b43be17134ef9a6848dc3631ec1fb37bc5a056efe5dd19a52ea28cc338cd8775c99c'
             '7db7ee79a07fb86fec471e63c5189d61e8a2ca8fc2e659ea89ef22516e24e0a3c9f32c93f8ee520f56abc187b9b9304355e8aadb427c4920cda4f663ab1489fa')
 source=("https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${pkgver}_amd64.deb"
-        'https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz'
         'signal-desktop')
 
 package() {
@@ -31,15 +27,4 @@ package() {
   # 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}"
-  _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}"
 }