diff mbox series

[meta-xfce,1/9] xfce4-terminal: upgrade 1.1.4 -> 1.2.0

Message ID 20260319095547.3614749-1-peng.zhang1.cn@windriver.com
State Under Review
Headers show
Series [meta-xfce,1/9] xfce4-terminal: upgrade 1.1.4 -> 1.2.0 | expand

Commit Message

Zhang Peng March 19, 2026, 9:55 a.m. UTC 
From: Zhang Peng <peng.zhang1.cn@windriver.com>

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>
---
 ...splay-full-path-in-generated-headers.patch | 36 +++++++++++++++++++
 ...01-build-Properly-guard-wayland-code.patch | 35 ++++++++++++++++++
 .../xfce4-terminal/xfce4-terminal_1.1.4.bb    | 16 ---------
 .../xfce4-terminal/xfce4-terminal_1.2.0.bb    | 23 ++++++++++++
 4 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Do-not-display-full-path-in-generated-headers.patch
 create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/files/0001-build-Properly-guard-wayland-code.patch
 delete mode 100644 meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.1.4.bb
 create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.2.0.bb
diff mbox series

Patch

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 @@ 
+From c1b15e5249fa975308c75f5f9791a444a44f05bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Mon, 16 Mar 2026 16:48:25 +0100
+Subject: [PATCH] build: Do not display full path in generated headers
+
+Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/c1b15e5249fa975308c75f5f9791a444a44f05bc]
+
+Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
+---
+ terminal/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/terminal/meson.build b/terminal/meson.build
+index e0e109f7..5ff7b1ee 100644
+--- a/terminal/meson.build
++++ b/terminal/meson.build
+@@ -50,7 +50,7 @@ terminal_sources += gnome.mkenums(
+   install_header: false,
+   sources: 'terminal-preferences.h',
+   fhead: '#ifndef TERMINAL_ENUM_TYPES_H\n#define TERMINAL_ENUM_TYPES_H\n#include <gtk/gtk.h>\nG_BEGIN_DECLS\n',
+-  fprod: '/* enumerations from "@filename@" */\n',
++  fprod: '/* enumerations from "@basename@" */\n',
+   vhead: 'GType @enum_name@_get_type (void);\n#define TERMINAL_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
+   ftail: 'G_END_DECLS\n\n#endif /* !TERMINAL_ENUM_TYPES_H */',
+ )
+@@ -59,7 +59,7 @@ terminal_sources += gnome.mkenums(
+   install_header: false,
+   sources: 'terminal-preferences.h',
+   fhead: '#include "terminal-enum-types.h"\n#include "terminal-app.h"\n#include "terminal-preferences.h"',
+-  fprod: ' \n/* enumerations from "@filename@" */',
++  fprod: ' \n/* enumerations from "@basename@" */',
+   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[] = {',
+   vprod: ' \t{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
+   vtail: ' \t{ 0, NULL, NULL }\n\t};\n\ttype = g_@type@_register_static ("@EnumName@", values);\n  }\n\treturn type;\n}\n',
+--
+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 @@ 
+From b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Sun, 8 Mar 2026 22:23:34 +0100
+Subject: [PATCH] build: Properly guard wayland code
+
+Closes: #383
+Fixes: ab0136ac39d1eb0849dcfca84bbd91e8562a7176
+
+Upstream-Status: Backport [https://gitlab.xfce.org/apps/xfce4-terminal/-/commit/b07d9546a08a3cd70b7e9aaad7a86256fbe32b8b]
+
+Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
+---
+ terminal/terminal-window-dropdown.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
+index 6f9e3b48..074a6ce0 100644
+--- a/terminal/terminal-window-dropdown.c
++++ b/terminal/terminal-window-dropdown.c
+@@ -567,11 +567,13 @@ terminal_window_dropdown_finalize (GObject *object)
+   if (dropdown->animation_timeout_id != 0)
+     g_source_remove (dropdown->animation_timeout_id);
+
++#ifdef HAVE_GTK_LAYER_SHELL
+   if (dropdown->set_monitor_idle_id != 0)
+     g_source_remove (dropdown->set_monitor_idle_id);
+
+   if (dropdown->monitor_removed_idle_id != 0)
+     g_source_remove (dropdown->monitor_removed_idle_id);
++#endif
+
+   if (dropdown->status_icon != NULL)
+     g_object_unref (G_OBJECT (dropdown->status_icon));
+--
+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 @@ 
-SUMMARY = "Terminal emulator for the Xfce desktop environment"
-HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native"
-
-inherit xfce-app
-
-FILES:${PN} += " \
-    ${datadir}/xfce4 \
-    ${datadir}/gnome-control-center \
-"
-
-SRC_URI[sha256sum] = "873c921da1f4b986ffb459d4960789c9c063af98648c9f0ca146dc6f6f5b71b7"
-
-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 @@ 
+SUMMARY = "Terminal emulator for the Xfce desktop environment"
+HOMEPAGE = "https://docs.xfce.org/apps/xfce4-terminal/start"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui libxslt-native docbook-xsl-stylesheets-native gtk-doc-native"
+
+XFCE_COMPRESS_TYPE = "xz"
+XFCEBASEBUILDCLASS = "meson"
+
+inherit xfce-app
+
+SRC_URI += "\
+            file://0001-build-Properly-guard-wayland-code.patch \
+            file://0001-build-Do-not-display-full-path-in-generated-headers.patch \
+            "
+SRC_URI[sha256sum] = "6874c7b975cc3dc3bd636d57ffec723de7458202defe65377593d3a7e0734b94"
+
+FILES:${PN} += " \
+    ${datadir}/xfce4 \
+    ${datadir}/gnome-control-center \
+"
+
+RRECOMMENDS:${PN} += "vte-prompt"