diff options
author | Markus Volk <f_l_k@t-online.de> | 2023-09-23 17:31:45 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-09-23 19:53:00 -0700 |
commit | c40aebd422e60126c3b18e35c20a1cb38a795a52 (patch) | |
tree | 01a4861652fdca90d7541da843ff4057182540ef /meta-gnome | |
parent | 8d34444c749a466f35445fd4c2212b3fbdb8d844 (diff) | |
download | meta-openembedded-contrib-c40aebd422e60126c3b18e35c20a1cb38a795a52.tar.gz |
Nautilus: Upgrade 44.2.1 -> 45.0
- remove the patch to fix reproducibility. It was partly committed
upstream but theres still one include with buildpath left in
src/nautilus-enum-types.c and @basename@ instead of @filename@
doesn't work here -> use sed to remove
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch | 46 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb (renamed from meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb) | 10 |
2 files changed, 5 insertions, 51 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch deleted file mode 100644 index dbf42a9ab9..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ec1f99f170033138036d6547dce9b7dcf541338 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 24 May 2023 07:56:33 -0700 -Subject: [PATCH] Replace filename with basename - -This avoids emitting absolute paths into generated sourcecode, it -improves reproducibility. See [1] - -[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1211] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nautilus-enum-types.c.template | 2 +- - src/nautilus-enum-types.h.template | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nautilus-enum-types.c.template b/src/nautilus-enum-types.c.template -index 9d8ac83..a757949 100644 ---- a/src/nautilus-enum-types.c.template -+++ b/src/nautilus-enum-types.c.template -@@ -4,7 +4,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* Enumerations from "@filename@" */ -+/* Enumerations from "@basename@" */ - #include "@filename@" - - /*** END file-production ***/ -diff --git a/src/nautilus-enum-types.h.template b/src/nautilus-enum-types.h.template -index 399bbca..7eb6c54 100644 ---- a/src/nautilus-enum-types.h.template -+++ b/src/nautilus-enum-types.h.template -@@ -8,7 +8,7 @@ G_BEGIN_DECLS - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* Enumerations from "@filename@" */ -+/* Enumerations from "@basename@" */ - - /*** END file-production ***/ - --- -2.40.1 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb index f181822b1a..a083d1799f 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb @@ -23,11 +23,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += "file://0001-Replace-filename-with-basename.patch" -SRC_URI[archive.sha256sum] = "d9c62f024727f7a76fc6a5da788a2b0247df01a71c2a601143c62aac0ff41e4c" +SRC_URI[archive.sha256sum] = "b311c465ce2ca7bc648f61b865187b4451388dec9358a169f3277e741718ab5d" REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" @@ -43,6 +39,10 @@ PACKAGECONFIG = "extensions" PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base gdk-pixbuf" PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,packagekit" +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/src/nautilus-enum-types.c +} + FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ |