From b854b6f5a4250b7f1468906cbd3325be5ae4dd93 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 20 Nov 2021 11:07:22 +0100
Subject: [PATCH] Changed to tar.gz tarballs, tar.xz files take too long to
 compress.

---
 .gitlab-ci.yml |  2 +-
 Makefile       | 21 +++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 874fc58..c4ae324 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,5 +7,5 @@ build-job:
     - make all
   artifacts:
     paths:
-      - librewolf-*.source.tar.xz
+      - librewolf-*.source.*
 
diff --git a/Makefile b/Makefile
index 64e71d3..d407610 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : all help clean veryclean fetch extract librewolf-patches check init
+.PHONY : all help clean veryclean librewolf-patches check
 
 
 version_file=./version
@@ -8,22 +8,20 @@ version:=$(shell cat $(version_file))
 ## simplistic archive format selection
 archive_create=tar cfJ
 ext=.tar.xz
-#archive_create=tar cfz
-#ext=.tar.gz
+archive_create=tar cfz
+ext=.tar.gz
 #archive_create=zip -r9
 #ext=.zip
 
 
 help :
-	@echo "use: make [all] [check] [clean] [veryclean] [init]"
+	@echo "use: make [all] [check] [clean] [veryclean]"
 	@echo ""
-	@echo "  all         - make librewolf source archive ${version}."
-	@echo "  check       - check if there is a new version of Firefox."
+	@echo "  all         - Make librewolf source archive ${version}."
+	@echo "  check       - Check if there is a new version of Firefox."
 	@echo ""
-	@echo "  clean       - clean everything except the upstream firefox tarball."
-	@echo "  veryclean   - clean everything and the firefox tarball."
-	@echo ""
-	@echo "  init        - set up local build environment, takes a long time."
+	@echo "  clean       - Clean everything except the upstream firefox tarball."
+	@echo "  veryclean   - Clean everything and the firefox tarball."
 
 
 check :
@@ -41,8 +39,7 @@ veryclean : clean
 	rm -f firefox-$(version).source.tar.xz
 
 
-fetch : 
-	rm -f firefox-$(version).source.tar.xz
+firefox-$(version).source.tar.xz :
 	wget -q https://archive.mozilla.org/pub/firefox/releases/$(version)/source/firefox-$(version).source.tar.xz