diff --git a/build.py b/build.py index 21251fb..fbe83db 100755 --- a/build.py +++ b/build.py @@ -212,13 +212,13 @@ def execute_extract(): def execute_build(): enter_srcdir() - #exec("bash -c \"MACH_USE_SYSTEM_PYTHON=1 ./mach build\"") - exec("bash -c \"./mach build\"") + exec("bash -c \"MACH_USE_SYSTEM_PYTHON=1 ./mach build\"") + #exec("bash -c \"./mach build\"") leave_srcdir() def execute_package(): enter_srcdir() - exec("bash -c \"./mach package\"") + exec("bash -c \"MACH_USE_SYSTEM_PYTHON=1 ./mach package\"") leave_srcdir() @@ -389,8 +389,8 @@ def execute_lw_artifacts(): if options.distro != 'osx': if options.distro == 'win': exec("mv -v {}/firefox{} {}/librewolf{}".format(librewolfdir,exe,librewolfdir,exe)); - exec("rm -rf {}/default-browser-agent* {}/maintainanceservice* {}/pingsender* {}/firefox.*.xml {}/precomplete {}/removed-files {}/uninstall" - .format(librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir)) +# exec("rm -rf {}/default-browser-agent* {}/maintainanceservice* {}/pingsender* {}/firefox.*.xml {}/precomplete {}/removed-files {}/uninstall" +# .format(librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir)) exec("cp -v common/source_files/browser/branding/librewolf/firefox.ico {}/librewolf.ico".format(librewolfdir)) if options.distro != 'win': exec("cp -v files/register-librewolf files/start-librewolf files/start-librewolf.desktop.in librewolf") diff --git a/common b/common index 7b345f3..5baa16f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7b345f392fc28c8868de2edcadd4681d1be123aa +Subproject commit 5baa16f8fbceef6ec48ce3cfa4f5d3a9b082a240 diff --git a/mk.py b/mk.py index fbdac9f..6617647 100755 --- a/mk.py +++ b/mk.py @@ -39,8 +39,8 @@ def build(): with open('version','r') as file: version = file.read().rstrip() os.chdir('librewolf-{}'.format(version)) - exec('./mach build') - exec('./mach package') + exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build') + exec('MACH_USE_SYSTEM_PYTHON=1 ./mach package') def artifact(): bash('# you gotta figure that out from the previous ./build.py') diff --git a/patches/librewolf-pref-pane.patch b/patches/librewolf-pref-pane.patch index 370742c..91922a1 100644 --- a/patches/librewolf-pref-pane.patch +++ b/patches/librewolf-pref-pane.patch @@ -12,10 +12,10 @@ index 4f3babe..97c7ec2 100644 content/browser/preferences/experimental.js diff --git a/browser/components/preferences/librewolf.inc.xhtml b/browser/components/preferences/librewolf.inc.xhtml new file mode 100644 -index 0000000..74395a0 +index 0000000..a4c5313 --- /dev/null +++ b/browser/components/preferences/librewolf.inc.xhtml -@@ -0,0 +1,381 @@ +@@ -0,0 +1,219 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -55,41 +55,12 @@ index 0000000..74395a0 + + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + @@ -97,8 +68,6 @@ index 0000000..74395a0 + + + @@ -113,10 +82,25 @@ index 0000000..74395a0 + + ++ ++ ++ ++ ++