Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup build configurations and patches
  • Loading branch information
rainemak committed Feb 4, 2020
1 parent 9487ee2 commit ef1e408
Show file tree
Hide file tree
Showing 21 changed files with 123 additions and 157 deletions.
3 changes: 2 additions & 1 deletion embedding/embedlite/config/mozconfig.merqtxulrunner
Expand Up @@ -12,7 +12,7 @@ ac_add_options --prefix=/usr

ac_add_options --with-system-jpeg
ac_add_options --with-system-nspr
# ac_add_options --with-system-nss
ac_add_options --with-system-nss
ac_add_options --disable-ffmpeg
ac_add_options --enable-system-sqlite

Expand All @@ -36,6 +36,7 @@ ac_add_options --disable-updater
ac_add_options --disable-gamepad
ac_add_options --disable-printing
ac_add_options --disable-crashreporter
ac_add_options --with-crashreporter-enable-percent="00"

# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
# ac_add_options --enable-warnings-as-errors
Expand Down
7 changes: 7 additions & 0 deletions embedding/embedlite/embedding.js
Expand Up @@ -400,3 +400,10 @@ pref("full-screen-api.ignore-widgets", true);
// Remove and test once mozilla bug #1158392 is fixed.
// Test cases are mentioned in https://bugzilla.mozilla.org/show_bug.cgi?id=1158392#c3
pref("layout.scroll.root-frame-containers", true);

// Disable health report / telemetry services explicitly.
pref("toolkit.telemetry.unified", false);
pref("toolkit.telemetry.enabled", false);
pref("experiments.enabled", false);
pref("experiments.supported", false);
pref("datareporting.healthreport.service.enabled", false);
6 changes: 3 additions & 3 deletions rpm/0001-Supply-source-uri-to-gstreamer-pipeline.patch
@@ -1,7 +1,7 @@
From ed7d627063ded032ea0efc1147d779b907c519b5 Mon Sep 17 00:00:00 2001
From f6511020aa5c133a007a4fbadf018837a6629621 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
Date: Mon, 11 May 2015 13:10:46 +0300
Subject: [PATCH 01/15] Supply source uri to gstreamer pipeline
Subject: [PATCH 01/17] Supply source uri to gstreamer pipeline

Backported SHA1 aae344839920dd17bddfd0ef822cc5bc36ea2d9f
from esr38.
Expand Down Expand Up @@ -280,5 +280,5 @@ index 9460c56ff437..b63a761b949d 100644

// For a complete list of file types, see http://www.ftyps.com/index.html
--
2.20.1
2.24.1

6 changes: 3 additions & 3 deletions rpm/0002-Workaround-for-late-access-message-loop.patch
@@ -1,7 +1,7 @@
From dc6bbb4d3a96d56a3950d0b75c379a4bb3489cf5 Mon Sep 17 00:00:00 2001
From 742457bea87cd7ed6d88c7bcf4817afff7ce5acd Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
Date: Mon, 11 May 2015 13:12:04 +0300
Subject: [PATCH 02/15] Workaround for late access message loop.
Subject: [PATCH 02/17] Workaround for late access message loop.

See bug JB10381

Expand All @@ -25,5 +25,5 @@ index 30791953fb32..1f0b70a27430 100644
bool nestableTasksAllowed = loop->NestableTasksAllowed();

--
2.20.1
2.24.1

@@ -1,7 +1,7 @@
From baec7db68d02331e7b23fcfcfad8b3fc5ec7dbe4 Mon Sep 17 00:00:00 2001
From cf391f6b6d1cbcee0759ea4db2892fd04e2eca45 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 21 Dec 2016 14:35:15 +0200
Subject: [PATCH 03/15] Revert "Bug 1114594 - Remove promptForSaveToFile in
Subject: [PATCH 03/17] Revert "Bug 1114594 - Remove promptForSaveToFile in
favor of promptForSaveToFileAsync. r=paolo"

This reverts commit f5fe5678d69887fd2ffce1729028d0a2e676be2f.
Expand Down Expand Up @@ -229,5 +229,5 @@ index 35dcf5aaba99..a4cad9136ed2 100644

// Override the download-manager-ui to prevent anyone from trying to open
--
2.20.1
2.24.1

12 changes: 6 additions & 6 deletions rpm/0004-Define-HAS_NEMO_RESOURCE-in-config.patch
@@ -1,7 +1,7 @@
From f5331c8d25b447c3cf9a6b357816cae1a1b288ba Mon Sep 17 00:00:00 2001
From e4aae3c0f47aee0bc2e083639d6172d53c841554 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
Date: Mon, 11 May 2015 13:13:03 +0300
Subject: [PATCH 04/15] Define HAS_NEMO_RESOURCE in config
Subject: [PATCH 04/17] Define HAS_NEMO_RESOURCE in config

See bugs JB10947, JB30305, and JB30517

Expand All @@ -11,10 +11,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
1 file changed, 4 insertions(+)

diff --git a/configure.in b/configure.in
index 82cd65a00559..7f5ce1a0f369 100644
index 3538538bac39..a3ba8b2f6ae2 100644
--- a/configure.in
+++ b/configure.in
@@ -5659,6 +5659,9 @@ if test -n "$MOZ_GSTREAMER"; then
@@ -5661,6 +5661,9 @@ if test -n "$MOZ_GSTREAMER"; then
AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
fi

Expand All @@ -24,7 +24,7 @@ index 82cd65a00559..7f5ce1a0f369 100644
_SAVE_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
@@ -5671,6 +5674,7 @@ if test -n "$MOZ_GSTREAMER"; then
@@ -5673,6 +5676,7 @@ if test -n "$MOZ_GSTREAMER"; then
fi

AC_SUBST(MOZ_GSTREAMER)
Expand All @@ -33,5 +33,5 @@ index 82cd65a00559..7f5ce1a0f369 100644

if test -n "$MOZ_GSTREAMER"; then
--
2.20.1
2.24.1

@@ -1,7 +1,7 @@
From a9b59c2bc3e49f4dd913c954f562b3880f962b35 Mon Sep 17 00:00:00 2001
From c282851b1cc387f79f6a67a33be450e668260f73 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
Date: Mon, 11 May 2015 13:17:36 +0300
Subject: [PATCH 05/15] Limit surface area rather than width and height
Subject: [PATCH 05/17] Limit surface area rather than width and height

See bug JB26935

Expand All @@ -27,5 +27,5 @@ index 91043722c4c6..ba1d4688c14d 100644

cairo_format_t
--
2.20.1
2.24.1

@@ -1,7 +1,7 @@
From b69fa99fccc24c451585240f539af13aefba0f97 Mon Sep 17 00:00:00 2001
From ef04eb022fcfcd473f58a3fda98e28d68dcd5348 Mon Sep 17 00:00:00 2001
From: Piotr Tworek <piotr.tworek@jollamobile.com>
Date: Wed, 8 Jul 2015 16:13:11 +0200
Subject: [PATCH 06/15] Make TextureImageEGL hold a reference to GLContext.
Subject: [PATCH 06/17] Make TextureImageEGL hold a reference to GLContext.
Fixes JB#30109.

Due to rather non standard view shutdown procedure of EmbedLite port
Expand Down Expand Up @@ -38,5 +38,5 @@ index 472718e2efd2..61d873a79a90 100644
gfx::IntRect mUpdateRect;
gfx::SurfaceFormat mUpdateFormat;
--
2.20.1
2.24.1

6 changes: 3 additions & 3 deletions rpm/0007-Limit-maximum-scale-to-4x.-Fixes-JB-25377.patch
@@ -1,7 +1,7 @@
From bd3b45457a861ebd89de231925a28df8a43542f3 Mon Sep 17 00:00:00 2001
From ca43c703dd35e55599f9200555e0f4e1500d2b5e Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Mon, 12 Oct 2015 16:22:59 +0300
Subject: [PATCH 07/15] Limit maximum scale to 4x. Fixes JB#25377
Subject: [PATCH 07/17] Limit maximum scale to 4x. Fixes JB#25377

The default zoom contraints now matches to the EmbedContentController.

Expand All @@ -24,5 +24,5 @@ index facba7c420be..c4e9e2ad0285 100644
/**
* Minimum zoom amount, always used, even if a page asks for lower.
--
2.20.1
2.24.1

4 changes: 2 additions & 2 deletions rpm/0008-Adapt-LoginManager-to-EmbedLite.-Fixes-JB21980.patch
@@ -1,4 +1,4 @@
From 4a1ff2734a8fe2c557245edb7fde7c48d836540a Mon Sep 17 00:00:00 2001
From 6812cabf5325fb2f3fe77cf82250e7ec3bc8b6a5 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
Date: Wed, 28 Oct 2015 16:07:36 +0200
Subject: [PATCH 08/17] Adapt LoginManager to EmbedLite. Fixes JB21980
Expand Down Expand Up @@ -63,5 +63,5 @@ index 1d3d3c367a6e..873426b995aa 100644
\ No newline at end of file
+category healthreport-js-provider-default PasswordsMetricsProvider resource://gre/modules/LoginManagerParent.jsm
--
2.20.1
2.24.1

@@ -1,7 +1,7 @@
From 930ef6935fdafe2146a844f8a57993393fb8be75 Mon Sep 17 00:00:00 2001
From e231bc8eeeadc5009f18766c387a8525c28e8d2f Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 3 Mar 2016 18:30:16 +0100
Subject: [PATCH 09/15] Bug 1253215 - Initialize RequestSyncService only if its
Subject: [PATCH 09/17] Bug 1253215 - Initialize RequestSyncService only if its
pref is enabled, r=ehsan

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
Expand All @@ -25,5 +25,5 @@ index 835010922ab0..4b20868f9185 100644
ppmm.addMessageListener(msgName, this);
}).bind(this));
--
2.20.1
2.24.1

6 changes: 3 additions & 3 deletions rpm/0010-Don-t-print-errors-from-DataReportingService.patch
@@ -1,7 +1,7 @@
From 76d707703a23ff9a1b69763d38f481232ff8310f Mon Sep 17 00:00:00 2001
From b434caf58c02c2e0680e5b418702335de07269c2 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Thu, 16 Jun 2016 17:35:58 +0300
Subject: [PATCH 10/15] Don't print errors from DataReportingService
Subject: [PATCH 10/17] Don't print errors from DataReportingService

Will be removed in Gecko 46. See bug:
https://bugzilla.mozilla.org/show_bug.cgi?id=1234522
Expand All @@ -25,5 +25,5 @@ index 4dd318fd3ee9..624394c0927c 100644
}

--
2.20.1
2.24.1

@@ -1,7 +1,7 @@
From 363c4ae1daf65d308971b7af4a57e2c7040d3538 Mon Sep 17 00:00:00 2001
From 2f2986b69647da4f698e38a9a6264e173f41dc2b Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Fri, 1 Jul 2016 10:39:47 +0300
Subject: [PATCH 11/15] Don't try to access undefined app list of
Subject: [PATCH 11/17] Don't try to access undefined app list of
AppsServiceChild. Fixes MER#1609

When accessing e.g. imgur.com for the first time list build up fails
Expand Down Expand Up @@ -48,5 +48,5 @@ index cc0675fd8abc..533d7ddba701 100644
},

--
2.20.1
2.24.1

@@ -1,8 +1,8 @@
From d291c69ef662fd7b77946f764f63474a86d9115c Mon Sep 17 00:00:00 2001
From 1195ab1212ec4c94a2c54fa5e764688339d4c158 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Thu, 10 Jan 2019 15:21:24 +0200
Subject: [PATCH 12/12] [xulrunner] Make fullscreen enabling work as used to
with pref full-screen-api.content-only. Fixes JB#44129
Subject: [PATCH 12/17] Make fullscreen enabling work as used to with pref
full-screen-api.content-only. Fixes JB#44129

We don't have chrome from doc shell point of view. This commit
sha1 3116f3bf53df offends fullscreen API to work without chrome
Expand Down Expand Up @@ -36,5 +36,5 @@ index 080b0302f021..c90f4271765f 100644
// If we are already in full screen mode, just return.
if (mFullScreen == aFullScreen)
--
2.20.1
2.24.1

6 changes: 3 additions & 3 deletions rpm/0013-Do-not-load-nsHelperAppDlg.js.-Fixes-JB-44322.patch
@@ -1,7 +1,7 @@
From 3009036bb7c86065ec974b67f5059a6bba2549ff Mon Sep 17 00:00:00 2001
From 50e1a70f0ae776309e61e06b1cd5a052131a8871 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 30 Jan 2019 14:26:31 +0200
Subject: [PATCH 13/15] Do not load nsHelperAppDlg.js. Fixes JB#44322
Subject: [PATCH 13/17] Do not load nsHelperAppDlg.js. Fixes JB#44322

This removes nsHelperAppDlg.js and .manifest from to build (omni.ja).
The nsHelperAppDlg.js is implemented in embedlite-components.
Expand Down Expand Up @@ -38,5 +38,5 @@ index a0f5e77b61db..572ba87efd1a 100644
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--
2.20.1
2.24.1

6 changes: 3 additions & 3 deletions rpm/0014-Embedlite-doesn-t-have-prompter-implementation.patch
@@ -1,7 +1,7 @@
From 26305088c5584c1fb14a688cf66f00877a0caabe Mon Sep 17 00:00:00 2001
From 0932705947eb5be8ef7608318e073897fbd982df Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 30 Jan 2019 15:42:27 +0200
Subject: [PATCH 14/15] Embedlite doesn't have prompter implementation
Subject: [PATCH 14/17] Embedlite doesn't have prompter implementation

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
Expand All @@ -22,5 +22,5 @@ index 29ec9e01303c..693e8007ef61 100644
this._prompter = null;
} else {
--
2.20.1
2.24.1

@@ -1,8 +1,8 @@
From 2b0fab2818c3474373d6c6c127e3b2541b27d96f Mon Sep 17 00:00:00 2001
From 2fe684b346ef5bc1c9a912e6cfd4bc7c642cc28b Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 26 Feb 2019 11:58:41 +0200
Subject: [PATCH 15/15] [xulrunner] Disable SiteSpecificUserAgent.js from the
build. Contributes to JB#39252
Subject: [PATCH 15/17] Disable SiteSpecificUserAgent.js from the build.
Contributes to JB#39252

As both "general.useragent.override" and nsISiteSpecificUserAgent
are used and EmbedLite Components provides a UserAgentOverrideHelper
Expand Down Expand Up @@ -51,5 +51,5 @@ index 3c5ba1d8d7f0..2912ae138f23 100644
'SiteSpecificUserAgent.js',
'SiteSpecificUserAgent.manifest',
--
2.20.1
2.24.1

60 changes: 60 additions & 0 deletions rpm/0016-Cleanup-build-configuration.-Fixes-JB-44612.patch
@@ -0,0 +1,60 @@
From 8c87b6aed048fbd6f8776fcfd58b24f5972e7b23 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 26 Mar 2019 15:43:30 +0200
Subject: [PATCH 16/17] Cleanup build configuration. Fixes JB#44612

[nemo][embedlite] Disable telemetry / health / sync services. Fixes JB#44612

Also Marionette is now disabled

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
configure.in | 2 +-
xulrunner/confvars.sh | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index a3ba8b2f6ae2..872b5b2cb347 100644
--- a/configure.in
+++ b/configure.in
@@ -8435,7 +8435,7 @@ fi
dnl
dnl Always build Marionette if not Android or B2G
dnl
-if test "$OS_TARGET" != Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
+if test "$OS_TARGET" != Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk" -a x"$MOZ_WIDGET_TOOLKIT" != x"qt"; then
AC_DEFINE(ENABLE_MARIONETTE)
fi
AC_SUBST(ENABLE_MARIONETTE)
diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
index 4b2131d083bf..eca5c51dcacd 100755
--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -5,18 +5,18 @@

MOZ_APP_NAME=xulrunner
MOZ_APP_DISPLAYNAME=XULRunner
-MOZ_UPDATER=1
+MOZ_UPDATER=
MOZ_XULRUNNER=1
MOZ_CHROME_FILE_FORMAT=omni
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_EXTENSIONS_DEFAULT=" gio"
MOZ_URL_CLASSIFIER=1
-MOZ_SERVICES_COMMON=1
-MOZ_SERVICES_CRYPTO=1
-MOZ_SERVICES_METRICS=1
-MOZ_SERVICES_SYNC=1
+MOZ_SERVICES_COMMON=
+MOZ_SERVICES_CRYPTO=
+MOZ_SERVICES_METRICS=
+MOZ_SERVICES_SYNC=
MOZ_MEDIA_NAVIGATOR=1
MOZ_USE_NATIVE_POPUP_WINDOWS=1
MOZ_PLACES=
-MOZ_SERVICES_HEALTHREPORT=1
+MOZ_SERVICES_HEALTHREPORT=
MOZ_DISABLE_EXPORT_JS=1
--
2.24.1

0 comments on commit ef1e408

Please sign in to comment.