From ad6780da3fc3f139e92e012d20886d0e07efd83b Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Sat, 23 Feb 2019 19:51:31 +0100
Subject: experimental/firefox: Fetch py2 via sources instead of manually,
 because ewww

---
 experimental/firefox-esr/APKBUILD | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'experimental/firefox-esr')

diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD
index 2a2e54066..b13698697 100644
--- a/experimental/firefox-esr/APKBUILD
+++ b/experimental/firefox-esr/APKBUILD
@@ -17,6 +17,7 @@ makedepends="$depends_dev autoconf2.13 automake libtool
 	bsd-compat-headers cmd:which nss-static openssl-dev sed yasm zip
 	cargo clang llvm6-dev rust"
 subpackages=""
+_py2ver=2.7.15
 source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
 	mozconfig
 	stab.h
@@ -44,7 +45,9 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 	webrtc-broken.patch
 
 	firefox.desktop
-	firefox-safe.desktop"
+	firefox-safe.desktop
+
+	https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz"
 
 builddir="$srcdir"/firefox-$pkgver
 ldpath="$_mozappdir"
@@ -52,15 +55,11 @@ ldpath="$_mozappdir"
 unpack() {
 	default_unpack
 	[ -z $SKIP_PYTHON ] || return 0
+
 	msg "Killing all remaining hope for humanity and building Python 2..."
-	cd "$srcdir"
-	[ -d python ] && rm -r python
-	mkdir python
-	cd python
+	cd "$srcdir/Python-$_py2ver"
+	[ -d ../python ] && rm -r ../python
 	# 19:39 <+solar> just make the firefox build process build its own py2 copy
-	curl -O https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz
-	tar xJf Python-2.7.15.tar.xz
-	cd Python-2.7.15
 	# 20:03 <calvin> TheWilfox: there's always violence
 	./configure --prefix="$srcdir/python"
 	make -j $JOBS
@@ -166,4 +165,5 @@ fd3b165e26ab931dd7eaf220d578c30b8772eab0a870710d59403c9823c2233ef941cd7eb25d1625
 e196c998a4029e4fc134fbe4b7455abb4b93644f7f07b88faef4eda900de225e72b124b5a9ab3492cbe398e17f8390d29b769a2544744a106bba6a5def540973  stackwalk-x86-ppc.patch
 76409619464259e3ba52e38d640c5b6210a7fecdc75cf124c185ef356507d4d266a845e9fcdeb7766dcd547f70748123c4fa1670f6e52aadd001a3c866dc2d51  webrtc-broken.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
-5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
+5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop
+27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6  Python-2.7.15.tar.xz"
-- 
cgit v1.2.3-60-g2f50