diff options
| author | Zhang Peng <peng.zhang1.cn@windriver.com> | 2026-03-19 17:55:39 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-19 22:27:08 -0700 |
| commit | 67dd790df486e6343099994ef83bdff2f75e9c8d (patch) | |
| tree | a40d3e9f2fac8fe7032071aaf67d314bee85edb5 | |
| parent | 30ad3a50250945a9a1d50cc8f7e6089c807ffd82 (diff) | |
| download | meta-openembedded-67dd790df486e6343099994ef83bdff2f75e9c8d.tar.gz | |
xfce4-terminal: upgrade 1.1.4 -> 1.2.0
Changelog:
https://gitlab.xfce.org/apps/xfce4-terminal/-/tags/xfce4-terminal-1.2.0
https://gitlab.xfce.org/apps/xfce4-terminal/-/tags/xfce4-terminal-1.1.5
Backport 2 patches for fix build issue.
Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 94 insertions, 16 deletions
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch new file mode 100644 index 0000000000..ef4052af51 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From c1b15e5249fa975308c75f5f9791a444a44f05bc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> | ||
| 3 | Date: Mon, 16 Mar 2026 16:48:25 +0100 | ||
| 4 | Subject: [PATCH] build: Do not display full path in generated headers | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/c1b15e5249fa975308c75f5f9791a444a44f05bc] | ||
| 7 | |||
| 8 | Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 9 | --- | ||
| 10 | terminal/meson.build | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/terminal/meson.build b/terminal/meson.build | ||
| 14 | index e0e109f7..5ff7b1ee 100644 | ||
| 15 | --- a/terminal/meson.build | ||
| 16 | +++ b/terminal/meson.build | ||
| 17 | @@ -50,7 +50,7 @@ terminal_sources += gnome.mkenums( | ||
| 18 | install_header: false, | ||
| 19 | sources: 'terminal-preferences.h', | ||
| 20 | fhead: '#ifndef TERMINAL_ENUM_TYPES_H\n#define TERMINAL_ENUM_TYPES_H\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n', | ||
| 21 | - fprod: '/* enumerations from "@filename@" */\n', | ||
| 22 | + fprod: '/* enumerations from "@basename@" */\n', | ||
| 23 | vhead: 'GType @enum_name@_get_type (void);\n#define TERMINAL_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', | ||
| 24 | ftail: 'G_END_DECLS\n\n#endif /* !TERMINAL_ENUM_TYPES_H */', | ||
| 25 | ) | ||
| 26 | @@ -59,7 +59,7 @@ terminal_sources += gnome.mkenums( | ||
| 27 | install_header: false, | ||
| 28 | sources: 'terminal-preferences.h', | ||
| 29 | fhead: '#include "terminal-enum-types.h"\n#include "terminal-app.h"\n#include "terminal-preferences.h"', | ||
| 30 | - fprod: ' \n/* enumerations from "@filename@" */', | ||
| 31 | + fprod: ' \n/* enumerations from "@basename@" */', | ||
| 32 | vhead: 'GType\n@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const G@Type@Value values[] = {', | ||
| 33 | vprod: ' \t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },', | ||
| 34 | vtail: ' \t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n }\n\treturn type;\n}\n', | ||
| 35 | -- | ||
| 36 | 2.51.2 | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch new file mode 100644 index 0000000000..4f46e8a8d7 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> | ||
| 3 | Date: Sun, 8 Mar 2026 22:23:34 +0100 | ||
| 4 | Subject: [PATCH] build: Properly guard wayland code | ||
| 5 | |||
| 6 | Closes: #383 | ||
| 7 | Fixes: ab0136ac39d1eb0849dcfca84bbd91e8562a7176 | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b] | ||
| 10 | |||
| 11 | Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 12 | --- | ||
| 13 | terminal/terminal-window-dropdown.c | 2 ++ | ||
| 14 | 1 file changed, 2 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c | ||
| 17 | index 6f9e3b48..074a6ce0 100644 | ||
| 18 | --- a/terminal/terminal-window-dropdown.c | ||
| 19 | +++ b/terminal/terminal-window-dropdown.c | ||
| 20 | @@ -567,11 +567,13 @@ terminal_window_dropdown_finalize (GObject *object) | ||
| 21 | if (dropdown->animation_timeout_id != 0) | ||
| 22 | g_source_remove (dropdown->animation_timeout_id); | ||
| 23 | |||
| 24 | +#ifdef HAVE_GTK_LAYER_SHELL | ||
| 25 | if (dropdown->set_monitor_idle_id != 0) | ||
| 26 | g_source_remove (dropdown->set_monitor_idle_id); | ||
| 27 | |||
| 28 | if (dropdown->monitor_removed_idle_id != 0) | ||
| 29 | g_source_remove (dropdown->monitor_removed_idle_id); | ||
| 30 | +#endif | ||
| 31 | |||
| 32 | if (dropdown->status_icon != NULL) | ||
| 33 | g_object_unref (G_OBJECT (dropdown->status_icon)); | ||
| 34 | -- | ||
| 35 | 2.51.2 | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb deleted file mode 100644 index 50adacbcb1..0000000000 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | SUMMARY = "Terminal emulator for the Xfce desktop environment" | ||
| 2 | HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start" | ||
| 3 | LICENSE = "GPL-2.0-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 5 | DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" | ||
| 6 | |||
| 7 | inherit xfce-app | ||
| 8 | |||
| 9 | FILES:${PN} += " \ | ||
| 10 | ${datadir}/xfce4 \ | ||
| 11 | ${datadir}/gnome-control-center \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[sha256sum] = "873c921da1f4b986ffb459d4960789c9c063af98648c9f0ca146dc6f6f5b71b7" | ||
| 15 | |||
| 16 | RRECOMMENDS:${PN} += "vte-prompt" | ||
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb new file mode 100644 index 0000000000..bf31ae516e --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | SUMMARY = "Terminal emulator for the Xfce desktop environment" | ||
| 2 | HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start" | ||
| 3 | LICENSE = "GPL-2.0-only" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 5 | DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui libxslt-native docbook-xsl-stylesheets-native gtk-doc-native" | ||
| 6 | |||
| 7 | XFCE_COMPRESS_TYPE = "xz" | ||
| 8 | XFCEBASEBUILDCLASS = "meson" | ||
| 9 | |||
| 10 | inherit xfce-app | ||
| 11 | |||
| 12 | SRC_URI += "\ | ||
| 13 | file://0001-build-Properly-guard-wayland-code.patch \ | ||
| 14 | file://0001-build-Do-not-display-full-path-in-generated-headers.patch \ | ||
| 15 | " | ||
| 16 | SRC_URI[sha256sum] = "6874c7b975cc3dc3bd636d57ffec723de7458202defe65377593d3a7e0734b94" | ||
| 17 | |||
| 18 | FILES:${PN} += " \ | ||
| 19 | ${datadir}/xfce4 \ | ||
| 20 | ${datadir}/gnome-control-center \ | ||
| 21 | " | ||
| 22 | |||
| 23 | RRECOMMENDS:${PN} += "vte-prompt" | ||
