Attachment #230250 for bug #260551

View | Details | Raw Unified | Return to bug 260551
Collapse All | Expand All




PORTNAME=	terminal
DISTVERSION=	6.0.1
CATEGORIES=	x11
PKGNAMEPREFIX=	elementary-


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

USES=		desktop-file-utils gettext gnome meson pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	elementary
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 vte3
GLIB_SCHEMAS=	io.elementary.terminal.gschema.xml

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11/elementary-terminal/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1632278975	1	TIMESTAMP = 1639925265
2	SHA256 (elementary-terminal-6.0.0_GH0.tar.gz) = 394b17a7705a735d6a4876984a0cbf93f05c8e0b4d772d2ab366573d33777810	2	SHA256 (elementary-terminal-6.0.1_GH0.tar.gz) = de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
3	SIZE (elementary-terminal-6.0.0_GH0.tar.gz) = 846484	3	SIZE (elementary-terminal-6.0.1_GH0.tar.gz) = 865233

Added Link Here

(-)b/x11/elementary-terminal/files/patch-data_io.elementary.terminal.gschema.xml (+11 lines)
1	--- data/io.elementary.terminal.gschema.xml.orig 2021-07-15 21:30:31 UTC
2	+++ data/io.elementary.terminal.gschema.xml
3	@@ -155,7 +155,7 @@
4	<description>Defines the encoding to be used by the terminal.</description>
5	</key>
6	<key name="font" type="s">
7	- <default>""</default>
8	+ <default>"Monospace Regular 12"</default>
9	<summary>The default font of the terminal.</summary>
10	<description>The default font of the terminal. use [Font Name] [Property] [Size]. eg. Droid Sans Mono 12.</description>
11	</key>




--- 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())
 )




--- 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 "";

Lines 1-8 Link Here

(-)b/x11/elementary-terminal/pkg-plist (-2 lines)
1	bin/io.elementary.terminal	1	bin/io.elementary.terminal
2	share/applications/io.elementary.terminal.desktop	2	share/applications/io.elementary.terminal.desktop
3	share/applications/open-pantheon-terminal-here.desktop	3	share/applications/open-pantheon-terminal-here.desktop
4	share/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish
5	share/io.elementary.terminal/enable-zsh-completion-notifications
6	share/locale/aa/LC_MESSAGES/io.elementary.terminal.mo	4	share/locale/aa/LC_MESSAGES/io.elementary.terminal.mo
7	share/locale/ab/LC_MESSAGES/io.elementary.terminal.mo	5	share/locale/ab/LC_MESSAGES/io.elementary.terminal.mo
8	share/locale/ae/LC_MESSAGES/io.elementary.terminal.mo	6	share/locale/ae/LC_MESSAGES/io.elementary.terminal.mo

Return to bug 260551

Lines 1-5 Link Here

(-)b/x11/elementary-terminal/Makefile (-4 / +3 lines)
1	PORTNAME= terminal	1	PORTNAME= terminal
2	DISTVERSION= 6.0.0	2	DISTVERSION= 6.0.1
3	CATEGORIES= x11	3	CATEGORIES= x11
4	PKGNAMEPREFIX= elementary-	4	PKGNAMEPREFIX= elementary-
5		5
Lines 13-25 BUILD_DEPENDS= valac:lang/vala Link Here
13	LIB_DEPENDS= libgee-0.8.so:devel/libgee \	13	LIB_DEPENDS= libgee-0.8.so:devel/libgee \
14	libgranite.so:x11-toolkits/granite \	14	libgranite.so:x11-toolkits/granite \
15	libhandy-1.so:x11-toolkits/libhandy \	15	libhandy-1.so:x11-toolkits/libhandy \
16	libpcre2-posix.so:devel/pcre2 \	16	libpcre2-posix.so:devel/pcre2
17	libvte-2.91.so:x11-toolkits/vte3
18		17
19	USES= desktop-file-utils gettext gnome meson pkgconfig	18	USES= desktop-file-utils gettext gnome meson pkgconfig
20	USE_GITHUB= yes	19	USE_GITHUB= yes
21	GH_ACCOUNT= elementary	20	GH_ACCOUNT= elementary
22	USE_GNOME= glib20 gtk30	21	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 vte3
23	GLIB_SCHEMAS= io.elementary.terminal.gschema.xml	22	GLIB_SCHEMAS= io.elementary.terminal.gschema.xml
24		23
25	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Added Link Here

(-)b/x11/elementary-terminal/files/patch-data_meson.build (+41 lines)
1	--- data/meson.build.orig 2021-12-13 18:31:36 UTC
2	+++ data/meson.build
3	@@ -4,7 +4,6 @@ install_data(
4	)
5
6	i18n.merge_file (
7	- 'desktop',
8	input: meson.project_name() + '.desktop.in',
9	output: meson.project_name() + '.desktop',
10	install: true,
11	@@ -14,7 +13,6 @@ i18n.merge_file (
12	)
13
14	i18n.merge_file (
15	- 'desktop',
16	input: 'open-pantheon-terminal-here.desktop.in',
17	output: 'open-pantheon-terminal-here.desktop',
18	install: true,
19	@@ -24,7 +22,6 @@ i18n.merge_file (
20	)
21
22	i18n.merge_file (
23	- 'appdata',
24	input: meson.project_name() + '.appdata.xml.in',
25	output: meson.project_name() + '.appdata.xml',
26	install: true,
27	@@ -42,14 +39,4 @@ test (
28	'Validate open here desktop file',
29	find_program('desktop-file-validate'),
30	args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop')
31	-)
32	-
33	-install_data(
34	- 'pantheon_terminal_process_completion_notifications.fish',
35	- install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d')
36	-)
37	-
38	-install_data(
39	- 'enable-zsh-completion-notifications',
40	- install_dir: join_paths(get_option('datadir'), meson.project_name())
41	)

Added Link Here

(-)b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala (+84 lines)
1	--- src/Widgets/TerminalWidget.vala.orig 2021-12-13 18:31:36 UTC
2	+++ src/Widgets/TerminalWidget.vala
3	@@ -68,13 +68,6 @@ namespace Terminal {
4	}
5
6	public int default_size;
7	- const string SEND_PROCESS_FINISHED_BASH = "dbus-send --type=method_call " +
8	- "--session --dest=io.elementary.terminal " +
9	- "/io/elementary/terminal " +
10	- "io.elementary.terminal.ProcessFinished " +
11	- "string:$PANTHEON_TERMINAL_ID " +
12	- "string:\"$(history 1 \| cut -c 8-)\" " +
13	- "int32:\$__bp_last_ret_value >/dev/null 2>&1";
14
15	/* Following strings are used to build RegEx for matching URIs */
16	const string USERCHARS = "-[:alnum:]";
17	@@ -364,14 +357,7 @@ namespace Terminal {
18
19	envv = {
20	// Export ID so we can identify the terminal for which the process completion is reported
21	- "PANTHEON_TERMINAL_ID=" + terminal_id,
22	-
23	- // Export callback command a BASH-specific variable, see "man bash" for details
24	- "PROMPT_COMMAND=" + SEND_PROCESS_FINISHED_BASH + Environment.get_variable ("PROMPT_COMMAND"),
25	-
26	- // ZSH callback command will be read from ZSH config file supplied by us, see data/
27	-
28	- // TODO: support FISH, see https://github.com/fish-shell/fish-shell/issues/1382
29	+ "PANTHEON_TERMINAL_ID=" + terminal_id
30	};
31
32	/* We need opening uri to be available asap when constructing window with working directory
33	@@ -454,12 +440,49 @@ namespace Terminal {
34	return this.match_check_event (event, null);
35	}
36
37	+ private string? extract_cwd (string data) {
38	+ string[] tokens;
39	+ string result = null;
40	+
41	+ tokens = data.split (" ");
42	+ if (tokens.length > 0) {
43	+ result = tokens[(tokens.length - 1)];
44	+ }
45	+ return result;
46	+ }
47	+
48	public string get_shell_location () {
49	+ string[] spawn_env = GLib.Environ.get ();
50	+ string[] procstat_cmd = {"/usr/bin/pwdx", "--libxo:T",};
51	+ string standard_output = null;
52	+ bool res;
53	+ string cwd = null;
54	+
55	int pid = (!) (this.child_pid);
56
57	+ /* Update procstat(1) argument */
58	+ procstat_cmd += pid.to_string ();
59	+
60	try {
61	- return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
62	- } catch (GLib.FileError error) {
63	+ res = GLib.Process.spawn_sync (null, procstat_cmd,
64	+ spawn_env,
65	+ GLib.SpawnFlags.STDERR_TO_DEV_NULL,
66	+ null,
67	+ out standard_output,
68	+ null, null);
69	+ if (res) {
70	+ cwd = extract_cwd (standard_output.strip ());
71	+ if (cwd != null) {
72	+ return cwd;
73	+ }
74	+ else {
75	+ return GLib.Environment.get_current_dir ();
76	+ }
77	+ }
78	+ else {
79	+ return GLib.Environment.get_current_dir ();
80	+ }
81	+ } catch (GLib.SpawnError error) {
82	/* Tab name disambiguation may call this before shell location available. */
83	/* No terminal warning needed */
84	return "";