Skip to content

Commit

Permalink
[nemo][xulrunner] Do not load nsHelperAppDlg.js. Fixes JB#44322
Browse files Browse the repository at this point in the history
This removes nsHelperAppDlg.js and .manifest from to build (omni.ja).
The nsHelperAppDlg.js is implemented in embedlite-components.
  • Loading branch information
rainemak committed Jan 30, 2019
1 parent ecd66e3 commit 00d0a88
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
42 changes: 42 additions & 0 deletions rpm/0013-Do-not-load-nsHelperAppDlg.js.-Fixes-JB-44322.patch
@@ -0,0 +1,42 @@
From 926a344537c933736765d6c00071711651aa0fb8 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/13] 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.

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
toolkit/mozapps/downloads/moz.build | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/toolkit/mozapps/downloads/moz.build b/toolkit/mozapps/downloads/moz.build
index a0f5e77b61db..572ba87efd1a 100644
--- a/toolkit/mozapps/downloads/moz.build
+++ b/toolkit/mozapps/downloads/moz.build
@@ -6,14 +6,6 @@

TEST_DIRS += ['tests']

-EXTRA_COMPONENTS += [
- 'nsHelperAppDlg.manifest',
-]
-
-EXTRA_PP_COMPONENTS += [
- 'nsHelperAppDlg.js',
-]
-
EXTRA_JS_MODULES += [
'DownloadLastDir.jsm',
'DownloadPaths.jsm',
@@ -21,4 +13,4 @@ EXTRA_JS_MODULES += [
'DownloadUtils.jsm',
]

-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--
2.20.1

3 changes: 3 additions & 0 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -56,6 +56,8 @@ Patch9: 0009-Bug-1253215-Initialize-RequestSyncService-only-if-it.patch
Patch10: 0010-Don-t-print-errors-from-DataReportingService.patch
Patch11: 0011-Don-t-try-to-access-undefined-app-list-of-AppsServic.patch
Patch12: 0012-xulrunner-Make-fullscreen-enabling-work-as-used-to-w.patch
Patch13: 0013-Do-not-load-nsHelperAppDlg.js.-Fixes-JB-44322.patch

BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(pango)
Expand Down Expand Up @@ -156,6 +158,7 @@ Tests and misc files for xulrunner.
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1

mkdir -p "%BUILD_DIR"
cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig
Expand Down

0 comments on commit 00d0a88

Please sign in to comment.