summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/eog/eog/0001-Replace-filename-with-basename.patch48
-rw-r--r--meta-gnome/recipes-gnome/eog/eog_44.2.bb (renamed from meta-gnome/recipes-gnome/eog/eog_44.1.bb)3
2 files changed, 1 insertions, 50 deletions
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 @@
1From d00edda1f57f904e1590828bea3cedb53d789c48 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 May 2023 20:33:59 -0700
4Subject: [PATCH] Replace filename with basename
5
6This avoids emitting absolute paths into generated sourcecode, it
7improves reproducibility. See [1]
8
9[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html
10
11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/eog/-/merge_requests/154]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/eog-enum-types.c.template | 4 ++--
15 src/eog-enum-types.h.template | 2 +-
16 2 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/src/eog-enum-types.c.template b/src/eog-enum-types.c.template
19index 0249baf..1013dcf 100644
20--- a/src/eog-enum-types.c.template
21+++ b/src/eog-enum-types.c.template
22@@ -4,8 +4,8 @@
23 /*** END file-header ***/
24
25 /*** BEGIN file-production ***/
26-/* enumerations from "@filename@" */
27-#include "@filename@"
28+/* enumerations from "@basename@" */
29+#include "@basename@"
30
31 /*** END file-production ***/
32
33diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template
34index bc3c195..8f4e916 100644
35--- a/src/eog-enum-types.h.template
36+++ b/src/eog-enum-types.h.template
37@@ -8,7 +8,7 @@ G_BEGIN_DECLS
38 /*** END file-header ***/
39
40 /*** BEGIN file-production ***/
41-/* Enumerations from "@filename@" */
42+/* Enumerations from "@basename@" */
43
44 /*** END file-production ***/
45
46--
472.40.1
48
diff --git a/meta-gnome/recipes-gnome/eog/eog_44.1.bb b/meta-gnome/recipes-gnome/eog/eog_44.2.bb
index 0b7cfca49b..110e73fd43 100644
--- a/meta-gnome/recipes-gnome/eog/eog_44.1.bb
+++ b/meta-gnome/recipes-gnome/eog/eog_44.2.bb
@@ -22,8 +22,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea
22# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. 22# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used.
23REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" 23REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data"
24 24
25SRC_URI += "file://0001-Replace-filename-with-basename.patch" 25SRC_URI[archive.sha256sum] = "468f539f6b67ee46188170f244480cc311dd1efe4786fe1554bffe26a65c72c4"
26SRC_URI[archive.sha256sum] = "e2c963f232fe5a1091dcc18bec25a730e91b02af6e466601efa55e500cd74cab"
27 26
28GTKDOC_MESON_OPTION = "gtk_doc" 27GTKDOC_MESON_OPTION = "gtk_doc"
29 28