diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile index b19d396699e5..f4adf21bfe32 100644 --- a/x11/elementary-terminal/Makefile +++ b/x11/elementary-terminal/Makefile @@ -1,25 +1,24 @@ PORTNAME= terminal -DISTVERSION= 7.2.0 +DISTVERSION= 8.1.0 CATEGORIES= x11 PKGNAMEPREFIX= elementary- MAINTAINER= ports@FreeBSD.org COMMENT= Terminal emulator designed for elementary OS WWW= https://github.com/elementary/terminal LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgee-0.8.so:devel/libgee \ - libgranite.so:x11-toolkits/granite \ - libhandy-1.so:x11-toolkits/libhandy \ + libgranite-7.so:x11-toolkits/granite7 \ libpcre2-posix.so:devel/pcre2 USES= desktop-file-utils gettext-tools gnome meson pkgconfig \ vala:build USE_GITHUB= yes GH_ACCOUNT= elementary -USE_GNOME= cairo gdkpixbuf glib20 gtk30 vte3 +USE_GNOME= cairo gdkpixbuf glib20 gtk40 libadwaita vte3 GLIB_SCHEMAS= io.elementary.terminal.gschema.xml .include diff --git a/x11/elementary-terminal/distinfo b/x11/elementary-terminal/distinfo index 07dbfc5f12a6..d2a1318e2c55 100644 --- a/x11/elementary-terminal/distinfo +++ b/x11/elementary-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764177420 -SHA256 (elementary-terminal-7.2.0_GH0.tar.gz) = 81307ce4ece35bd76ac3bcd1611de0dc641ddd7c625dec76e5f68b9ae8d70d63 -SIZE (elementary-terminal-7.2.0_GH0.tar.gz) = 1085540 +TIMESTAMP = 1788627039 +SHA256 (elementary-terminal-8.1.0_GH0.tar.gz) = 2fc908bf9c89e21443e0f343dfe8f779027a912672c75422e9128be527f34217 +SIZE (elementary-terminal-8.1.0_GH0.tar.gz) = 1190899 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 index fa2ebfeef2f4..a9a1931ca397 100644 --- a/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml +++ b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml @@ -1,11 +1,11 @@ ---- data/io.elementary.terminal.gschema.xml.orig 2023-04-04 17:39:57 UTC +--- data/io.elementary.terminal.gschema.xml.orig 2026-08-03 19:07:29 UTC +++ data/io.elementary.terminal.gschema.xml -@@ -164,7 +164,7 @@ +@@ -163,7 +163,7 @@ DEPRECATED: This key is deprecated and ignored. - "" + "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-src_Widgets_TerminalWidget.vala b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala index 74442c7f4f2b..7af1b6c1ba71 100644 --- a/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala +++ b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala @@ -1,85 +1,86 @@ ---- src/Widgets/TerminalWidget.vala.orig 2022-10-27 16:47:44 UTC +--- src/Widgets/TerminalWidget.vala.orig 2026-08-03 19:07:29 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:\"$(fc -nl -1 | cut -c 3-)\" " + -- "int32:\$__bp_last_ret_value >/dev/null 2>&1"; +@@ -65,14 +65,6 @@ namespace Terminal { + public const string[] ACCELS_ZOOM_IN = { "plus", "equal", "KP_Add", null }; + public const string[] ACCELS_ZOOM_OUT = { "minus", "KP_Subtract", null }; +- private 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:\"$(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:]"; -@@ -351,15 +344,7 @@ namespace Terminal { - shell = Vte.get_user_shell (); + private const string USERCHARS = "-[:alnum:]"; + private const string USERCHARS_CLASS = "[" + USERCHARS + "]"; +@@ -867,15 +859,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 -@@ -436,12 +421,49 @@ namespace Terminal { - return this.match_check_event (event, null); +@@ -948,12 +932,49 @@ namespace Terminal { + return check_match_at (x, y, 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/files/patch-src_meson.build b/x11/elementary-terminal/files/patch-src_meson.build index 7c7e41ae6d29..2fa4dd006a12 100644 --- a/x11/elementary-terminal/files/patch-src_meson.build +++ b/x11/elementary-terminal/files/patch-src_meson.build @@ -1,39 +1,38 @@ ---- src/meson.build.orig 2025-02-13 20:52:15 UTC +--- src/meson.build.orig 2026-08-03 19:07:29 UTC +++ src/meson.build -@@ -40,36 +40,3 @@ executable( - dependencies: terminal_deps, +@@ -41,35 +41,4 @@ executable( install : true ) -- + -# tests - --test_env = [ -- 'G_TEST_SRCDIR=' + meson.current_source_dir(), -- 'G_TEST_BUILDDIR=' + meson.current_build_dir(), -- 'GSETTINGS_SCHEMA_DIR=' + meson.project_build_root() / 'data', -- 'GSETTINGS_BACKEND=memory', -- 'GIO_USE_VFS=local' --] +-# test_env = [ +-# 'G_TEST_SRCDIR=' + meson.current_source_dir(), +-# 'G_TEST_BUILDDIR=' + meson.current_build_dir(), +-# 'GSETTINGS_SCHEMA_DIR=' + meson.project_build_root() / 'data', +-# 'GSETTINGS_BACKEND=memory', +-# 'GIO_USE_VFS=local' +-# ] - --add_test_setup( -- 'headless', -- exe_wrapper: [ find_program('xvfb-run'), '-a', '-s', '-screen 0 1024x768x24 -noreset' ], -- is_default: true --) +-# add_test_setup( +-# 'headless', +-# exe_wrapper: [ find_program('xvfb-run'), '-a', '-s', '-screen 0 1024x768x24 -noreset' ], +-# is_default: true +-# ) - --app_test = executable( -- meson.project_name() + '.tests.application', -- terminal_sources + 'tests/Application.vala', -- dependencies: terminal_deps, -- vala_args: [ '--define', 'TESTS'] --) +-# app_test = executable( +-# meson.project_name() + '.tests.application', +-# terminal_sources + 'tests/Application.vala', +-# dependencies: terminal_deps, +-# vala_args: [ '--define', 'TESTS'] +-# ) - --test( -- 'Application', -- app_test, -- env: test_env, -- protocol: 'tap', -- depends: test_schemas --) +-# test( +-# 'Application', +-# app_test, +-# env: test_env, +-# protocol: 'tap', +-# depends: test_schemas +-# ) - --subdir('tests') + subdir('tests')