gentoo auto-resync : 28:08:2023 - 22:03:35

3 files changed, 81 insertions, 1 deletions

diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 90b666ad30f1..045b1cd6ceb0 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,6 @@
+AUX xfce4-terminal-1.1.0-menu-accel.patch 2663 BLAKE2B 0b2aa19dfb9ae17b53f57cef27f856d3df556fee96398dbcae50a6157c8a5a5d555685a910ae6ceb32d39144b31ab3c9b8d5b33468c01386109df43ce6cd8f78 SHA512 0e33df68f8b510fa88af8e6a423e12e3f99db6dad35ea1dacc139935fefd4832eb4b589c158d2e65306dca6b09158995bd4145c6db04bff6efe218ebf2486b4d
 DIST xfce4-terminal-1.0.4.tar.bz2 1009367 BLAKE2B 48a618f8ea98ad0408d8e54d4489358874e9e0e3c6a7011f298d0fed21512783258598cc59013c7406128e68d7311ddf64fdb13f9517306a819db50edc0555cc SHA512 76ea8f296fe1c128dc70d8aabf23447300ba83405d52e844abec89049968bac51fe47fd7545a76e4a421275c6a2f230f326ed3a25083bf536f17fc3218b05fce
 DIST xfce4-terminal-1.1.0.tar.bz2 1021840 BLAKE2B 981d73362dd7e1122b893c0761ca8f758e9382bc49a5ad985d11a953aa17e65b0c372b8a6350ed2671665508e625fbfbf4532dadc88211c14b6848c195d247dc SHA512 c01f0e7a293c4e55b4ee151eb8beb5ff9634a8134b545452c87ee9fa9928507e73bda1a63634900f669a58353877c2cb3f48e7b95cf236bdc857ca311c73c86f
 EBUILD xfce4-terminal-1.0.4.ebuild 993 BLAKE2B 28ddc50f253b30a5e895fde4478b87733e3f7588415c19501c6e204d75a4c2c82670d185e6864968685d57103e481f4d01935a546583d1e1cf9ef8570be70717 SHA512 eeacd9a459369df9af02af0b26b4a01f504ea67ad70dc4d0c9e6b5cbdbb5a9357660b974e0871cef56b451270f140e569b22bd813f141c6ca992fbf2168315fd
-EBUILD xfce4-terminal-1.1.0.ebuild 1080 BLAKE2B 8c326f3dcce4ca20c98396e602125d3fc2bdedcdfea2a81019474d25e6c9e8485ad298b9da47c95a2f0708d9c78a9ee8e33a6103c9a37a6fb478c77c84fbb86d SHA512 48be8030391c1cd13b05a9e13703284e55c1b0392fe41832b7b79f26e9cb6511426592167c51687685c0059de8ded5e528af5f6c624c59ae388f3a850e0320b3
+EBUILD xfce4-terminal-1.1.0-r1.ebuild 1130 BLAKE2B 0e441c3ea789e3ab6c672188e508c40e545829410af7c1277d52014631cfe9b622d179cef22c4c2ef5b81c12b616ac52736e58d5618da7d686928db0d0c2dd2b SHA512 4381f13c585e617e0f7c0b8dd7bce85fa7d11b259789433086899f454f74283faa42eccfcf50d820e752c198dd702ffc9a1c5609129bdd9d0ca0deb2cc99aa6c
 MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch b/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch
new file mode 100644
index 000000000000..e40b9be6eae2
--- /dev/null
+++ b/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch
@@ -0,0 +1,75 @@
+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
+--- a/terminal/terminal-app.c
++++ b/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)
+ {
+-- 
+GitLab
+
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
index 17e638f1825b..656858903238 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
@@ -37,6 +37,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-menu-accel.patch"
+)
+
 src_configure() {
 	local myconf=(
 		$(use_with utempter)