Remove glibc dependency.

4 files changed, 5 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e792f4898ecb..fce51c70b3a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,17 @@
 pkgbase = freetube
 	pkgdesc = An open source desktop YouTube player built with privacy in mind.
 	pkgver = 0.3.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/FreeTubeApp/FreeTube
-	install = freetube.install
 	arch = x86_64
 	license = GPL
-	noextract = glibc-2.27-3-x86_64.pkg.tar.xz
 	options = !strip
 	options = staticlibs
-	source = freetube.install
 	source = freetube.desktop
-	source = freetube-0.3.2-3.zip::https://github.com/FreeTubeApp/FreeTube/releases/download/v0.3.2-beta/FreeTube-linux-x64.zip
-	source = https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz
+	source = freetube-0.3.2-4.zip::https://github.com/FreeTubeApp/FreeTube/releases/download/v0.3.2-beta/FreeTube-linux-x64.zip
 	validpgpkeys = A8F7858263C1E39480B731DCEAD4F103068DF8E5
-	md5sums = f9127e651de14f462fc4afee3c7fb675
 	md5sums = 28055125824ebe9e9a6ad564c776a7fe
 	md5sums = 9e8d19b4380708ede1161e2032345d79
-	md5sums = 57c1dc79d8552f40602e49b84be65752
 
 pkgname = freetube
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c50b8d4d61d..809007196aa7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,27 @@
 
 pkgname=freetube
 pkgver=0.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source desktop YouTube player built with privacy in mind."
 arch=('x86_64')
 url="https://github.com/FreeTubeApp/FreeTube"
 license=('GPL')
 options=("!strip" "staticlibs")
-noextract=("glibc-2.27-3-x86_64.pkg.tar.xz")
 source=(
-    "freetube.install"
     "freetube.desktop"
     "$pkgname-$pkgver-$pkgrel.zip"::"https://github.com/FreeTubeApp/FreeTube/releases/download/v$pkgver-beta/FreeTube-linux-x64.zip"
-    "https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz"
     )
 
 validpgpkeys=('A8F7858263C1E39480B731DCEAD4F103068DF8E5')
 
-install="${pkgname}.install"
-
 package() {
     install -d "$pkgdir/"{usr/bin,/usr/share/pixmaps,usr/share/applications/,opt}
     cp -R $srcdir/FreeTube-linux-x64 $pkgdir/opt/$pkgname
     ln -s /opt/$pkgname/FreeTube $pkgdir/usr/bin/$pkgname
     install -Dm644 "$srcdir/FreeTube-linux-x64/resources/app/src/icons/iconColor.png" "${pkgdir}/usr/share/pixmaps/freetube.png"
     install -Dm644 "freetube.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-    # Patch pcloud to use glibc 2.27
-    _idir="/opt/${pkgname}"
-    _pdir="${pkgdir}/${_idir}"
-    _pbin="${_pdir}/FreeTube"
-    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"
 }
 
 
-md5sums=('f9127e651de14f462fc4afee3c7fb675'
-         '28055125824ebe9e9a6ad564c776a7fe'
-         '9e8d19b4380708ede1161e2032345d79'
-         '57c1dc79d8552f40602e49b84be65752')
+md5sums=('28055125824ebe9e9a6ad564c776a7fe'
+         '9e8d19b4380708ede1161e2032345d79')
diff --git a/PKGBUILD-glibc.patch b/PKGBUILD-glibc.patch
deleted file mode 100644
index d370a64682b0..000000000000
--- a/PKGBUILD-glibc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- PKGBUILD-old	2018-08-13 11:04:31.114153697 +1000
-+++ PKGBUILD	2018-08-13 11:35:14.874085833 +1000
-@@ -2,24 +2,45 @@
- 
- pkgname=freetube
- pkgver=0.3.2
--pkgrel=1
-+pkgrel=2
- pkgdesc="An open source desktop YouTube player built with privacy in mind."
- arch=('x86_64')
- url="https://github.com/FreeTubeApp/FreeTube"
- license=('GPL')
-+options=("!strip" "staticlibs")
-+noextract=("glibc-2.27-3-x86_64.pkg.tar.xz")
- source=(
-+    "freetube.install"
-     "freetube.desktop"
-     "$pkgname-$pkgver-$pkgrel.zip"::"https://github.com/FreeTubeApp/FreeTube/releases/download/v$pkgver-beta/FreeTube-linux-x64.zip"
-+    "https://archive.archlinux.org/packages/g/glibc/glibc-2.27-3-x86_64.pkg.tar.xz"
-     )
- 
- validpgpkeys=('A8F7858263C1E39480B731DCEAD4F103068DF8E5')
- 
-+install="${pkgname}.install"
-+
- package() {
-     install -d "$pkgdir/"{usr/bin,/usr/share/pixmaps,usr/share/applications/,opt}
-     cp -R $srcdir/FreeTube-linux-x64 $pkgdir/opt/$pkgname
-     ln -s /opt/$pkgname/FreeTube $pkgdir/usr/bin/$pkgname
-     install -Dm644 "$srcdir/FreeTube-linux-x64/resources/app/src/icons/iconColor.png" "${pkgdir}/usr/share/pixmaps/freetube.png"
-     install -Dm644 "freetube.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-+
-+    # Patch pcloud to use glibc 2.27
-+    _idir="/opt/${pkgname}"
-+    _pdir="${pkgdir}/${_idir}"
-+    _pbin="${_pdir}/FreeTube"
-+    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"
- }
--md5sums=('28055125824ebe9e9a6ad564c776a7fe'
--         '9e8d19b4380708ede1161e2032345d79')
-+
-+
-+md5sums=('f9127e651de14f462fc4afee3c7fb675'
-+         '28055125824ebe9e9a6ad564c776a7fe'
-+         '9e8d19b4380708ede1161e2032345d79'
-+         '57c1dc79d8552f40602e49b84be65752')
diff --git a/freetube.install b/freetube.install
deleted file mode 100644
index 6d1d510f2577..000000000000
--- a/freetube.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    patchelf --set-interpreter "/opt/freetube/glibc/usr/lib/ld-linux-x86-64.so.2" "/opt/freetube/FreeTube"
-    patchelf --set-rpath "/opt/freetube:/opt/freetube/glibc/usr/lib" "/opt/freetube/FreeTube"
-    patchelf --shrink-rpath "/opt/freetube/FreeTube"
-}
-
-post_update() {
-    patchelf --set-interpreter "/opt/freetube/glibc/usr/lib/ld-linux-x86-64.so.2" "/opt/freetube/FreeTube"
-    patchelf --set-rpath "/opt/freetube:/opt/freetube/glibc/usr/lib" "/opt/freetube/FreeTube"
-    patchelf --shrink-rpath "/opt/freetube/FreeTube"
-}