diff mbox series

[meta-gnome,2/4] gjs: upgrade 1.82.1 -> 1.84.1

Message ID 1742528342-27448-2-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,1/4] flashrom: upgrade 1.4.0 -> 1.5.1 | expand

Commit Message

Mingyu Wang (Fujitsu) March 21, 2025, 3:39 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Support-cross-builds-a-bit-better.patch
0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
refreshed for 1.84.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../gjs/0001-Support-cross-builds-a-bit-better.patch  | 10 +++++-----
 ...ild-Do-not-add-dir-installed-tests-when-inst.patch | 11 +++++------
 .../gjs/{gjs_1.82.1.bb => gjs_1.84.1.bb}              |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.82.1.bb => gjs_1.84.1.bb} (94%)
diff mbox series

Patch

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 @@ 
-From 8e7a25b0171eb60c802168593355354dff7806f5 Mon Sep 17 00:00:00 2001
+From b6996f3683f0a1428657636c372ef7af8d0b43ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:18:47 +0200
 Subject: [PATCH] Support cross builds a bit better
@@ -17,7 +17,7 @@  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index f3081fc..ac958d3 100644
+index a969ce2..1885afc 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
@@ -34,9 +34,9 @@  index f3081fc..ac958d3 100644
  endif
 +endif # not meson.is_cross_build()
  
- have_printf_alternative_int = cc.compiles('''
- #include <stdio.h>
-@@ -656,7 +658,7 @@ subdir('installed-tests')
+ ### Check for external programs ################################################
+ 
+@@ -651,7 +653,7 @@ subdir('installed-tests')
  
  # Note: The test program in test/ needs to be ported
  #       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 @@ 
-From 6a70d3ac658988dda49d51ed8b46584b716a9c7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From d0424474da5d6b6a3360d081886c289852242378 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
+ <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:04:02 +0200
 Subject: [PATCH] meson.build: Do not add dir installed-tests when
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
- <schnitzeltony@gmail.com>
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,10 +23,10 @@  Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index ac958d3..e773508 100644
+index 1885afc..6333c06 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -654,7 +654,9 @@ gi_tests = subproject('gobject-introspection-tests',
+@@ -649,7 +649,9 @@ gi_tests = subproject('gobject-introspection-tests',
      default_options: ['werror=false', 'cairo=true',
          'install_dir=@0@'.format(installed_tests_execdir)])
  
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
similarity index 94%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.82.1.bb
rename to 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"
 
 inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
 
-SRC_URI[archive.sha256sum] = "fb39aa5636576de0e5a1171f56a1a5825e2bd1a69972fb120ba78bd109b5693c"
+SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \