summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch10
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch11
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb (renamed from meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb)2
3 files changed, 11 insertions, 12 deletions
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
index c66d42da62..ab3b85b606 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
@@ -1,4 +1,4 @@
1From 8e7a25b0171eb60c802168593355354dff7806f5 Mon Sep 17 00:00:00 2001 1From b6996f3683f0a1428657636c372ef7af8d0b43ff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Wed, 27 Oct 2021 20:18:47 +0200 3Date: Wed, 27 Oct 2021 20:18:47 +0200
4Subject: [PATCH] Support cross builds a bit better 4Subject: [PATCH] Support cross builds a bit better
@@ -17,7 +17,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
17 1 file changed, 3 insertions(+), 1 deletion(-) 17 1 file changed, 3 insertions(+), 1 deletion(-)
18 18
19diff --git a/meson.build b/meson.build 19diff --git a/meson.build b/meson.build
20index f3081fc..ac958d3 100644 20index a969ce2..1885afc 100644
21--- a/meson.build 21--- a/meson.build
22+++ b/meson.build 22+++ b/meson.build
23@@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with 23@@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
@@ -34,9 +34,9 @@ index f3081fc..ac958d3 100644
34 endif 34 endif
35+endif # not meson.is_cross_build() 35+endif # not meson.is_cross_build()
36 36
37 have_printf_alternative_int = cc.compiles(''' 37 ### Check for external programs ################################################
38 #include <stdio.h> 38
39@@ -656,7 +658,7 @@ subdir('installed-tests') 39@@ -651,7 +653,7 @@ subdir('installed-tests')
40 40
41 # Note: The test program in test/ needs to be ported 41 # Note: The test program in test/ needs to be ported
42 # to Windows before we can build it on Windows. 42 # to Windows before we can build it on Windows.
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
index bca27c33d4..9558ad75e2 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
@@ -1,13 +1,12 @@
1From 6a70d3ac658988dda49d51ed8b46584b716a9c7c Mon Sep 17 00:00:00 2001 1From d0424474da5d6b6a3360d081886c289852242378 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
3 <schnitzeltony@gmail.com>
3Date: Wed, 27 Oct 2021 20:04:02 +0200 4Date: Wed, 27 Oct 2021 20:04:02 +0200
4Subject: [PATCH] meson.build: Do not add dir installed-tests when 5Subject: [PATCH] meson.build: Do not add dir installed-tests when
5MIME-Version: 1.0 6MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 8Content-Transfer-Encoding: 8bit
8 9
9From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
10 <schnitzeltony@gmail.com>
11MIME-Version: 1.0 10MIME-Version: 1.0
12Content-Type: text/plain; charset=UTF-8 11Content-Type: text/plain; charset=UTF-8
13Content-Transfer-Encoding: 8bit 12Content-Transfer-Encoding: 8bit
@@ -24,10 +23,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
24 1 file changed, 3 insertions(+), 1 deletion(-) 23 1 file changed, 3 insertions(+), 1 deletion(-)
25 24
26diff --git a/meson.build b/meson.build 25diff --git a/meson.build b/meson.build
27index ac958d3..e773508 100644 26index 1885afc..6333c06 100644
28--- a/meson.build 27--- a/meson.build
29+++ b/meson.build 28+++ b/meson.build
30@@ -654,7 +654,9 @@ gi_tests = subproject('gobject-introspection-tests', 29@@ -649,7 +649,9 @@ gi_tests = subproject('gobject-introspection-tests',
31 default_options: ['werror=false', 'cairo=true', 30 default_options: ['werror=false', 'cairo=true',
32 'install_dir=@0@'.format(installed_tests_execdir)]) 31 'install_dir=@0@'.format(installed_tests_execdir)])
33 32
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
index fd4e9c6f8a..55bd38c97c 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "mozjs-128 cairo"
7 7
8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script 8inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
9 9
10SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c" 10SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c"
11SRC_URI += " \ 11SRC_URI += " \
12 file://0001-Support-cross-builds-a-bit-better.patch \ 12 file://0001-Support-cross-builds-a-bit-better.patch \
13 file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ 13 file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \