Skip to contentSkip to conversation

gjs: upgrade 1.71.1 -> 1.72.0

PATCH New Wang Mingyu 1 participant 4 messages Mar 22, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gjs: upgrade 1.71.1 -> 1.72.0

---
 meta-gnome/recipes-gnome/gjs/{gjs_1.71.1.bb => gjs_1.72.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gjs/{gjs_1.71.1.bb => gjs_1.72.0.bb} (92%)
meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb renamed from meta-gnome/recipes-gnome/gjs/gjs_1.71.1.bb +1 -1
similarity index 92%
rename from meta-gnome/recipes-gnome/gjs/gjs_1.71.1.bb
rename to meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb
index 9c3d441d1b..9e6fc45db3 100644
@@ -8,7 +8,7 @@ DEPENDS = "mozjs-91"
 
 inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig
 
-SRC_URI[archive.sha256sum] = "f15ad0d45a7d31a1ac4e07479038c0536713cca3c5492ca2f2731c04a3a5f1e9"
+SRC_URI[archive.sha256sum] = "3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad"
 SRC_URI += " \
     file://0001-Support-cross-builds-a-bit-better.patch \
     file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 gvfs: upgrade 1.49.1 -> 1.50.0

Remove-incorrect-i18n.merge_file-argument.patch
removed since it's include in new version

---
 ...e-incorrect-i18n.merge_file-argument.patch | 34 -------------------
 .../gvfs/{gvfs_1.49.1.bb => gvfs_1.50.0.bb}   |  7 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.49.1.bb => gvfs_1.50.0.bb} (92%)
meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch deleted +0 -34
deleted file mode 100644
index a6e3523743..0000000000
@@ -1,34 +0,0 @@
-Upstream-Status: Backport
-
-Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments.
-
-Signed-off-by: Markus Volk [email protected]
-
-From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <[email protected]>
-Date: Fri, 21 Jan 2022 08:32:31 +0100
-Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0 where
-it fails with "ERROR: Function does not take positional arguments".
-
-Related: https://github.com/mesonbuild/meson/issues/9441
-Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
----
- daemon/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index 5f9559aa..e20ada29 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -360,7 +360,6 @@ if enable_admin
-   policy = gvfs_namespace + '.file-operations.policy'
- 
-   i18n.merge_file(
--    policy,
-     input: configure_file(
-       input: policy + '.in.in',
-       output: '@BASENAME@',
--- 
-
meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb +2 -5
similarity index 92%
rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb
rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb
index 9df054d3b5..93f7f57617 100644
@@ -10,12 +10,9 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \
 
 RDEPENDS:${PN} += "gsettings-desktop-schemas"
 
-SRC_URI = " \
-    https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \
-    file://Remove-incorrect-i18n.merge_file-argument.patch \
-"
+SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
 
-SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a"
+SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd"
 
 # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11
 REQUIRED_DISTRO_FEATURES = "x11"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 metacity: upgrade 3.42.0 -> 3.44.0

In reply to Wang Mingyu

From: Upgrade Helper <[email protected]>

---
 .../metacity/{metacity_3.42.0.bb => metacity_3.44.0.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/metacity/{metacity_3.42.0.bb => metacity_3.44.0.bb} (91%)
meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb renamed from meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb +1 -1
similarity index 91%
rename from meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb
rename to meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb
index 8baf2bc62b..b6708552ac 100644
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 inherit gnomebase gsettings gettext upstream-version-is-even features_check
 
-SRC_URI[archive.sha256sum] = "d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc"
+SRC_URI[archive.sha256sum] = "19c3c5d79d2171f45baa0f632cc8995f8607bf1231a16014439bac9ba165a7c0"
 SRC_URI += "file://0001-drop-zenity-detection.patch"
 
 PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 nautilus: upgrade 41.2 -> 42.0

In reply to Wang Mingyu

liportal-0.5-fix.patch
removed since it's included in 42.0

Changelog:
=========
* Fix HiDPI thumbnails in list view
* Properly dispose pathbar to avoid crashes
* Translation updates

---
 .../nautilus/nautilus/liportal-0.5-fix.patch  | 28 -------------------
 .../{nautilus_41.2.bb => nautilus_42.0.bb}    |  3 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch
 rename meta-gnome/recipes-gnome/nautilus/{nautilus_41.2.bb => nautilus_42.0.bb} (88%)
meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch deleted +0 -28
deleted file mode 100644
index 708595a7f1..0000000000
@@ -1,28 +0,0 @@
-Fix an issue building Nautilus with libportal-0.5+
-where expected header is moved to different directory
-in staging sysroot
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
---- a/meson.build
-+++ b/meson.build
-@@ -123,7 +123,7 @@ gtk = dependency('gtk+-3.0', version: '>
- libhandy = dependency('libhandy-1', version: '>= 1.1.90')
- libportal = []
- if get_option('libportal')
--  libportal = dependency('libportal', version: '>= 0.3')
-+  libportal = dependency('libportal-gtk3', version: '>= 0.3')
- endif
- selinux = []
- if get_option('selinux')
---- a/src/nautilus-files-view.c
-+++ b/src/nautilus-files-view.c
-@@ -92,7 +92,7 @@
- 
- #ifdef HAVE_LIBPORTAL
- #include <libportal/portal.h>
--#include <libportal/portal-gtk3.h>
-+#include <libportal-gtk3/portal-gtk3.h>
- #endif
- 
- /* Minimum starting update inverval */
meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb renamed from meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb +1 -2
similarity index 88%
rename from meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb
rename to meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb
index 66043fad34..2935cc2bfe 100644
@@ -22,8 +22,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI += "file://liportal-0.5-fix.patch"
-SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b"
+SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
Signature · 1 line
2.25.1