From nobody Sun Dec 19 21:43:04 2021 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 03A1718FFD5B; Sun, 19 Dec 2021 21:43:05 +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 4JHGRX57pvz3Cs4; Sun, 19 Dec 2021 21:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 92041205B; Sun, 19 Dec 2021 21:43:04 +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 1BJLh4fu031963; Sun, 19 Dec 2021 21:43:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJLh4R1031962; Sun, 19 Dec 2021 21:43:04 GMT (envelope-from git) Date: Sun, 19 Dec 2021 21:43:04 GMT Message-Id: <202112192143.1BJLh4R1031962@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: 60019e71ae76 - main - x11/elementary-terminal: Update to 6.0.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: 60019e71ae76edfa624d714ed77f00b8dee98763 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639950184; 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=IuHyR1O58EM7vAyeVzj2X1+HanzPiDhZUzSattzRjQI=; b=GfYJvdzpbXJmCrdisqcOzNIOec+d41lurOIkPdGqD+eEqRf9NQxVnPDd1VrwEFDFC3WW0L 2bYg+G2M7paUhM9TLNrJUpQsYqKM8jNIKoeBX+ZqKD7cuVIkCBMjOd/S9GbW39cQRZL7Ik kf1sVOA68lMNaXuOqYW+7NMRJFqS6yiJC5a4dX5nIDGHBM51vflVSoIr5EtYoYBXWAVFjM q1Hv4C9MBP5Sc0SAUmtX+2ADSuvkrz4hpih3R4K0B6A00eppUbwRTNXR8nyyjBJBQQxW/J c9GXtrXPcfHli5rSZQ7STi0flVI0coEk1upTu6CJDyZkS7Xtage8iVFLcfna0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639950184; a=rsa-sha256; cv=none; b=cKwYKnPczqD7tA/dpRTqk9VJJ3P4QWUaJljOR2zLVnSI3eTfjTh7ipChvBTxa0VjwVkMws ivEEwJlQvVFpH3G4ET6JtLc4w6a03F4AdQDkfepGWDxPz9YWJgBnCtLaK/8YjAPMLjjvjh 6COpmvzEVC7cPqRFzaz4Q3ioLVgdpKRqhzC0LRENhaB89KO3vZB8vOtCoEl/M+9fo+hYP/ 9mEY19aA48BvgNs3vLsdFjaQhS3YtSy2x1mlgq2g32HPjpYrRiElmhu3oa4/9YCW0jDsK7 HsOgz9VzwM8xhxV4nHCewI7xm3uJFClHQ/q1rhbv7d0JinC49GvZsXWgdZMwvA== 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=60019e71ae76edfa624d714ed77f00b8dee98763 commit 60019e71ae76edfa624d714ed77f00b8dee98763 Author: Olivier Duchateau AuthorDate: 2021-12-19 21:42:41 +0000 Commit: Neel Chauhan CommitDate: 2021-12-19 21:42:41 +0000 x11/elementary-terminal: Update to 6.0.1 While we're here: - Adjust dependencies - Fix Meson error, in i18n.merge_file() function, now (meson >= 0.60.1) first optional argument is deprecated - Force to use generic font (cosmetic changes) - Use procstat(1) instead of /proc through linprocfs(5) - Remove dbus-send command (see bug #258674 for full d PR: 260551 --- x11/elementary-terminal/Makefile | 7 +- x11/elementary-terminal/distinfo | 6 +- .../patch-data_io.elementary.terminal.gschema.xml | 11 +++ .../files/patch-data_meson.build | 41 +++++++++++ .../files/patch-src_Widgets_TerminalWidget.vala | 84 ++++++++++++++++++++++ x11/elementary-terminal/pkg-plist | 2 - 6 files changed, 142 insertions(+), 9 deletions(-) diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile index 484bc2348da1..a1c17496ec88 100644 --- a/x11/elementary-terminal/Makefile +++ b/x11/elementary-terminal/Makefile @@ -1,5 +1,5 @@ PORTNAME= terminal -DISTVERSION= 6.0.0 +DISTVERSION= 6.0.1 CATEGORIES= x11 PKGNAMEPREFIX= elementary- @@ -13,13 +13,12 @@ BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libgee-0.8.so:devel/libgee \ libgranite.so:x11-toolkits/granite \ libhandy-1.so:x11-toolkits/libhandy \ - libpcre2-posix.so:devel/pcre2 \ - libvte-2.91.so:x11-toolkits/vte3 + libpcre2-posix.so:devel/pcre2 USES= desktop-file-utils gettext gnome meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= elementary -USE_GNOME= glib20 gtk30 +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 vte3 GLIB_SCHEMAS= io.elementary.terminal.gschema.xml .include diff --git a/x11/elementary-terminal/distinfo b/x11/elementary-terminal/distinfo index 60da6fd3baf9..aef915b19596 100644 --- a/x11/elementary-terminal/distinfo +++ b/x11/elementary-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632278975 -SHA256 (elementary-terminal-6.0.0_GH0.tar.gz) = 394b17a7705a735d6a4876984a0cbf93f05c8e0b4d772d2ab366573d33777810 -SIZE (elementary-terminal-6.0.0_GH0.tar.gz) = 846484 +TIMESTAMP = 1639925265 +SHA256 (elementary-terminal-6.0.1_GH0.tar.gz) = de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca +SIZE (elementary-terminal-6.0.1_GH0.tar.gz) = 865233 diff --git a/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml new file mode 100644 index 000000000000..7e08f19719ca --- /dev/null +++ b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml @@ -0,0 +1,11 @@ +--- data/io.elementary.terminal.gschema.xml.orig 2021-07-15 21:30:31 UTC ++++ data/io.elementary.terminal.gschema.xml +@@ -155,7 +155,7 @@ + Defines the encoding to be used by the terminal. + + +- "" ++ "Monospace Regular 12" + The default font of the terminal. + The default font of the terminal. use [Font Name] [Property] [Size]. eg. Droid Sans Mono 12. + diff --git a/x11/elementary-terminal/files/patch-data_meson.build b/x11/elementary-terminal/files/patch-data_meson.build new file mode 100644 index 000000000000..18a76de865f4 --- /dev/null +++ b/x11/elementary-terminal/files/patch-data_meson.build @@ -0,0 +1,41 @@ +--- data/meson.build.orig 2021-12-13 18:31:36 UTC ++++ data/meson.build +@@ -4,7 +4,6 @@ install_data( + ) + + i18n.merge_file ( +- 'desktop', + input: meson.project_name() + '.desktop.in', + output: meson.project_name() + '.desktop', + install: true, +@@ -14,7 +13,6 @@ i18n.merge_file ( + ) + + i18n.merge_file ( +- 'desktop', + input: 'open-pantheon-terminal-here.desktop.in', + output: 'open-pantheon-terminal-here.desktop', + install: true, +@@ -24,7 +22,6 @@ i18n.merge_file ( + ) + + i18n.merge_file ( +- 'appdata', + input: meson.project_name() + '.appdata.xml.in', + output: meson.project_name() + '.appdata.xml', + install: true, +@@ -42,14 +39,4 @@ test ( + 'Validate open here desktop file', + find_program('desktop-file-validate'), + args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop') +-) +- +-install_data( +- 'pantheon_terminal_process_completion_notifications.fish', +- install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d') +-) +- +-install_data( +- 'enable-zsh-completion-notifications', +- install_dir: join_paths(get_option('datadir'), meson.project_name()) + ) diff --git a/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala new file mode 100644 index 000000000000..ab10a93473b2 --- /dev/null +++ b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala @@ -0,0 +1,84 @@ +--- src/Widgets/TerminalWidget.vala.orig 2021-12-13 18:31:36 UTC ++++ src/Widgets/TerminalWidget.vala +@@ -68,13 +68,6 @@ namespace Terminal { + } + + public int default_size; +- const string SEND_PROCESS_FINISHED_BASH = "dbus-send --type=method_call " + +- "--session --dest=io.elementary.terminal " + +- "/io/elementary/terminal " + +- "io.elementary.terminal.ProcessFinished " + +- "string:$PANTHEON_TERMINAL_ID " + +- "string:\"$(history 1 | cut -c 8-)\" " + +- "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 { + + envv = { + // 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 +- "PROMPT_COMMAND=" + SEND_PROCESS_FINISHED_BASH + Environment.get_variable ("PROMPT_COMMAND"), +- +- // ZSH callback command will be read from ZSH config file supplied by us, see data/ +- +- // TODO: support FISH, see https://github.com/fish-shell/fish-shell/issues/1382 ++ "PANTHEON_TERMINAL_ID=" + terminal_id + }; + + /* We need opening uri to be available asap when constructing window with working directory +@@ -454,12 +440,49 @@ namespace Terminal { + return this.match_check_event (event, null); + } + ++ private string? extract_cwd (string data) { ++ string[] tokens; ++ string result = null; ++ ++ tokens = data.split (" "); ++ if (tokens.length > 0) { ++ result = tokens[(tokens.length - 1)]; ++ } ++ return result; ++ } ++ + public string get_shell_location () { ++ string[] spawn_env = GLib.Environ.get (); ++ 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 */ ++ procstat_cmd += pid.to_string (); ++ + try { +- return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid)); +- } catch (GLib.FileError error) { ++ res = GLib.Process.spawn_sync (null, procstat_cmd, ++ spawn_env, ++ GLib.SpawnFlags.STDERR_TO_DEV_NULL, ++ null, ++ out standard_output, ++ null, null); ++ if (res) { ++ cwd = extract_cwd (standard_output.strip ()); ++ if (cwd != null) { ++ return cwd; ++ } ++ else { ++ return GLib.Environment.get_current_dir (); ++ } ++ } ++ else { ++ return GLib.Environment.get_current_dir (); ++ } ++ } catch (GLib.SpawnError error) { + /* Tab name disambiguation may call this before shell location available. */ + /* No terminal warning needed */ + return ""; diff --git a/x11/elementary-terminal/pkg-plist b/x11/elementary-terminal/pkg-plist index a2c608ff73b9..5f9058ee060b 100644 --- a/x11/elementary-terminal/pkg-plist +++ b/x11/elementary-terminal/pkg-plist @@ -1,8 +1,6 @@ bin/io.elementary.terminal share/applications/io.elementary.terminal.desktop share/applications/open-pantheon-terminal-here.desktop -share/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish -share/io.elementary.terminal/enable-zsh-completion-notifications share/locale/aa/LC_MESSAGES/io.elementary.terminal.mo share/locale/ab/LC_MESSAGES/io.elementary.terminal.mo share/locale/ae/LC_MESSAGES/io.elementary.terminal.mo