Make some of the changes needed to the 'makeicecat' script, to allow it to run in a snippet without network access. After this patch is applied, some additional changes will be made using 'substitute*'. diff --git a/makeicecat b/makeicecat index 8be2362..48716f2 100755 --- a/makeicecat +++ b/makeicecat @@ -31,55 +31,55 @@ SOURCEDIR=icecat-$FFVERSION DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data -mkdir -p output -cd output +# mkdir -p output +# cd output ############################################################################### # Retrieve FF source code ############################################################################### -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 51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz - -mv firefox-${FFVERSION} $SOURCEDIR +# 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 51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz +# +# mv firefox-${FFVERSION} $SOURCEDIR ############################################################################### # Retrieve l10n ############################################################################### -mkdir l10n -cd l10n -while read line;do - 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 - mkdir -p $line/browser/chrome/browser/preferences - touch $line/browser/chrome/browser/preferences/advanced-scripts.dtd - rm -rf $line/.hg* -done < ../$SOURCEDIR/browser/locales/shipped-locales -cd .. - -mv l10n $SOURCEDIR - -hg clone https://hg.mozilla.org/l10n/compare-locales/ -cd compare-locales/ -hg checkout RELEASE_8_0_0 -cd .. -rm compare-locales/.hg* compare-locales/.git* -rf -mv compare-locales $SOURCEDIR/l10n +# mkdir l10n +# cd l10n +# while read line;do +# 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 +# mkdir -p $line/browser/chrome/browser/preferences +# touch $line/browser/chrome/browser/preferences/advanced-scripts.dtd +# rm -rf $line/.hg* +# done < ../$SOURCEDIR/browser/locales/shipped-locales +# cd .. +# +# mv l10n $SOURCEDIR +# +# hg clone https://hg.mozilla.org/l10n/compare-locales/ +# cd compare-locales/ +# hg checkout RELEASE_8_0_0 +# cd .. +# rm compare-locales/.hg* compare-locales/.git* -rf +# mv compare-locales $SOURCEDIR/l10n ####################################################### -cd $SOURCEDIR +# cd $SOURCEDIR shopt -s nullglob for patch in $DATA/patches/*.patch; do @@ -598,6 +598,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in # Fix CVE-2012-3386 /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true -cd .. -echo Packaging tarball -tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR +# cd .. +# echo Packaging tarball +# tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR ibxcursor, libxaw, twm, xinit, xterm)[inputs]: Likewise. (xorgproto): Move expression before all other -proto packages. (xproto)[properties]: Mark as superseded by XORGPROTO. Marius Bakke 2017-03-21gnu: Adjust asciidoc-related build options....Commits 9099a45792306fade2d9ca55138e49ef4f01f1ea and 3078821d1380c26c738be6b5d430c595327d401f make many package inputs and build configurations related to asciidoc obsolete. * gnu/packages/compton.scm (compton)[inputs]: Remove docbook-xml, libxml2 and libxslt. * gnu/packages/mail.scm (offlinemap)[native-inputs]: Remove libxslt. * gnu/packages/linux.scm (btrfs-progs)[native-inputs]: Remove docbook-xml. (perf)[inputs]: Remove docbook-xml and libxslt. * gnu/packages/text-editors.scm (kakoune)[native-inputs]: Remove libxslt. * gnu/packages/version-control.scm (cgit)[native-inputs]: Remove docbook-xml, docbook-xsl, libxml2 and libxslt. (cvs-fast-export)[native-inputs]: Remove docbook-xml, docbook-xsl, libxml2 and libxslt. * gnu/packages/web.scm (qutebrowser)[native-inputs]: Remove docbook-xml, docbook-xsl, libxml2, and libxslt. (tinyproxy)[native-inputs]: Remove docbook-xml, docbook-xsl, libxml2 and libxslt. * gnu/packages/wm.scm (awesome)[make-flags]: Remove XML_CATALOG_FILES flag. (i3-wm)[inputs]: Remove docbook-xml. [native-inputs]: Add libxml2. Kei Kebreau 2017-01-21gnu: Add compton....* gnu/packages/compton.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add compton.scm Signed-off-by: Ludovic Courtès <ludo@gnu.org> José Miguel Sánchez García