From b7dc1aca758b80626a7dd1677b3b580187d6df95 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 30 Jul 2021 13:42:09 +0300
Subject: [PATCH] firefox: vendor zip

---
 extra/firefox/build     | 16 ++++++++++++++++
 extra/firefox/checksums |  1 +
 extra/firefox/depends   |  1 -
 extra/firefox/sources   |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/extra/firefox/build b/extra/firefox/build
index 80ea0fd0..7dc20c37 100755
--- a/extra/firefox/build
+++ b/extra/firefox/build
@@ -37,6 +37,22 @@ mv -f _ "$_f"
     make
     make install
 )
+
+# Build zip for Firefox's sole use.
+# Zip is an awful format that we should use
+# as little as possible.
+(
+    cd zip
+
+    make \
+        CC="$CC $CFLAGS $CXXFLAGS" \
+        -f unix/Makefile generic
+
+    make \
+        prefix="$PWD/../junk" \
+        -f unix/Makefile install
+)
+
 export PATH="$PWD/junk/bin:$PATH"
 
 # If using libc++, CXXSTDLIB needs to be set manually.
diff --git a/extra/firefox/checksums b/extra/firefox/checksums
index e827a30e..eb5c3f86 100644
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@@ -1,4 +1,5 @@
 35c45dbc21a7bd59e5daa6b3fef7a08c51ff0a1333f47a355bb1cbc840c3ff59
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
+f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
 a88ecf15a164dd82f9deb6576ff744d4ed1fda7ebd273e63b01e0c1d93c9ed1d
diff --git a/extra/firefox/depends b/extra/firefox/depends
index c00f204a..2c579d9e 100644
--- a/extra/firefox/depends
+++ b/extra/firefox/depends
@@ -29,5 +29,4 @@ pkgconf       make
 python        make
 rust          make
 wayland
-zip           make
 zlib
diff --git a/extra/firefox/sources b/extra/firefox/sources
index f64de68b..7bc51104 100644
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@@ -1,4 +1,5 @@
 https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://github.com/yasm/yasm/releases/download/v1.3.0/yasm-1.3.0.tar.gz yasm
+https://fossies.org/linux/misc/zip30.tar.gz zip
 patches/no-x11.patch