Attachment #239684 for bug #269135

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




PORTNAME=	elementary-code
DISTVERSION=	7.0.0
CATEGORIES=	editors

MAINTAINER=	miguel@gocobachi.dev

		pkcheck:sysutils/polkit

USES=		compiler:c++11-lang desktop-file-utils gettext gnome meson \
		ninja pkgconfig python:3.7+,build xorg vala:lib
USE_GITHUB=	yes
GH_ACCOUNT=	elementary
GH_PROJECT=	code
USE_GNOME=	cairo glib20 gtk30 gtksourceview4 pango vte3
GLIB_SCHEMAS=	io.elementary.code.gschema.xml \
		io.elementary.code.plugins.spell.gschema.xml
		io.elementary.code.plugins.terminal.gschema.xml
USE_LDCONFIG=	yes
USE_XORG=	x11


Lines 1-3 Link Here

(-)b/editors/elementary-code/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1653761499	1	TIMESTAMP = 1674590479
2	SHA256 (elementary-code-6.2.0_GH0.tar.gz) = 9ec273182b053fb424cc78ddd8da869d13261d35f22cd2198f2899b654d13d4f	2	SHA256 (elementary-code-7.0.0_GH0.tar.gz) = 5bf167102fd735ee74fb72b7fbc06dc67a6e6383f603be0ee97321213a4a7ce0
3	SIZE (elementary-code-6.2.0_GH0.tar.gz) = 1427323	3	SIZE (elementary-code-7.0.0_GH0.tar.gz) = 1696976




--- plugins/terminal/terminal.vala.orig	2022-04-04 16:20:49 UTC
+++ plugins/terminal/terminal.vala
@@ -200,13 +200,16 @@ public class Scratch.Plugins.Terminal : Peas.Extension
 
     public string get_shell_location () {
         int pid = (!) (this.child_pid);
+        string cwd = "";
 
         try {
-            return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
+            //return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
+            GLib.Process.spawn_command_line_sync ("pwd", out cwd);
         } catch (GLib.FileError error) {
             warning ("An error occurred while fetching the current dir of shell");
-            return "";
         }
+
+        return cwd;
     }
 
     void on_hook_notebook () {




--- src/Widgets/Terminal.vala.orig	2023-01-24 16:59:41 UTC
+++ src/Widgets/Terminal.vala
@@ -87,13 +87,14 @@ public class Code.Terminal : Gtk.Box {
     }
 
     private string get_shell_location () {
-        int pid = (!) (this.child_pid);
+        string cwd = "";
         try {
-            return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
+            GLib.Process.spawn_command_line_sync ("pwd", out cwd);
         } catch (GLib.FileError error) {
             warning ("An error occurred while fetching the current dir of shell: %s", error.message);
-            return "";
         }
+
+        return cwd;
     }
 
     private void update_terminal_settings (string settings_schema) {




lib/io.elementary.code/plugins/highlight-word-selection/libhighlight-word-selection.so
lib/io.elementary.code/plugins/markdown-actions/libmarkdown-actions.so
lib/io.elementary.code/plugins/markdown-actions/markdown-actions.plugin
lib/io.elementary.code/plugins/outline/liboutline.so
lib/io.elementary.code/plugins/outline/outline.plugin
lib/io.elementary.code/plugins/pastebin/libpastebin.so
lib/io.elementary.code/plugins/pastebin/pastebin.plugin
lib/io.elementary.code/plugins/preserve-indent/libpreserve-indent.so
lib/io.elementary.code/plugins/preserve-indent/preserve-indent.plugin
lib/io.elementary.code/plugins/spell/libspell.so
lib/io.elementary.code/plugins/spell/spell.plugin
lib/io.elementary.code/plugins/strip-trailing-save/libstrip-trailing-save.so
lib/io.elementary.code/plugins/strip-trailing-save/strip-trailing-save.plugin
lib/io.elementary.code/plugins/terminal/libterminal.so
lib/io.elementary.code/plugins/terminal/terminal.plugin
lib/io.elementary.code/plugins/vim-emulation/libvim-emulation.so
lib/io.elementary.code/plugins/vim-emulation/vim-emulation.plugin
lib/io.elementary.code/plugins/word-completion/libword-completion.so

lib/libcodecore.so.0.0
libdata/pkgconfig/codecore.pc
share/applications/io.elementary.code.desktop
share/gtksourceview-4/styles/elementary-dark.xml
share/gtksourceview-4/styles/elementary-light.xml
share/icons/hicolor/128x128/apps/io.elementary.code.svg
share/icons/hicolor/128x128@2/apps/io.elementary.code.svg
share/icons/hicolor/16x16/apps/io.elementary.code.svg

share/locale/zh_HK/LC_MESSAGES/io.elementary.code.mo
share/locale/zh_TW/LC_MESSAGES/io.elementary.code.mo
share/locale/zu/LC_MESSAGES/io.elementary.code.mo
share/metainfo/io.elementary.code.metainfo.xml
share/polkit-1/actions/io.elementary.code.policy
share/vala/vapi/codecore.deps
share/vala/vapi/codecore.vapi

Return to bug 269135

Lines 1-5 Link Here

(-)b/editors/elementary-code/Makefile (-4 / +3 lines)
1	PORTNAME= elementary-code	1	PORTNAME= elementary-code
2	DISTVERSION= 6.2.0	2	DISTVERSION= 7.0.0
3	CATEGORIES= editors	3	CATEGORIES= editors
4		4
5	MAINTAINER= miguel@gocobachi.dev	5	MAINTAINER= miguel@gocobachi.dev
Lines 26-39 RUN_DEPENDS= droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ Link Here
26	pkcheck:sysutils/polkit	26	pkcheck:sysutils/polkit
27		27
28	USES= compiler:c++11-lang desktop-file-utils gettext gnome meson \	28	USES= compiler:c++11-lang desktop-file-utils gettext gnome meson \
29	ninja pkgconfig python:3.6+,build xorg vala:lib	29	ninja pkgconfig python:3.7+,build xorg vala:lib
30	USE_GITHUB= yes	30	USE_GITHUB= yes
31	GH_ACCOUNT= elementary	31	GH_ACCOUNT= elementary
32	GH_PROJECT= code	32	GH_PROJECT= code
33	USE_GNOME= cairo glib20 gtk30 gtksourceview4 pango vte3	33	USE_GNOME= cairo glib20 gtk30 gtksourceview4 pango vte3
34	GLIB_SCHEMAS= io.elementary.code.gschema.xml \	34	GLIB_SCHEMAS= io.elementary.code.gschema.xml \
35	io.elementary.code.plugins.spell.gschema.xml \	35	io.elementary.code.plugins.spell.gschema.xml
36	io.elementary.code.plugins.terminal.gschema.xml
37	USE_LDCONFIG= yes	36	USE_LDCONFIG= yes
38	USE_XORG= x11	37	USE_XORG= x11
39		38

Removed Link Here

(-)a/editors/elementary-code/files/patch-plugins_terminal_terminal.vala (-21 lines)
1	--- plugins/terminal/terminal.vala.orig 2022-04-04 16:20:49 UTC
2	+++ plugins/terminal/terminal.vala
3	@@ -200,13 +200,16 @@ public class Scratch.Plugins.Terminal : Peas.Extension
4
5	public string get_shell_location () {
6	int pid = (!) (this.child_pid);
7	+ string cwd = "";
8
9	try {
10	- return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
11	+ //return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
12	+ GLib.Process.spawn_command_line_sync ("pwd", out cwd);
13	} catch (GLib.FileError error) {
14	warning ("An error occurred while fetching the current dir of shell");
15	- return "";
16	}
17	+
18	+ return cwd;
19	}
20
21	void on_hook_notebook () {

Added Link Here

(-)b/editors/elementary-code/files/patch-src_Widgets_Terminal.vala (+20 lines)
1	--- src/Widgets/Terminal.vala.orig 2023-01-24 16:59:41 UTC
2	+++ src/Widgets/Terminal.vala
3	@@ -87,13 +87,14 @@ public class Code.Terminal : Gtk.Box {
4	}
5
6	private string get_shell_location () {
7	- int pid = (!) (this.child_pid);
8	+ string cwd = "";
9	try {
10	- return GLib.FileUtils.read_link ("/proc/%d/cwd".printf (pid));
11	+ GLib.Process.spawn_command_line_sync ("pwd", out cwd);
12	} catch (GLib.FileError error) {
13	warning ("An error occurred while fetching the current dir of shell: %s", error.message);
14	- return "";
15	}
16	+
17	+ return cwd;
18	}
19
20	private void update_terminal_settings (string settings_schema) {

Lines 10-27 lib/io.elementary.code/plugins/highlight-word-selection/highlight-word-selection Link Here

(-)b/editors/elementary-code/pkg-plist (-7 / +3 lines)
10	lib/io.elementary.code/plugins/highlight-word-selection/libhighlight-word-selection.so	10	lib/io.elementary.code/plugins/highlight-word-selection/libhighlight-word-selection.so
11	lib/io.elementary.code/plugins/markdown-actions/libmarkdown-actions.so	11	lib/io.elementary.code/plugins/markdown-actions/libmarkdown-actions.so
12	lib/io.elementary.code/plugins/markdown-actions/markdown-actions.plugin	12	lib/io.elementary.code/plugins/markdown-actions/markdown-actions.plugin
13	lib/io.elementary.code/plugins/outline/liboutline.so
14	lib/io.elementary.code/plugins/outline/outline.plugin
15	lib/io.elementary.code/plugins/pastebin/libpastebin.so	13	lib/io.elementary.code/plugins/pastebin/libpastebin.so
16	lib/io.elementary.code/plugins/pastebin/pastebin.plugin	14	lib/io.elementary.code/plugins/pastebin/pastebin.plugin
17	lib/io.elementary.code/plugins/preserve-indent/libpreserve-indent.so	15	lib/io.elementary.code/plugins/preserve-indent/libpreserve-indent.so
18	lib/io.elementary.code/plugins/preserve-indent/preserve-indent.plugin	16	lib/io.elementary.code/plugins/preserve-indent/preserve-indent.plugin
19	lib/io.elementary.code/plugins/spell/libspell.so	17	lib/io.elementary.code/plugins/spell/libspell.so
20	lib/io.elementary.code/plugins/spell/spell.plugin	18	lib/io.elementary.code/plugins/spell/spell.plugin
21	lib/io.elementary.code/plugins/strip-trailing-save/libstrip-trailing-save.so
22	lib/io.elementary.code/plugins/strip-trailing-save/strip-trailing-save.plugin
23	lib/io.elementary.code/plugins/terminal/libterminal.so
24	lib/io.elementary.code/plugins/terminal/terminal.plugin
25	lib/io.elementary.code/plugins/vim-emulation/libvim-emulation.so	19	lib/io.elementary.code/plugins/vim-emulation/libvim-emulation.so
26	lib/io.elementary.code/plugins/vim-emulation/vim-emulation.plugin	20	lib/io.elementary.code/plugins/vim-emulation/vim-emulation.plugin
27	lib/io.elementary.code/plugins/word-completion/libword-completion.so	21	lib/io.elementary.code/plugins/word-completion/libword-completion.so
Lines 31-36 lib/libcodecore.so.0 Link Here
31	lib/libcodecore.so.0.0	25	lib/libcodecore.so.0.0
32	libdata/pkgconfig/codecore.pc	26	libdata/pkgconfig/codecore.pc
33	share/applications/io.elementary.code.desktop	27	share/applications/io.elementary.code.desktop
		28	share/gtksourceview-4/styles/elementary-dark.xml
		29	share/gtksourceview-4/styles/elementary-light.xml
34	share/icons/hicolor/128x128/apps/io.elementary.code.svg	30	share/icons/hicolor/128x128/apps/io.elementary.code.svg
35	share/icons/hicolor/128x128@2/apps/io.elementary.code.svg	31	share/icons/hicolor/128x128@2/apps/io.elementary.code.svg
36	share/icons/hicolor/16x16/apps/io.elementary.code.svg	32	share/icons/hicolor/16x16/apps/io.elementary.code.svg
Lines 242-248 share/locale/zh_CN/LC_MESSAGES/io.elementary.code.mo Link Here
242	share/locale/zh_HK/LC_MESSAGES/io.elementary.code.mo	238	share/locale/zh_HK/LC_MESSAGES/io.elementary.code.mo
243	share/locale/zh_TW/LC_MESSAGES/io.elementary.code.mo	239	share/locale/zh_TW/LC_MESSAGES/io.elementary.code.mo
244	share/locale/zu/LC_MESSAGES/io.elementary.code.mo	240	share/locale/zu/LC_MESSAGES/io.elementary.code.mo
245	share/metainfo/io.elementary.code.appdata.xml	241	share/metainfo/io.elementary.code.metainfo.xml
246	share/polkit-1/actions/io.elementary.code.policy	242	share/polkit-1/actions/io.elementary.code.policy
247	share/vala/vapi/codecore.deps	243	share/vala/vapi/codecore.deps
248	share/vala/vapi/codecore.vapi	244	share/vala/vapi/codecore.vapi