[gnome-build-meta/abderrahim/mozjs78] freedesktop-sdk.bst: add a mozjs patch needed by gjs



commit 0c9ac18a0035c80740ef079e17c212b5bc53e32a
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Aug 12 08:39:36 2020 +0100

    freedesktop-sdk.bst: add a mozjs patch needed by gjs

 elements/freedesktop-sdk.bst                       |   2 +
 ...mozjs.bst-add-patch-for-API-needed-by-gjs.patch | 138 +++++++++++++++++++++
 2 files changed, 140 insertions(+)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 92807534..259a215d 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -4,6 +4,8 @@ sources:
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
   track: master
   track-tags: true
+- kind: patch
+  path: files/0001-components-mozjs.bst-add-patch-for-API-needed-by-gjs.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/files/0001-components-mozjs.bst-add-patch-for-API-needed-by-gjs.patch 
b/files/0001-components-mozjs.bst-add-patch-for-API-needed-by-gjs.patch
new file mode 100644
index 00000000..e59c8683
--- /dev/null
+++ b/files/0001-components-mozjs.bst-add-patch-for-API-needed-by-gjs.patch
@@ -0,0 +1,138 @@
+From 301d8e1d02967ea60a8cebf0b7aef1ab83501318 Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <akitouni gnome org>
+Date: Tue, 11 Aug 2020 22:08:28 +0100
+Subject: [PATCH] components/mozjs.bst: add patch for API needed by gjs
+
+This patch was accepted upstream
+---
+ elements/components/mozjs.bst         |   2 +
+ patches/mozjs/code-coverage-API.patch | 107 ++++++++++++++++++++++++++
+ 2 files changed, 109 insertions(+)
+ create mode 100644 patches/mozjs/code-coverage-API.patch
+
+diff --git a/elements/components/mozjs.bst b/elements/components/mozjs.bst
+index b4fe0258d..8b7cc75f4 100644
+--- a/elements/components/mozjs.bst
++++ b/elements/components/mozjs.bst
+@@ -63,3 +63,5 @@ sources:
+   ref: cc5d177899899b25c0d37d55592962e2dfa1666e784825d4de04bf53bb497309
+ - kind: patch
+   path: patches/mozjs/fix-arm-build.patch
++- kind: patch
++  path: patches/mozjs/code-coverage-API.patch
+diff --git a/patches/mozjs/code-coverage-API.patch b/patches/mozjs/code-coverage-API.patch
+new file mode 100644
+index 000000000..53e947561
+--- /dev/null
++++ b/patches/mozjs/code-coverage-API.patch
+@@ -0,0 +1,107 @@
++From e5a2eb99f653ae03c67e536df1d55d265a0a1605 Mon Sep 17 00:00:00 2001
++From: Evan Welsh <contact evanwelsh com>
++Date: Mon, 10 Aug 2020 13:17:36 -0500
++Subject: [PATCH] Bug 1654696 - Implement code coverage JSAPI.
++ r=nbp,ptomato,jwalden
++
++---
++ js/public/experimental/CodeCoverage.h | 25 +++++++++++++++++++++++++
++ js/src/jsfriendapi.cpp                |  3 +++
++ js/src/moz.build                      |  1 +
++ js/src/shell/js.cpp                   | 11 ++++++-----
++ 4 files changed, 35 insertions(+), 5 deletions(-)
++ create mode 100644 js/public/experimental/CodeCoverage.h
++
++diff --git a/js/public/experimental/CodeCoverage.h b/js/public/experimental/CodeCoverage.h
++new file mode 100644
++index 000000000..06cc0c9ca
++--- /dev/null
+++++ b/js/public/experimental/CodeCoverage.h
++@@ -0,0 +1,25 @@
+++/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+++ * vim: set ts=8 sts=2 et sw=2 tw=80:
+++ * 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/. */
+++
+++#ifndef js_experimental_CodeCoverage_h
+++#define js_experimental_CodeCoverage_h
+++
+++#include "jstypes.h"     // JS_FRIEND_API
+++
+++struct JS_PUBLIC_API JSContext;
+++
+++namespace js {
+++
+++/**
+++ * Enable the collection of lcov code coverage metrics.
+++ * Must be called before a runtime is created and before any calls to
+++ * GetCodeCoverageSummary.
+++ */
+++extern JS_FRIEND_API void EnableCodeCoverage();
+++
+++}  // namespace js
+++
+++#endif  // js_experimental_CodeCoverage_h
++diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
++index af7a03bd4..5f20c6576 100644
++--- a/js/src/jsfriendapi.cpp
+++++ b/js/src/jsfriendapi.cpp
++@@ -20,6 +20,7 @@
++ #include "gc/PublicIterators.h"
++ #include "gc/WeakMap.h"
++ #include "js/CharacterEncoding.h"
+++#include "js/experimental/CodeCoverage.h"  // js::EnableCodeCoverage
++ #include "js/Printf.h"
++ #include "js/Proxy.h"
++ #include "js/Wrapper.h"
++@@ -1465,6 +1466,8 @@ JS_FRIEND_API void js::EnableAccessValidation(JSContext* cx, bool enabled) {
++   cx->enableAccessValidation = enabled;
++ }
++ 
+++JS_FRIEND_API void js::EnableCodeCoverage() { js::coverage::EnableLCov(); }
+++
++ JS_FRIEND_API void js::SetRealmValidAccessPtr(JSContext* cx,
++                                               JS::HandleObject global,
++                                               bool* accessp) {
++diff --git a/js/src/moz.build b/js/src/moz.build
++index deb15d83a..b4e9e2b02 100755
++--- a/js/src/moz.build
+++++ b/js/src/moz.build
++@@ -210,6 +210,7 @@ EXPORTS.js += [
++ ]
++ 
++ EXPORTS.js.experimental += [
+++    '../public/experimental/CodeCoverage.h',
++     '../public/experimental/SourceHook.h',
++ ]
++ 
++diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
++index 4b3f545e6..252dd24f0 100644
++--- a/js/src/shell/js.cpp
+++++ b/js/src/shell/js.cpp
++@@ -104,10 +104,11 @@
++ #include "js/CompileOptions.h"
++ #include "js/ContextOptions.h"  // JS::ContextOptions{,Ref}
++ #include "js/Debug.h"
++-#include "js/Equality.h"                 // JS::SameValue
++-#include "js/ErrorReport.h"              // JS::PrintError
++-#include "js/Exception.h"                // JS::StealPendingExceptionStack
++-#include "js/experimental/SourceHook.h"  // js::{Set,Forget,}SourceHook
+++#include "js/Equality.h"                   // JS::SameValue
+++#include "js/ErrorReport.h"                // JS::PrintError
+++#include "js/Exception.h"                  // JS::StealPendingExceptionStack
+++#include "js/experimental/CodeCoverage.h"  // js::EnableCodeCoverage
+++#include "js/experimental/SourceHook.h"    // js::{Set,Forget,}SourceHook
++ #include "js/GCVector.h"
++ #include "js/Initialization.h"
++ #include "js/JSON.h"
++@@ -11416,7 +11417,7 @@ int main(int argc, char** argv, char** envp) {
++ 
++   enableCodeCoverage = op.getBoolOption("code-coverage");
++   if (enableCodeCoverage) {
++-    coverage::EnableLCov();
+++    js::EnableCodeCoverage();
++   }
++ 
++ #ifdef JS_WITHOUT_NSPR
+-- 
+2.28.0
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]