From ad765ec7ac1559f8f6983c0be2306cfa0e3b5e96 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Sun, 23 Jun 2019 09:52:42 -0500 Subject: [PATCH 1/9] Fix appimage build --- browser/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/build.sh b/browser/build.sh index 38ce831..0286baa 100755 --- a/browser/build.sh +++ b/browser/build.sh @@ -24,6 +24,9 @@ printf "\nInstalling script dependencies\n"; apt update; apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev -y; +# Loads the FUSE kernel module +sudo modprobe fuse; + printf "\n\n---------------------------------- ICON GENERATION ------------------------------------------\n"; printf "\nGenerating icons from $ICON_FOLDER and moving to $BRANDING_FOLDER\n"; From 47f54dc70dbc25a639e86d7f436a595a713e6699 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Sun, 23 Jun 2019 14:05:21 -0500 Subject: [PATCH 2/9] fix appimage build --- browser/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/build.sh b/browser/build.sh index 0286baa..6df8b71 100755 --- a/browser/build.sh +++ b/browser/build.sh @@ -22,7 +22,7 @@ printf "APPIMAGE_RESOURCE_FOLDER: $APPIMAGE_RESOURCE_FOLDER\n"; # Installs some needed dependencies printf "\nInstalling script dependencies\n"; apt update; -apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev -y; +apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev kmod -y; # Loads the FUSE kernel module sudo modprobe fuse; From bd3ef61536ca3c89aae65e04dfe18386e01bd139 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Sun, 23 Jun 2019 23:33:59 -0500 Subject: [PATCH 3/9] Fix appimage build --- browser/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/build.sh b/browser/build.sh index 6df8b71..ea3ca00 100755 --- a/browser/build.sh +++ b/browser/build.sh @@ -25,6 +25,7 @@ apt update; apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev kmod -y; # Loads the FUSE kernel module +sudo depmod; sudo modprobe fuse; printf "\n\n---------------------------------- ICON GENERATION ------------------------------------------\n"; From fbd1b2115bc7bd664dde7596c90cca8e8dadc720 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 09:04:36 -0500 Subject: [PATCH 4/9] add gitter badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9489112..08d4b19 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@

+[![Gitter](https://badges.gitter.im/librewolf-community/community.svg)](https://gitter.im/librewolf-community/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) From c2bd4c403c3ccb15616797ba77ce055d95e6f6bf Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 09:08:53 -0500 Subject: [PATCH 5/9] Update gitter link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08d4b19..c225b97 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

-[![Gitter](https://badges.gitter.im/librewolf-community/community.svg)](https://gitter.im/librewolf-community/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/librewolf-community/librewolf.svg)](https://gitter.im/librewolf-community/librewolf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) From 4e906ab4e0bd0a0f73bda3832913766253bc07e3 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 10:23:45 -0500 Subject: [PATCH 6/9] Use new env var to disable dedicated profiles --- browser/resources/appimage/AppRun | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/resources/appimage/AppRun b/browser/resources/appimage/AppRun index 3d4fb44..756f291 100755 --- a/browser/resources/appimage/AppRun +++ b/browser/resources/appimage/AppRun @@ -8,6 +8,6 @@ export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}" export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}" export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}" -export SNAP_NAME="firefox" +export MOZ_LEGACY_PROFILES=1 EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1) exec "${EXEC}" "$@" From 39b9a850f6ef61b003114916bfd8e6fdbebab390 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 10:37:44 -0500 Subject: [PATCH 7/9] Compile without pocket --- .../source_files/browser/components/moz.build | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 browser/resources/source_files/browser/components/moz.build diff --git a/browser/resources/source_files/browser/components/moz.build b/browser/resources/source_files/browser/components/moz.build new file mode 100644 index 0000000..cb016ca --- /dev/null +++ b/browser/resources/source_files/browser/components/moz.build @@ -0,0 +1,101 @@ + +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +with Files("**"): + BUG_COMPONENT = ("Firefox", "General") + +with Files("distribution.js"): + BUG_COMPONENT = ("Firefox", "Distributions") + +with Files("tests/**"): + BUG_COMPONENT = ("Firefox", "General") + +with Files("tests/browser/browser_bug538331.js"): + BUG_COMPONENT = ("Toolkit", "Application Update") + +with Files("tests/browser/browser_contentpermissionprompt.js"): + BUG_COMPONENT = ("Firefox", "Site Identity and Permission Panels") + +with Files("tests/unit/test_distribution.js"): + BUG_COMPONENT = ("Firefox", "Distributions") + +with Files("safebrowsing/**"): + BUG_COMPONENT = ("Toolkit", "Safe Browsing") + +with Files('controlcenter/**'): + BUG_COMPONENT = ('Firefox', 'General') + + +DIRS += [ + 'about', + 'attribution', + 'contextualidentity', + 'customizableui', + 'dirprovider', + 'downloads', + 'enterprisepolicies', + 'extensions', + 'library', + 'migration', + 'newtab', + 'originattributes', + 'places', + #'pocket', + 'preferences', + 'privatebrowsing', + 'protocolhandler', + 'resistfingerprinting', + 'search', + 'sessionstore', + 'shell', + 'syncedtabs', + 'uitour', + 'urlbar', + 'translation', +] + +DIRS += ['build'] + +if CONFIG['NIGHTLY_BUILD']: + DIRS += [ + 'aboutconfig', + 'payments', + ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + DIRS += ['touchbar'] + +XPIDL_SOURCES += [ + 'nsIBrowserHandler.idl', +] + +XPIDL_MODULE = 'browsercompsbase' + +XPCOM_MANIFESTS += [ + 'components.conf', +] + +EXTRA_COMPONENTS += [ + 'BrowserComponents.manifest', + 'tests/startupRecorder.js', + 'tests/testComponents.manifest', +] + +EXTRA_JS_MODULES += [ + 'BrowserContentHandler.jsm', + 'BrowserGlue.jsm', + 'distribution.js', +] + +BROWSER_CHROME_MANIFESTS += [ + 'safebrowsing/content/test/browser.ini', + 'tests/browser/browser.ini' +] + +XPCSHELL_TESTS_MANIFESTS += [ + 'tests/unit/xpcshell.ini' +] From d7cd593b59ed3b8254753e3f8711b8fe58475d88 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 17:41:05 -0500 Subject: [PATCH 8/9] Disable telemetry, addon singing and DRM --- browser/resources/source_files/mozconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/browser/resources/source_files/mozconfig b/browser/resources/source_files/mozconfig index de55258..446caba 100644 --- a/browser/resources/source_files/mozconfig +++ b/browser/resources/source_files/mozconfig @@ -10,3 +10,17 @@ ac_add_options --with-distribution-id=io.github.librewolf # enables ALSA ac_add_options --enable-alsa + + +MOZ_CRASHREPORTER=0 +MOZ_DATA_REPORTING=0 +MOZ_SERVICES_HEALTHREPORT=0 +MOZ_TELEMETRY_REPORTING=0 + +MOZ_REQUIRE_SIGNING=0 + + +MOZ_ADOBE_EME=0 + + + From 426a0af6b91f95f346fcd7baa57bb300ea1a84ee Mon Sep 17 00:00:00 2001 From: BeatLink Date: Mon, 24 Jun 2019 18:25:03 -0500 Subject: [PATCH 9/9] Fix compile options --- browser/resources/source_files/mozconfig | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/browser/resources/source_files/mozconfig b/browser/resources/source_files/mozconfig index 446caba..99b0103 100644 --- a/browser/resources/source_files/mozconfig +++ b/browser/resources/source_files/mozconfig @@ -6,21 +6,20 @@ mk_add_options MOZ_OBJDIR=./obj_BUILD_OUTPUT # Setting the branding options ac_add_options --with-branding=browser/branding/librewolf -ac_add_options --with-distribution-id=io.github.librewolf +ac_add_options --with-distribution-id=io.gitlab.librewolf # enables ALSA ac_add_options --enable-alsa -MOZ_CRASHREPORTER=0 -MOZ_DATA_REPORTING=0 -MOZ_SERVICES_HEALTHREPORT=0 -MOZ_TELEMETRY_REPORTING=0 +mk_add_options MOZ_CRASHREPORTER=0 +mk_add_options MOZ_DATA_REPORTING=0 +mk_add_options MOZ_SERVICES_HEALTHREPORT=0 +mk_add_options MOZ_TELEMETRY_REPORTING=0 -MOZ_REQUIRE_SIGNING=0 +mk_add_options MOZ_REQUIRE_SIGNING=0 - -MOZ_ADOBE_EME=0 +mk_add_options MOZ_ADOBE_EME=0