From b799f288eabbb62e347909635034f3ae55450cb3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 24 Feb 2023 17:48:01 +0100 Subject: [PATCH] Fri Feb 24 05:48:01 PM CET 2023 --- linux/Makefile | 5 +++-- linux/assets/mozconfig | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 29462e8..68491fa 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -83,8 +83,9 @@ extract-arch : # windows-specific modifications: patch-folder-arch : [ -f "version" ] && [ -f "source_release" ] && [ -d "librewolf-$(full_version)" ] - mv librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std - cp -v assets/mozconfig.arch librewolf-$(full_version)/mozconfig +# mv librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std +# cp -v assets/mozconfig.arch librewolf-$(full_version)/mozconfig + cp -v assets/mozconfig librewolf-$(full_version)/mozconfig (cd librewolf-$(full_version) && patch -p1 -i ../assets/tryfix-reslink-fail.patch) (cd librewolf-$(full_version) && patch -p1 -i ../assets/fix-l10n-package-cmd.patch) diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 37252f4..3f2c469 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -21,8 +21,11 @@ export HOST_CXX="$MOZBUILD/clang/bin/clang++" -export WINE="$MOZBUILD/wine/bin/wine64" -export MIDL="$MOZBUILD/wine/bin/widl" + +export WINE=wineconsole +#export WINE="$MOZBUILD/wine/bin/wine64" +#export MIDL="$MOZBUILD/wine/bin/widl" + #export MIDL=midl #export MIDL=widl @@ -30,7 +33,7 @@ export MIDL="$MOZBUILD/wine/bin/widl" # TODO : fixme # -ac_add_options --without-wasm-sandboxed-libraries +#ac_add_options --without-wasm-sandboxed-libraries ### # old config settings