From 3016c73d34033dc45307dffa59000e232d2d8639 Mon Sep 17 00:00:00 2001 From: git-bruh Date: Sun, 18 Sep 2022 13:03:50 +0530 Subject: [PATCH] firefox: unbundle zip, unzip --- extra/firefox/build | 15 --------------- extra/firefox/checksums | 2 -- extra/firefox/depends | 2 ++ extra/firefox/sources | 2 -- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/extra/firefox/build b/extra/firefox/build index bcd71b59..e4212fa0 100755 --- a/extra/firefox/build +++ b/extra/firefox/build @@ -4,21 +4,6 @@ for p in *.patch; do patch -p1 < "$p" done -# Build zip/unzip for Firefox's sole use. -for f in zip unzip; do ( - cd "$f" - - make \ - CC="$CC $CFLAGS $CXXFLAGS" \ - -f unix/Makefile generic - - make \ - prefix="$PWD/../junk" \ - -f unix/Makefile install -) done - -export PATH="$PWD/junk/bin:$PATH" - for p in \ audioipc \ audioipc-client \ diff --git a/extra/firefox/checksums b/extra/firefox/checksums index f08743c3..ffad341b 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,6 +1,4 @@ 72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a -f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 -036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b bed3f4e39dcb8065dba174d37fb15f2a75887a6dd7ce6b872e5ab287c8bc386f diff --git a/extra/firefox/depends b/extra/firefox/depends index 5397e3e4..7417f19d 100644 --- a/extra/firefox/depends +++ b/extra/firefox/depends @@ -27,6 +27,8 @@ pixman pkgconf make python make rust make +unzip make wayland wayland-protocols make +zip make zlib diff --git a/extra/firefox/sources b/extra/firefox/sources index 2989d160..89bd1b4d 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,6 +1,4 @@ https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz -https://fossies.org/linux/misc/zip30.tar.gz zip -https://fossies.org/linux/misc/unzip60.tar.gz unzip patches/fix-clang-as.patch patches/fix-linux-header.patch patches/no-dbus.patch