diff options
-rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch | 11 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch | 12 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb (renamed from meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb) | 2 |
3 files changed, 11 insertions, 14 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 8ebc8bad8..12b4b08c7 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 @@ | |||
1 | From 95cacf345eaec898a47486fc0d33382f303275aa Mon Sep 17 00:00:00 2001 | 1 | From 8a78a7996b01aba21377ceb7547da673fd30a391 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Wed, 27 Oct 2021 20:18:47 +0200 | 3 | Date: Wed, 27 Oct 2021 20:18:47 +0200 |
4 | Subject: [PATCH] Support cross builds a bit better | 4 | Subject: [PATCH] Support cross builds a bit better |
@@ -12,16 +12,15 @@ Content-Transfer-Encoding: 8bit | |||
12 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] | 12 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] |
13 | 13 | ||
14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
15 | |||
16 | --- | 15 | --- |
17 | meson.build | 4 +++- | 16 | meson.build | 4 +++- |
18 | 1 file changed, 3 insertions(+), 1 deletion(-) | 17 | 1 file changed, 3 insertions(+), 1 deletion(-) |
19 | 18 | ||
20 | diff --git a/meson.build b/meson.build | 19 | diff --git a/meson.build b/meson.build |
21 | index 961660f..86239a4 100644 | 20 | index c9b26d6..3058e8c 100644 |
22 | --- a/meson.build | 21 | --- a/meson.build |
23 | +++ b/meson.build | 22 | +++ b/meson.build |
24 | @@ -255,6 +255,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with | 23 | @@ -262,6 +262,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with |
25 | --disable-debug.''') | 24 | --disable-debug.''') |
26 | endif | 25 | endif |
27 | 26 | ||
@@ -29,7 +28,7 @@ index 961660f..86239a4 100644 | |||
29 | # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, | 28 | # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, |
30 | # it's most likely the case that SpiderMonkey was configured incorrectly, for | 29 | # it's most likely the case that SpiderMonkey was configured incorrectly, for |
31 | # example by building mozglue as a shared library. | 30 | # example by building mozglue as a shared library. |
32 | @@ -285,6 +286,7 @@ elif minimal_program.returncode() != 0 | 31 | @@ -292,6 +293,7 @@ elif minimal_program.returncode() != 0 |
33 | failed to execute. Most likely you should build it with a different | 32 | failed to execute. Most likely you should build it with a different |
34 | configuration.''' + recommended_configuration) | 33 | configuration.''' + recommended_configuration) |
35 | endif | 34 | endif |
@@ -37,7 +36,7 @@ index 961660f..86239a4 100644 | |||
37 | 36 | ||
38 | have_printf_alternative_int = cc.compiles(''' | 37 | have_printf_alternative_int = cc.compiles(''' |
39 | #include <stdio.h> | 38 | #include <stdio.h> |
40 | @@ -683,7 +685,7 @@ subdir('installed-tests') | 39 | @@ -690,7 +692,7 @@ subdir('installed-tests') |
41 | 40 | ||
42 | # Note: The test program in test/ needs to be ported | 41 | # Note: The test program in test/ needs to be ported |
43 | # 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 f05e52c38..e932f06d2 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 @@ | |||
1 | From e6889d60891383ce6aa66aa3db30255af58bcf3c Mon Sep 17 00:00:00 2001 | 1 | From 29221ae42e424c6100b8c313d2b61801430c872d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= |
3 | <schnitzeltony@gmail.com> | ||
3 | Date: Wed, 27 Oct 2021 20:04:02 +0200 | 4 | Date: Wed, 27 Oct 2021 20:04:02 +0200 |
4 | Subject: [PATCH] meson.build: Do not add dir installed-tests when | 5 | Subject: [PATCH] meson.build: Do not add dir installed-tests when |
5 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 8 | Content-Transfer-Encoding: 8bit |
8 | 9 | ||
9 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
10 | installed_tests is false | ||
11 | MIME-Version: 1.0 | 10 | MIME-Version: 1.0 |
12 | Content-Type: text/plain; charset=UTF-8 | 11 | Content-Type: text/plain; charset=UTF-8 |
13 | Content-Transfer-Encoding: 8bit | 12 | Content-Transfer-Encoding: 8bit |
@@ -15,16 +14,15 @@ Content-Transfer-Encoding: 8bit | |||
15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] | 14 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] |
16 | 15 | ||
17 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 16 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
18 | |||
19 | --- | 17 | --- |
20 | meson.build | 4 +++- | 18 | meson.build | 4 +++- |
21 | 1 file changed, 3 insertions(+), 1 deletion(-) | 19 | 1 file changed, 3 insertions(+), 1 deletion(-) |
22 | 20 | ||
23 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
24 | index 86239a4..11c04e2 100644 | 22 | index 3058e8c..06cf8da 100644 |
25 | --- a/meson.build | 23 | --- a/meson.build |
26 | +++ b/meson.build | 24 | +++ b/meson.build |
27 | @@ -681,7 +681,9 @@ endif | 25 | @@ -688,7 +688,9 @@ endif |
28 | 26 | ||
29 | ### Tests and test setups ###################################################### | 27 | ### Tests and test setups ###################################################### |
30 | 28 | ||
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb index c1d1948d6..602149fad 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb | |||
@@ -7,7 +7,7 @@ DEPENDS = "mozjs-115 cairo" | |||
7 | 7 | ||
8 | inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig | 8 | inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig |
9 | 9 | ||
10 | SRC_URI[archive.sha256sum] = "9aec7ab872c2050404907ae94f0ae7abec8a54bd9c894ddb5c2d0f51e932b9a1" | 10 | SRC_URI[archive.sha256sum] = "0f78cd3f0e8eb446517d665e4fde1d66302b0c283bbe87b78e9cbfd4d86ed576" |
11 | SRC_URI += " \ | 11 | SRC_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 \ |