Attachment 228119 Details for Bug 258674 – Fix linuxism

[patch] Fix linuxism

elementary-terminal-6.0.0.diff (text/plain), 5.86 KB, created by Olivier Duchateau on 2021-09-22 12:17:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2021-09-22 12:17:26 UTC

Size: 5.86 KB

patch

obsolete

>diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile
>index fa8a0017f..1259806f3 100644
>--- a/x11/elementary-terminal/Makefile
>+++ b/x11/elementary-terminal/Makefile
>@@ -1,3 +1,5 @@
>+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
>+
> PORTNAME=	terminal
> DISTVERSION=	6.0.0
> CATEGORIES=	x11
>@@ -13,14 +15,21 @@ 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-8.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 pango glib20 gtk30 vte3
>+
>+SUB_FILES=	pkg-message
>+MESON_ARGS=	-Dubuntu-bionic-patched-vte=false
>+
> GLIB_SCHEMAS=	io.elementary.terminal.gschema.xml
> INSTALLS_ICONS=	yes
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|/proc|/compat/linux/proc|' \
>+		${WRKSRC}/src/Widgets/TerminalWidget.vala
>+
> .include <bsd.port.mk>
>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 000000000..7e08f1971
>--- /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 000000000..0cc6d05fc
>--- /dev/null
>+++ b/x11/elementary-terminal/files/patch-data_meson.build
>@@ -0,0 +1,16 @@
>+--- data/meson.build.orig	2020-04-02 00:28:39 UTC
>++++ data/meson.build
>+@@ -43,13 +43,3 @@ test (
>+     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 000000000..73a2bdab7
>--- /dev/null
>+++ b/x11/elementary-terminal/files/patch-src_Widgets_TerminalWidget.vala
>@@ -0,0 +1,32 @@
>+--- src/Widgets/TerminalWidget.vala.orig	2021-07-15 21:30:31 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
>diff --git a/x11/elementary-terminal/files/pkg-message.in b/x11/elementary-terminal/files/pkg-message.in
>new file mode 100644
>index 000000000..dae48a7c9
>--- /dev/null
>+++ b/x11/elementary-terminal/files/pkg-message.in
>@@ -0,0 +1,12 @@
>+[
>+{
>+    type: install
>+    message: <<EOM
>+pantheon-terminal requires linprocfs(5) to be mounted. If you don't
>+have it mounted already, please add this line to /etc/fstab and run
>+`mount linproc`:
>+
>+  linproc /compat/linux/proc linprocfs rw 0 0
>+EOM
>+}
>+]
>diff --git a/x11/elementary-terminal/pkg-plist b/x11/elementary-terminal/pkg-plist
>index a2c608ff7..5f9058ee0 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

Actions: View | Diff

Attachments on bug 258674: 228119