From nobody Sat Oct 14 14:21:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S75Cr5bGwz4wpnv; Sat, 14 Oct 2023 14:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S75Cr58Xyz3Zbf; Sat, 14 Oct 2023 14:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697293304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+6aIF75Jy2B/PUt1sMAteUVBvPrfpn3g4fF2imntOY=; b=mLKVXtEwL+oLPhuYn1+DSwpLj1f85+9F8/IA5SUs2y83rVz+E9yY7/MTWept1iaN6uej/M ncWAJzrHJFDHPjqvOfI/vOHBLyr+fQ5LavJVMwsNN11V2YITulo/YmXmfrnXrmm7QP2Zie z6A8FEl6E81OmmB/ADUwfYeHNCAcIA10xSq2Ao4JU3/Tug0A4XWb6AcvRMIWgn9XLgpLmM 5aBfMXj1o1yrzCfKannDvizJxSKbJqV5JzNpDmT8SnNsQB3ReqBGabBSUk3lw2Wf1PFhpC LJcLusS+I/14j6ytw4QgmY7ON3c5fAnyMYjQ+DlpMeYaOk3mUpD29UdC/NopAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697293304; a=rsa-sha256; cv=none; b=jftbN8MLWs6Jw8MWe67I576jfIozgWqvacUvlpJd0TXxnd/y+UJeeS41j4a79wLqYDoPKW R3UFEY48+QAG/XwTVbUIjv1GpQ3BGgCmpBPT4f/+rhQjPAWcV/fshSPkT4cNRRUYRd6HGV TTQlyIAXvGEVFCfTDLBP4E2Egj0ztOtRh0zDJ+CW4HsAhsnQoAE7jkAz16pDSb0wC5kzFJ r3d1aFPEinjItz5t7u+f8SzKgFVnAwirUwpwEz6DpMaApziTlWFoodpbk0XB6novyaB/Qw heKLTbrfW/XTiu27RuvWKpgvlHbbMj/BcjDhmrURQX/bfVifVOKdVj1p8hvlTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697293304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N+6aIF75Jy2B/PUt1sMAteUVBvPrfpn3g4fF2imntOY=; b=YhbXUP5kyfqC2H7nCGnDa71QJ5D89VhTh2FtJKprkqpmfPDKnRRobks4dN2457gHY2ZFvs dj94TLNIJMyfZ0Kagc3jPGO9mJLNu86vjFJ9rH6YZR9zA/HMSu6E+XHhrxqJAWYWRjubdN 6c4FFLW+M+4BxLiHipi4A8n16RkU5GDvzrADJYVGuNKOMnY2vVg5+D2aYTzdmiW5tKtree nL5duGojPR/mt0he4pyEE2NwTbuQHIgy+Ay0r673aPJzGrOo5ENa5JzVt8Glj+OzSd4Cqi trMvdsGJ96mW/nttLen2ZJmY1Q2PLTZeIwAlHxO3w2y1by83yte8RhUlwOCnEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S75Cr46yLzZHb; Sat, 14 Oct 2023 14:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39EELiNU078848; Sat, 14 Oct 2023 14:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EELiZw078845; Sat, 14 Oct 2023 14:21:44 GMT (envelope-from git) Date: Sat, 14 Oct 2023 14:21:44 GMT Message-Id: <202310141421.39EELiZw078845@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: e843b8293c09 - main - x11/xfce4-terminal: Update to 1.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e843b8293c09943ae605846ed4947e9d1d1d63de Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=e843b8293c09943ae605846ed4947e9d1d1d63de commit e843b8293c09943ae605846ed4947e9d1d1d63de Author: Guido Falsi AuthorDate: 2023-10-14 14:21:10 +0000 Commit: Guido Falsi 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?= -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 -