From c40aebd422e60126c3b18e35c20a1cb38a795a52 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 23 Sep 2023 17:31:45 +0200 Subject: 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 Signed-off-by: Khem Raj --- .../0001-Replace-filename-with-basename.patch | 46 ------------------ .../recipes-gnome/nautilus/nautilus_44.2.1.bb | 55 ---------------------- meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb | 55 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 101 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-Replace-filename-with-basename.patch delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb (limited to 'meta-gnome') 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 -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 ---- - 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_44.2.1.bb deleted file mode 100644 index f181822b1a..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_44.2.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - appstream-glib-native \ - desktop-file-utils-native \ - glib-2.0 \ - gnome-autoar \ - gnome-desktop \ - gtk4 \ - libadwaita \ - libcloudproviders \ - libhandy \ - libportal \ - libxml2 \ - tracker \ -" - -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" - -REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" - -GIDOCGEN_MESON_OPTION = "docs" -GIDOCGEN_MESON_ENABLE_FLAG = 'true' -GIDOCGEN_MESON_DISABLE_FLAG = 'false' - -EXTRA_OEMESON += " \ - -Dtests=none \ -" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base gdk-pixbuf" -PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,packagekit" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ - ${datadir}/tracker3 \ -" - -# mandatory - not checked during configuration: -# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed -RDEPENDS:${PN} += "tracker-miners bubblewrap" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb new file mode 100644 index 0000000000..a083d1799f --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + appstream-glib-native \ + desktop-file-utils-native \ + glib-2.0 \ + gnome-autoar \ + gnome-desktop \ + gtk4 \ + libadwaita \ + libcloudproviders \ + libhandy \ + libportal \ + libxml2 \ + tracker \ +" + +inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache + +SRC_URI[archive.sha256sum] = "b311c465ce2ca7bc648f61b865187b4451388dec9358a169f3277e741718ab5d" + +REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" + +GIDOCGEN_MESON_OPTION = "docs" +GIDOCGEN_MESON_ENABLE_FLAG = 'true' +GIDOCGEN_MESON_DISABLE_FLAG = 'false' + +EXTRA_OEMESON += " \ + -Dtests=none \ +" + +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 \ + ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ +" + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS:${PN} += "tracker-miners bubblewrap" -- cgit v1.2.3-54-g00ecf