diff mbox series

[meta-gnome,05/50] gjs: upgrade 1.78.4 -> 1.80.0

Message ID 1710827139-30056-5-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/50] boost-sml: upgrade 1.1.9 -> 1.1.11 | expand

Commit Message

Mingyu Wang (Fujitsu) March 19, 2024, 5:44 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.80.0

Changelog:
=============
- In GNOME 46 and later, platform-specific GLib and Gio APIs have moved
  to the separate libraries GLibUnix, GioUnix, GLibWin32, and GioWin32.
- Closed bugs and merge requests:
  * meson: fix automagic dependency lookup for cairo
  * Deprecate accessing GLibUnix/GLibWin32 APIs through GLib
  * CI: Build newer GLib in debug Docker image
  * Workspace switching performance degradation due to leaked WeakRefs
    in JS
  * GTop.glibtop_get_mountlist invocation causes GNOME Shell Crash
  * Progress towards some performance improvements in accessing GObject
    properties
  * Various maintenance

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../gjs/0001-Support-cross-builds-a-bit-better.patch | 11 +++++------
 ...ld-Do-not-add-dir-installed-tests-when-inst.patch | 12 +++++-------
 .../gjs/{gjs_1.78.4.bb => gjs_1.80.0.bb}             |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.78.4.bb => gjs_1.80.0.bb} (92%)
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 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 @@ 
-From 95cacf345eaec898a47486fc0d33382f303275aa Mon Sep 17 00:00:00 2001
+From 8a78a7996b01aba21377ceb7547da673fd30a391 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
@@ -12,16 +12,15 @@  Content-Transfer-Encoding: 8bit
 Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
 ---
  meson.build | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 961660f..86239a4 100644
+index c9b26d6..3058e8c 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -255,6 +255,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
+@@ -262,6 +262,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
  --disable-debug.''')
  endif
  
@@ -29,7 +28,7 @@  index 961660f..86239a4 100644
  # Check if a minimal SpiderMonkey program compiles, links, and runs. If not,
  # it's most likely the case that SpiderMonkey was configured incorrectly, for
  # example by building mozglue as a shared library.
-@@ -285,6 +286,7 @@ elif minimal_program.returncode() != 0
+@@ -292,6 +293,7 @@ elif minimal_program.returncode() != 0
  failed to execute. Most likely you should build it with a different
  configuration.''' + recommended_configuration)
  endif
@@ -37,7 +36,7 @@  index 961660f..86239a4 100644
  
  have_printf_alternative_int = cc.compiles('''
  #include <stdio.h>
-@@ -683,7 +685,7 @@ subdir('installed-tests')
+@@ -690,7 +692,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 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 @@ 
-From e6889d60891383ce6aa66aa3db30255af58bcf3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+From 29221ae42e424c6100b8c313d2b61801430c872d 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?= <schnitzeltony@gmail.com>
- installed_tests is false
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,16 +14,15 @@  Content-Transfer-Encoding: 8bit
 Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
 ---
  meson.build | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 86239a4..11c04e2 100644
+index 3058e8c..06cf8da 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -681,7 +681,9 @@ endif
+@@ -688,7 +688,9 @@ endif
  
  ### Tests and test setups ######################################################
  
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb
similarity index 92%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb
rename to 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"
 
 inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig
 
-SRC_URI[archive.sha256sum] = "9aec7ab872c2050404907ae94f0ae7abec8a54bd9c894ddb5c2d0f51e932b9a1"
+SRC_URI[archive.sha256sum] = "0f78cd3f0e8eb446517d665e4fde1d66302b0c283bbe87b78e9cbfd4d86ed576"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \