wellton/icecat
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Update to 78.7.1

Ver Código-Fonte 
Updated the patch as the makeicecat script was rewritten for this
release. The additional source archives were renamed from extras
to output as makeicecat assumes the Firefox source code and
language packs are in the output directory and debuild creates a
directory with the name from the archive.
Esse commit está contido em:
losuler
2021-02-14 18:55:37 +11:00
pai eeee4fc1f1
commit d515611d6d
5 arquivos alterados com 55 adições e 63 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
.gitignore
+2 -2
Ver Arquivo
@@ -5,6 +5,6 @@ build/*.changes
build/*.deb
build/*.dsc
build/*.debian.tar.xz
build/*.orig-extras.tar.xz
build/*.orig-output.tar.xz
build/*.orig.tar.gz
build/icecat-*
build/icecat-*
build/build.sh
+9 -9
Ver Arquivo
@@ -4,8 +4,8 @@ set -o errexit
set -o errtrace
set -o pipefail
ICECATCOMMIT="abfe5eebaca3c2787f1a9505669393674493c177"
FFVERSION="78.7.0"
ICECATCOMMIT="bb1c105f4416c2973f394680c2d579918a1da77a"
FFVERSION="78.7.1"
CLVERSION="RELEASE_8_0_0"
@@ -23,8 +23,8 @@ download() {
wget "https://git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-${ICECATCOMMIT}.tar.gz"
mv gnuzilla-${ICECATCOMMIT}.tar.gz icecat_${FFVERSION}.orig.tar.gz
mkdir -p extras
cd extras
mkdir -p output
cd output
wget "https://ftp.mozilla.org/pub/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz"
wget "https://ftp.mozilla.org/pub/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc"
@@ -43,9 +43,9 @@ download() {
wget --content-disposition "https://hg.mozilla.org/l10n/compare-locales/archive/$CLVERSION.zip"
cd ..
tar caf "icecat_$FFVERSION.orig-extras.tar.xz" --checkpoint=.1000 extras/*
tar caf "icecat_$FFVERSION.orig-output.tar.xz" --checkpoint=.1000 output/*
rm -rf extras
rm -rf output
}
#reproduce() {
@@ -60,9 +60,9 @@ build_deb() {
tar xf icecat_${FFVERSION}.orig.tar.gz --checkpoint=.1000
mv gnuzilla-${ICECATCOMMIT} icecat-${FFVERSION}
mkdir icecat-${FFVERSION}/extras
tar -C icecat-${FFVERSION}/extras --strip-components=1 \
-xf icecat_${FFVERSION}.orig-extras.tar.xz --checkpoint=.1000
mkdir icecat-${FFVERSION}/output
tar -C icecat-${FFVERSION}/output --strip-components=1 \
-xf icecat_${FFVERSION}.orig-output.tar.xz --checkpoint=.1000
cp -r ../debian icecat-${FFVERSION}
cd icecat-${FFVERSION}
debian/changelog
externo
+6
Ver Arquivo
@@ -1,3 +1,9 @@
icecat (78.7.1-1) unstable; urgency=medium
* Update to 78.7.1.
-- losuler <losuler@posteo.net> Sun, 14 Feb 2021 14:55:06 +1100
icecat (78.7.0-1) unstable; urgency=medium
* Update to 78.7.0.
debian/patches/offline-sources.patch
externo
+37 -51
Ver Arquivo
@@ -1,54 +1,40 @@
From: losuler <losuler@posteo.net>
Subject: Use offline sources provided
--- a/makeicecat
+++ b/makeicecat
@@ -28,6 +28,7 @@
FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB
ICECATVERSION=$FFVERSION-gnu$GNUVERSION
SOURCEDIR=icecat-$FFVERSION
+CLRELEASE=RELEASE_8_0_0
DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data
@@ -40,14 +41,12 @@
rm mozilla-esr${FFMAJOR} $SOURCEDIR -rf
-wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz
-wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
-gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
-gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
-echo -n 1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+gpg --import ../extras/KEY
+gpg --verify ../extras/firefox-${FFVERSION}esr.source.tar.xz.asc
+echo -n 1aa041db28cd742e93d663a9da8defd33040b38d8b9470350538473251621643 ../extras/firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
echo Extracting Firefox tarball
-tar -xf firefox-${FFVERSION}esr.source.tar.xz
+tar -xf ../extras/firefox-${FFVERSION}esr.source.tar.xz
mv firefox-${FFVERSION} $SOURCEDIR
@@ -61,7 +60,8 @@
line=$(echo $line |cut -d' ' -f1)
#[ $line = "es-ES" ] || continue # To speed up testing
[ $line = "en-US" ] && continue
- hg clone https://hg.mozilla.org/l10n-central/$line
+ unzip ../../extras/$line-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9].zip
+ find . -mindepth 1 -name "$line-*" -prune -type d -exec mv {} $line \;
mkdir -p $line/browser/chrome/browser/preferences
touch $line/browser/chrome/browser/preferences/advanced-scripts.dtd
rm -rf $line/.hg*
@@ -70,10 +70,8 @@
mv l10n $SOURCEDIR
-hg clone https://hg.mozilla.org/l10n/compare-locales/
-cd compare-locales/
-hg checkout RELEASE_8_0_0
-cd ..
+unzip ../extras/compare-locales-${CLRELEASE}.zip
+mv compare-locales-${CLRELEASE} compare-locales
rm compare-locales/.hg* compare-locales/.git* -rf
mv compare-locales $SOURCEDIR/l10n
--- a/makeicecat 2021-02-14 12:35:33.678157643 +1100
+++ b/makeicecat 2021-02-14 16:40:58.835837470 +1100
@@ -119,16 +119,6 @@
return 1
fi
- # verify that Mercurial is available
- if ! which hg &> /dev/null
- then
- echo -e "\nERROR: This script requires Mercurial:
- e.g.: 'hg' from the Guix 'mercurial' package
- 'hg' from the Parabola 'mercurial' package
- 'hg' from the Trisquel 'mercurial' package"
- return 1
- fi
-
# verify that Perl 'rename' is available and sufficent
local rename_cmds=(
# NOTE: order is important -- 'util-linux' provides a binary named 'rename'
@@ -203,7 +193,7 @@
verify_sources()
{
echo Verifying Firefox tarball
- gpg --recv-keys --keyserver keyserver.ubuntu.com ${SOURCEBALL_SIGNINGKEY}
+ gpg --import KEY
gpg --verify ${SOURCEBALL}.asc
echo -n ${SOURCEBALL_CHECKSUM} ${SOURCEBALL} | sha256sum -c -
}
@@ -230,7 +220,8 @@
if [[ -n "${lang}" && "${lang}" != 'en-US' && ! -f ${lang}/${L10N_DTD_FILE} ]]
then
echo "Cloning '${lang}' language repository"
- hg clone ${L10N_URL}/${lang}
+ unzip ../$lang-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9].zip
+ find . -mindepth 1 -name "$lang-*" -prune -type d -exec mv {} $lang \;
mkdir -p ${lang}/${L10N_PREFS_DIR}
touch ${lang}/${L10N_DTD_FILE}
rm -rf ${lang}/.hg*
debian/rules
externo
+1 -1
Ver Arquivo
@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--reduce-memory-overheads -Wl,--no-keep-memory
FFVERSION = 78.7.0
FFVERSION = 78.7.1
%:
mkdir -p output/build output/icecat-$(FFVERSION)