git: 60019e71ae76 - main - x11/elementary-terminal: Update to 6.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Dec 2021 21:43:04 UTC
The branch main has been updated by nc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=60019e71ae76edfa624d714ed77f00b8dee98763
commit 60019e71ae76edfa624d714ed77f00b8dee98763
Author: Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2021-12-19 21:42:41 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
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 <bsd.port.mk>
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 @@
+ <description>Defines the encoding to be used by the terminal.</description>
+ </key>
+ <key name="font" type="s">
+- <default>""</default>
++ <default>"Monospace Regular 12"</default>
+ <summary>The default font of the terminal.</summary>
+ <description>The default font of the terminal. use [Font Name] [Property] [Size]. eg. Droid Sans Mono 12.</description>
+ </key>
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