From nobody Sun Nov 06 17:34:11 2022 X-Original-To: dev-commits-ports-all@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 4N51gm0QnSz4ggjF; Sun, 6 Nov 2022 17:34:12 +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 4N51gl71jmz3mn1; Sun, 6 Nov 2022 17:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667756052; 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=SprmXgsXMJa50Fac+wIoiTY/JVDY2MFaH6zSmh4gAYM=; b=A2Xy09LaheU7LnlqMaIbeujMR94ktovByWcX+2d7VuLW9x1ENxiqlL0/MiRZhwYb3WMc3O 5XdtXKF6doGl1pk3eSvkYDyntmGNDZFbcW7AgyB745sGg0Wl9Bq1Xi8N6w9ssPqKwsCdeS xXc9vMKLJ3P5b+jcQW/vN3GcoIajgKznMiWaMuaRDQN8r9I2S481frO7nXJRfYZV1pLWxM eIfo3OPLNiARvVVOPvDbdvjCqkUX+q50fgYk+oA63e8K96F/TyUEpCXr2IRjglM9O1a4A3 0R5qVThHqTgnAbnhn0qDNwCh0obvHb58njBptxI88GtbbVIPG+jArKwLcih8xQ== 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 4N51gl63gRzTD3; Sun, 6 Nov 2022 17:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A6HYBTO052462; Sun, 6 Nov 2022 17:34:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6HYBCB052461; Sun, 6 Nov 2022 17:34:11 GMT (envelope-from git) Date: Sun, 6 Nov 2022 17:34:11 GMT Message-Id: <202211061734.2A6HYBCB052461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 15d8808cc1f3 - main - x11/elementary-terminal: Update to 6.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15d8808cc1f3b41d541e86e9071028024df5125c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667756052; 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=SprmXgsXMJa50Fac+wIoiTY/JVDY2MFaH6zSmh4gAYM=; b=MKMywwY5EJ7d39qvvJKTDwcODz8n0d+kKop+ss0LODknJEL5igTjenggOhENylWjAJlauR xXROxiru2QeHNJpyKydOpBGpvclxfOpYh4yVop7AcUSiayrgGLIwyfkre9Be61ASE3CvMm tokQNL5vnMyY7HSyuhVQND8vjhQoJQD57awaBGNcJnrFXKFGQIRrHa7X1dijjFIpyfDOBp G9619S6JAwheCgSkHq/Giql36H3sBq9qLKG6sgN4XZPq+lUrFDJHXbfDCSrOcUAq3j/SvF YRCpO90nMALV/WRdhKMlxIEFUUm7Dm7bMNwTqMqEUbGsIQ/SHYG9EzU55/lp8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667756052; a=rsa-sha256; cv=none; b=MFWzNI/x4uFxg9hb261g9WGWRqyFJGsrrSvrY5Pr4gS7RT4B8pU9D9uzOfnWUD6IHBAxJb hUb0elzi0P8nmIFipq8XiIiSP2hwJcn8q5dAectZoIdEhGoVWJ8motZmRCV/BryU26yUti lPqAjM+N/VwctF/S5pr2FNjRk1zzzBmx3NQgDwo3GLSEVtarxDfrblXrITc4WwCTNYr9iS ocHq/ONd+NwfZdOfhAtZJTQkrfD5wn2Jav7LHRkRU95JYCtFoNzs+bDEkoA3UBcHhknmRt uFp7sHdenkriCoC4Y8nV0NphcoQFaJeQYAmJ2BFH35nKp15h7/H3wCoqhgWRHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=15d8808cc1f3b41d541e86e9071028024df5125c commit 15d8808cc1f3b41d541e86e9071028024df5125c Author: Oliver Duchateau AuthorDate: 2022-11-06 17:33:49 +0000 Commit: Neel Chauhan CommitDate: 2022-11-06 17:33:49 +0000 x11/elementary-terminal: Update to 6.1.1 PR: 267402 MFH: 2022Q4 --- x11/elementary-terminal/Makefile | 2 +- x11/elementary-terminal/distinfo | 6 +++--- .../files/patch-src_Widgets_TerminalWidget.vala | 15 ++++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile index 3b0ae5dee5c1..e3e1e2933753 100644 --- a/x11/elementary-terminal/Makefile +++ b/x11/elementary-terminal/Makefile @@ -1,5 +1,5 @@ PORTNAME= terminal -DISTVERSION= 6.1.0 +DISTVERSION= 6.1.1 CATEGORIES= x11 PKGNAMEPREFIX= elementary- diff --git a/x11/elementary-terminal/distinfo b/x11/elementary-terminal/distinfo index e453005e572b..9c40e4fd6fe9 100644 --- a/x11/elementary-terminal/distinfo +++ b/x11/elementary-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660337780 -SHA256 (elementary-terminal-6.1.0_GH0.tar.gz) = ed930dded4f51bc59ebc6213bc21d0a5eca156ddc58c919d33735921a950bbb2 -SIZE (elementary-terminal-6.1.0_GH0.tar.gz) = 1015594 +TIMESTAMP = 1666967246 +SHA256 (elementary-terminal-6.1.1_GH0.tar.gz) = 22d86fd35735195a5b93b74697e11569339447887ae121c654a86f486a8ed48b +SIZE (elementary-terminal-6.1.1_GH0.tar.gz) = 1037361 diff --git a/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala index ab10a93473b2..74442c7f4f2b 100644 --- a/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala +++ b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala @@ -1,4 +1,4 @@ ---- src/Widgets/TerminalWidget.vala.orig 2021-12-13 18:31:36 UTC +--- src/Widgets/TerminalWidget.vala.orig 2022-10-27 16:47:44 UTC +++ src/Widgets/TerminalWidget.vala @@ -68,13 +68,6 @@ namespace Terminal { } @@ -9,15 +9,16 @@ - "/io/elementary/terminal " + - "io.elementary.terminal.ProcessFinished " + - "string:$PANTHEON_TERMINAL_ID " + -- "string:\"$(history 1 | cut -c 8-)\" " + +- "string:\"$(fc -nl -1 | cut -c 3-)\" " + - "int32:\$__bp_last_ret_value >/dev/null 2>&1"; /* Following strings are used to build RegEx for matching URIs */ const string USERCHARS = "-[:alnum:]"; -@@ -364,14 +357,7 @@ namespace Terminal { +@@ -351,15 +344,7 @@ namespace Terminal { + shell = Vte.get_user_shell (); envv = { - // Export ID so we can identify the terminal for which the process completion is reported +- // Export ID so we can identify the terminal for which the process completion is reported - "PANTHEON_TERMINAL_ID=" + terminal_id, - - // Export callback command a BASH-specific variable, see "man bash" for details @@ -30,7 +31,7 @@ }; /* We need opening uri to be available asap when constructing window with working directory -@@ -454,12 +440,49 @@ namespace Terminal { +@@ -436,12 +421,49 @@ namespace Terminal { return this.match_check_event (event, null); } @@ -47,14 +48,14 @@ + public string get_shell_location () { + string[] spawn_env = GLib.Environ.get (); -+ string[] procstat_cmd = {"/usr/bin/pwdx", "--libxo:T",}; ++ string[] procstat_cmd = { "/usr/bin/pwdx", "--libxo:T", }; + string standard_output = null; + bool res; + string cwd = null; + int pid = (!) (this.child_pid); -+ /* Update procstat(1) argument */ ++ // Update procstat(1) argument + procstat_cmd += pid.to_string (); + try {