commit: af055789188eebf65bd8e7f2a54f32b7a7dd8f92 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Dec 22 16:10:19 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 16:43:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af055789
x11-terms/xfce4-terminal: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> x11-terms/xfce4-terminal/Manifest | 1 - .../files/xfce4-terminal-1.1.0-menu-accel.patch | 75 ---------------------- .../xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild | 58 ----------------- 3 files changed, 134 deletions(-) diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest index f1cc0b551bec..9b4e85d7dec7 100644 --- a/x11-terms/xfce4-terminal/Manifest +++ b/x11-terms/xfce4-terminal/Manifest @@ -1,2 +1 @@ -DIST xfce4-terminal-1.1.0.tar.bz2 1021840 BLAKE2B 981d73362dd7e1122b893c0761ca8f758e9382bc49a5ad985d11a953aa17e65b0c372b8a6350ed2671665508e625fbfbf4532dadc88211c14b6848c195d247dc SHA512 c01f0e7a293c4e55b4ee151eb8beb5ff9634a8134b545452c87ee9fa9928507e73bda1a63634900f669a58353877c2cb3f48e7b95cf236bdc857ca311c73c86f DIST xfce4-terminal-1.1.1.tar.bz2 1033180 BLAKE2B e33bf7f0ff56200154a7195b6aaf09a7b67c7577c78190fd110b1dc035914295735925bf82f0cd3b6809646315236a32fc835acbb8d97b73b57025205faef9e8 SHA512 0f2631cc9790b467495cf17a506c33b9c6a037b94a353cb870554b1dd9da0b4795ed965ca2e9beb5dec1b344304e4dc9f71130862f6b45d63f66c603757991cd 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 deleted file mode 100644 index e40b9be6eae2..000000000000 --- a/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c576281a780884f9ba1f6abe3d543a3a00f0b48d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <[email protected]> -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-r1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild deleted file mode 100644 index 844c01d9c37c..000000000000 --- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xdg-utils - -DESCRIPTION="A terminal emulator for the Xfce desktop environment" -HOMEPAGE=" - https://docs.xfce.org/apps/terminal/start - https://gitlab.xfce.org/apps/xfce4-terminal/ -" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="utempter" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/libpcre2-10.00:= - >=x11-libs/gtk+-3.22.0:3 - x11-libs/libX11 - >=x11-libs/vte-0.51.3:2.91 - >=xfce-base/libxfce4ui-4.17.5:=[gtk3(+)] - >=xfce-base/xfconf-4.16.0:= - utempter? ( sys-libs/libutempter:= ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-libs/libxml2 - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-menu-accel.patch" -) - -src_configure() { - local myconf=( - $(use_with utempter) - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}
