From fa9fb09b357212c40cafa85cd3e863fe26283ee5 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 31 May 2023 15:40:00 +0800 Subject: eog: upgrade 44.1 -> 44.2 0001-Replace-filename-with-basename.patch removed since it's included in 44.2 Changelog: ========== - EogWindow: Fix refcount and signal handler issues around GSettings handles - Replace filename with basename Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../eog/0001-Replace-filename-with-basename.patch | 48 ---------------------- meta-gnome/recipes-gnome/eog/eog_44.1.bb | 32 --------------- meta-gnome/recipes-gnome/eog/eog_44.2.bb | 31 ++++++++++++++ 3 files changed, 31 insertions(+), 80 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch delete mode 100644 meta-gnome/recipes-gnome/eog/eog_44.1.bb create mode 100644 meta-gnome/recipes-gnome/eog/eog_44.2.bb diff --git a/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch deleted file mode 100644 index 26d75780b2..0000000000 --- a/meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d00edda1f57f904e1590828bea3cedb53d789c48 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 24 May 2023 20:33:59 -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/eog/-/merge_requests/154] -Signed-off-by: Khem Raj ---- - src/eog-enum-types.c.template | 4 ++-- - src/eog-enum-types.h.template | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/eog-enum-types.c.template b/src/eog-enum-types.c.template -index 0249baf..1013dcf 100644 ---- a/src/eog-enum-types.c.template -+++ b/src/eog-enum-types.c.template -@@ -4,8 +4,8 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ --#include "@filename@" -+/* enumerations from "@basename@" */ -+#include "@basename@" - - /*** END file-production ***/ - -diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template -index bc3c195..8f4e916 100644 ---- a/src/eog-enum-types.h.template -+++ b/src/eog-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/eog/eog_44.1.bb b/meta-gnome/recipes-gnome/eog/eog_44.1.bb deleted file mode 100644 index 0b7cfca49b..0000000000 --- a/meta-gnome/recipes-gnome/eog/eog_44.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "This is the Eye of GNOME, an image viewer program." -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - librsvg \ - gnome-desktop \ - gsettings-desktop-schemas \ - gdk-pixbuf \ - gtk+3 \ - libhandy \ - libpeas \ - libportal \ - libexif \ - lcms \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg features_check gtk-icon-cache - -# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. -REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" - -SRC_URI += "file://0001-Replace-filename-with-basename.patch" -SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = "-Dxmp=false" - -FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/eog/eog_44.2.bb b/meta-gnome/recipes-gnome/eog/eog_44.2.bb new file mode 100644 index 0000000000..110e73fd43 --- /dev/null +++ b/meta-gnome/recipes-gnome/eog/eog_44.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "This is the Eye of GNOME, an image viewer program." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + librsvg \ + gnome-desktop \ + gsettings-desktop-schemas \ + gdk-pixbuf \ + gtk+3 \ + libhandy \ + libpeas \ + libportal \ + libexif \ + lcms \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg features_check gtk-icon-cache + +# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. +REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "468f539f6b67ee46188170f244480cc311dd1efe4786fe1554bffe26a65c72c4" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dxmp=false" + +FILES:${PN} += "${datadir}" -- cgit v1.2.3-54-g00ecf