diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile index 4914a24..5961169 100644 --- a/linux/assets/Dockerfile +++ b/linux/assets/Dockerfile @@ -1,12 +1,73 @@ FROM ubuntu:jammy #FROM fedora:36 -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch bash vim mc screen +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 dnf -y update && dnf -y install make wget git patch bash vim mc screen + + + + +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 + + + + + + + + WORKDIR / RUN git clone https://gitlab.com/librewolf-community/browser/windows.git WORKDIR /windows/linux RUN make setup-debian && make fetch && make bootstrap && make veryclean + #RUN make setup-fedora && make fetch && make bootstrap && make veryclean diff --git a/linux/assets/artifacts.mk b/linux/assets/artifacts.mk index 22e950f..78a3b42 100644 --- a/linux/assets/artifacts.mk +++ b/linux/assets/artifacts.mk @@ -41,9 +41,9 @@ artifacts : cp work/LibreWolf-WinUpdater/LibreWolf-WinUpdater.ahk work/LibreWolf-WinUpdater/*.ico work/librewolf-$(full_version) wget -q -O work/ahk.zip "https://www.autohotkey.com/download/ahk.zip" ( mkdir work/ahk && cd work/ahk && unzip -q ../ahk.zip ) - ( cd work/librewolf-$(full_version) && wine64 ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk /icon LibreWolf-Portable.ico ) + ( cd work/librewolf-$(full_version) && wineconsole ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-Portable.ahk /icon LibreWolf-Portable.ico ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-Portable.ahk LibreWolf-Portable.ico dejsonlz4.exe jsonlz4.exe ) - ( cd work/librewolf-$(full_version) && wine64 ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk /icon LibreWolf-WinUpdater.ico ) + ( cd work/librewolf-$(full_version) && wineconsole ../ahk/Compiler/Ahk2Exe.exe /in LibreWolf-WinUpdater.ahk /icon LibreWolf-WinUpdater.ico ) ( cd work/librewolf-$(full_version) && rm -f LibreWolf-WinUpdater.ahk LibreWolf-WinUpdater*.ico ) # issue #224 - Consider including msvcp140 & vcruntime140 in portable package ( cd work/librewolf-$(full_version)/LibreWolf && \ diff --git a/winbuild/source_release b/winbuild/source_release index d00491f..0cfbf08 100644 --- a/winbuild/source_release +++ b/winbuild/source_release @@ -1 +1 @@ -1 +2 diff --git a/winbuild/version b/winbuild/version index 651a90c..5d210f3 100644 --- a/winbuild/version +++ b/winbuild/version @@ -1 +1 @@ -109.0 +109.0.1