diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile index 067d028..9434fe9 100644 --- a/linux/assets/Dockerfile +++ b/linux/assets/Dockerfile @@ -4,55 +4,54 @@ FROM ubuntu:jammy # It's probably totally unnecesary to include all of these dependencies. # -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch bash vim mc screen automake autoconf libtool build-essential -RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install \ - apt-utils \ - aptitude \ - binutils \ - build-essential \ - bzip2 \ - curl \ - devscripts \ - equivs \ - fakeroot \ - file \ - gawk \ - git \ - git \ - gnupg \ - jq \ - less \ - lib32atomic1 \ - lib32stdc++6 \ - lib32z1 \ - libasound2 \ - libc6-i386 \ - libdbus-glib-1-2 \ - libgtk-3-0 \ - libucl1 \ - make \ - mercurial \ - p7zip-full \ - patch \ - procps \ - python3 \ - python3-dev \ - python3-pip \ - python3-distutils-extra \ - python3-minimal \ - python3-psutil \ - python3-venv \ - rsync \ - screen \ - tar \ - unzip \ - uuid \ - vim-tiny \ - wget \ - x11-utils \ - xz-utils \ - zip \ - zstd +RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch build-essential + + + +# +# +# RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install \ +# apt-utils \ +# aptitude \ +# binutils \ +# build-essential \ +# bzip2 \ +# curl \ +# devscripts \ +# equivs \ +# fakeroot \ +# file \ +# gawk \ +# git \ +# git \ +# gnupg \ +# jq \ +# less \ +# lib32atomic1 \ +# lib32stdc++6 \ +# lib32z1 \ +# libasound2 \ +# libc6-i386 \ +# libdbus-glib-1-2 \ +# libgtk-3-0 \ +# libucl1 \ +# make \ +# mercurial \ +# p7zip-full \ +# patch \ +# procps \ +# python3 \ +# python3-dev \ +# python3-pip \ +# python3-distutils-extra \ +# python3-minimal \ +# python3-psutil \ +# python3-venv \ +# rsync screen tar unzip uuid \ +# vim-tiny wget x11-utils xz-utils zip zstd +# + + # diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 3f2c469..1877484 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -2,6 +2,7 @@ export MOZBUILD=$HOME/.mozbuild ac_add_options --target=x86_64-pc-mingw32 +ac_add_options --enable-bootstrap # since v110.0 - liblowercase not needed anymore? #mk_add_options "export LD_PRELOAD=$MOZBUILD/liblowercase/liblowercase.so" @@ -22,7 +23,7 @@ export HOST_CXX="$MOZBUILD/clang/bin/clang++" -export WINE=wineconsole +#export WINE=wineconsole #export WINE="$MOZBUILD/wine/bin/wine64" #export MIDL="$MOZBUILD/wine/bin/widl"