git: e843b8293c09 - main - x11/xfce4-terminal: Update to 1.1.1

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e843b8293c09943ae605846ed4947e9d1d1d63de

commit e843b8293c09943ae605846ed4947e9d1d1d63de
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-10-14 14:21:10 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-10-14 14:21:10 +0000

    x11/xfce4-terminal: Update to 1.1.1
    
    Removed patch included upstream.
---
 x11/xfce4-terminal/Makefile                        |  3 +-
 x11/xfce4-terminal/distinfo                        |  6 +-
 .../files/patch-terminal_terminal-app.c            | 75 ----------------------
 3 files changed, 4 insertions(+), 80 deletions(-)

diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 93209b15b767..3374e078fdbb 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xfce4-terminal
-PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTVERSION=	1.1.1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo
index d18ae78a71c3..1a859bcc8ea1 100644
--- a/x11/xfce4-terminal/distinfo
+++ b/x11/xfce4-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692697792
-SHA256 (xfce4/xfce4-terminal-1.1.0.tar.bz2) = 40823377242b9b09749f5d4a550f41d465153c235c31f34052f804d3453ad4a3
-SIZE (xfce4/xfce4-terminal-1.1.0.tar.bz2) = 1021840
+TIMESTAMP = 1697286653
+SHA256 (xfce4/xfce4-terminal-1.1.1.tar.bz2) = 5ab5c9b49c00be29f0be4eee5ccfa5073b16f2456185270265a9324549080aa6
+SIZE (xfce4/xfce4-terminal-1.1.1.tar.bz2) = 1033180
diff --git a/x11/xfce4-terminal/files/patch-terminal_terminal-app.c b/x11/xfce4-terminal/files/patch-terminal_terminal-app.c
deleted file mode 100644
index b0952916930f..000000000000
--- a/x11/xfce4-terminal/files/patch-terminal_terminal-app.c
+++ /dev/null
@@ -1,75 +0,0 @@
-From c576281a780884f9ba1f6abe3d543a3a00f0b48d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
-Date: Thu, 24 Aug 2023 12:50:38 +0200
-Subject: [PATCH] app: Put GtkSettings:gtk-menu-bar-accel overwrite back in
- place
-
-Fixes: 86abcfefec1c994e1fe7bb94fb615945507ba41c
-Closes: #259
----
- terminal/terminal-app.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
-index 46b4c300..f3aeeeac 100644
---- terminal/terminal-app.c
-+++ terminal/terminal-app.c
-@@ -56,6 +56,7 @@
- 
- 
- static void     terminal_app_finalize                 (GObject            *object);
-+static void     terminal_app_update_accels            (TerminalApp        *app);
- static void     terminal_app_update_windows_accels    (gpointer            user_data);
- static gboolean terminal_app_accel_map_load           (gpointer            user_data);
- static gboolean terminal_app_accel_map_save           (gpointer            user_data);
-@@ -129,12 +130,16 @@ static void
- terminal_app_init (TerminalApp *app)
- {
-   app->preferences = terminal_preferences_get ();
-+  g_signal_connect_swapped (G_OBJECT (app->preferences), "notify::shortcuts-no-menukey",
-+                            G_CALLBACK (terminal_app_update_accels), app);
- 
-   /* remember the original menu bar accel */
-   g_object_get (G_OBJECT (gtk_settings_get_default ()),
-                 "gtk-menu-bar-accel", &app->initial_menu_bar_accel,
-                 NULL);
- 
-+  terminal_app_update_accels (app);
-+
-   /* schedule accel map load and update windows when finished */
-   app->accel_map_load_id = gdk_threads_add_idle_full (G_PRIORITY_LOW, terminal_app_accel_map_load, app,
-                                                       terminal_app_update_windows_accels);
-@@ -169,6 +174,7 @@ terminal_app_finalize (GObject *object)
-     }
-   g_slist_free (app->windows);
- 
-+  g_signal_handlers_disconnect_by_func (G_OBJECT (app->preferences), G_CALLBACK (terminal_app_update_accels), app);
-   g_object_unref (G_OBJECT (app->preferences));
- 
-   if (app->initial_menu_bar_accel != NULL)
-@@ -182,6 +188,22 @@ terminal_app_finalize (GObject *object)
- 
- 
- 
-+static void
-+terminal_app_update_accels (TerminalApp *app)
-+{
-+  gboolean no_key;
-+
-+  g_object_get (G_OBJECT (app->preferences),
-+                "shortcuts-no-menukey", &no_key,
-+                NULL);
-+  g_object_set (G_OBJECT (gtk_settings_get_default ()),
-+                "gtk-menu-bar-accel",
-+                no_key ? NULL : app->initial_menu_bar_accel,
-+                NULL);
-+}
-+
-+
-+
- static void
- terminal_app_update_windows_accels (gpointer user_data)
- {
--- 
-2.42.0
-