diff --git a/mate-terminal-1.22.1.tar.xz b/mate-terminal-1.22.1.tar.xz new file mode 100644 index 0000000..626eb76 Binary files /dev/null and b/mate-terminal-1.22.1.tar.xz differ diff --git a/mate-terminal.spec b/mate-terminal.spec new file mode 100644 index 0000000..f513244 --- /dev/null +++ b/mate-terminal.spec @@ -0,0 +1,339 @@ +# Conditional for release and snapshot builds. Uncomment for release-builds. +%global rel_build 1 + +# This is needed, because src-url contains branched part of versioning-scheme. +%global branch 1.22 + +# Settings used for build from snapshots. +%{!?rel_build:%global commit ac33ed09bb41ba717df3722cc71e25c1aa5134c5} +%{!?rel_build:%global commit_date 20150709} +%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} +%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} +%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} +%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} + +Summary: Terminal emulator for MATE +Name: mate-terminal +Version: %{branch}.1 +%if 0%{?rel_build} +Release: 2%{?dist} +%else +Release: 0.8%{?git_rel}%{?dist} +%endif +License: GPLv3+ +URL: http://mate-desktop.org + +# for downloading the tarball use 'spectool -g -R mate-terminal.spec' +# Source for release-builds. +%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} +# Source for snapshot-builds. +%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} + +#Default to black bg white fg, unlimited scrollback, turn off use theme default +Patch1: mate-terminal_better_defaults-1.19.0.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1781564 +# https://github.com/mate-desktop/mate-terminal/pull/316 +Patch2: mate-terminal_0001-Avoid-NULL-pointer-dereference-in-terminal_screen_ch.patch + +BuildRequires: dconf-devel +BuildRequires: desktop-file-utils +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: libSM-devel +BuildRequires: mate-common +BuildRequires: vte291-devel + +# needed to get a gsettings schema, rhbz #908105 +Requires: mate-desktop-libs +Requires: gsettings-desktop-schemas + +%description +Mate-terminal is a terminal emulator for MATE. It supports translucent +backgrounds, opening multiple terminals in a single window (tabs) and +clickable URLs. + +%prep +%if 0%{?rel_build} +%autosetup -p1 +%else +%autosetup -n %{name}-%{commit} -p1 +%endif + +%if 0%{?rel_build} +#NOCONFIGURE=1 ./autogen.sh +%else # 0%{?rel_build} +# needed for git snapshots +NOCONFIGURE=1 ./autogen.sh +%endif # 0%{?rel_build} + +%build +%configure --disable-static \ + --disable-schemas-compile + +make %{?_smp_mflags} V=1 + + +%install +%{make_install} + +desktop-file-install \ + --delete-original \ + --dir=%{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/mate-terminal.desktop + +%find_lang %{name} --with-gnome --all-name + + +%files -f %{name}.lang +%doc AUTHORS COPYING NEWS README ChangeLog +%{_bindir}/mate-terminal +%{_bindir}/mate-terminal.wrapper +%{_datadir}/applications/mate-terminal.desktop +%{_datadir}/glib-2.0/schemas/org.mate.terminal.gschema.xml +%{_datadir}/metainfo/mate-terminal.appdata.xml +%{_mandir}/man1/* + + +%changelog +* Sat Dec 14 2019 Wolfgang Ulbrich - 1.22.1-2 +- use https://github.com/mate-desktop/mate-terminal/pull/316 +- fixing rhbz (#1781564) + +* Thu Apr 25 2019 Wolfgang Ulbrich - 1.22.1-1 +- update to 1.22.1 + +* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 +- update to 1.22.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.20.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Jan 13 2019 Wolfgang Ulbrich - 1.20.2-2 +- Set TERM to xterm-256color +- use https://github.com/mate-desktop/mate-terminal/commit/4f89d21 +- fix rhbz https://bugzilla.redhat.com/show_bug.cgi?id=1517870 + +* Wed Dec 26 2018 Wolfgang Ulbrich - 1.20.2-1 +- update to 1.20.2 release + +* Fri Jul 13 2018 Fedora Release Engineering - 1.20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Wolfgang Ulbrich - 1.20.1-1 +- update to 1.20.1 + +* Fri May 18 2018 Wolfgang Ulbrich - 1.20.0-3 +- drop patch for gnome-shell as it causes issues in MATE session + +* Fri Apr 06 2018 Wolfgang Ulbrich - 1.20.0-2 +- use https://github.com/mate-desktop/mate-terminal/pull/236 +- fix transparency background in gnome-shell + +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 +- update to 1.20.0 release +- drop GSettings Schema rpm scriplet +- switch to autosetup + +* Thu Feb 08 2018 Fedora Release Engineering - 1.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 01 2018 Wolfgang Ulbrich - 1.19.1-1 +- update to 1.19.1 +- use https://github.com/mate-desktop/mate-terminal/pull/215 + +* Wed Oct 11 2017 Wolfgang Ulbrich - 1.19.0-1 +- update to 1.19.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.18.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat May 06 2017 Wolfgang Ulbrich - 1.18.1-1 +- update to 1.18.1 + +* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 +- update to 1.18.0 release + +* Fri Feb 10 2017 Fedora Release Engineering - 1.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Wolfgang Ulbrich - 1.17.0-3 +- fix rhbz (#1398234), (#1417365), (#1399641) + +* Fri Jan 27 2017 Wolfgang Ulbrich - 1.17.0-2 +- fix rhbz (#1411035) + +* Sun Dec 11 2016 Wolfgang Ulbrich - 1.17.0-1 +- update to 1.17.0 release + +* Sun Nov 06 2016 Wolfgang Ulbrich - 1.16.1-2 +- fix rhbz (#1392132) + +* Thu Oct 13 2016 Wolfgang Ulbrich - 1.16.1-1 +- update to 1.16.1 release + +* Wed Sep 21 2016 Wolfgang Ulbrich - 1.16.0-2 +- fix rhbz (#1377805) +- fix terminal window position with geometry option + +* Wed Sep 21 2016 Wolfgang Ulbrich - 1.16.0-1 +- update to 1.16.0 release + +* Wed Sep 07 2016 Wolfgang Ulbrich - 1.15.1-2 +- fix rhbz (#1357693) + +* Fri Jul 22 2016 Wolfgang Ulbrich - 1.15.1-1 +- update to 1.15.1 release + +* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 +- update to 1.15.0 release + +* Thu May 26 2016 Wolfgang Ulbrich - 1.14.0-2 +- switch to gtk3 +- https://github.com/mate-desktop/mate-terminal/pull/118 + +* Thu Apr 07 2016 Wolfgang Ulbrich - 1.14.0-1 +- update to 1.14.0 + +* Fri Mar 11 2016 Wolfgang Ulbrich - 1.13.2-1 +- update to 1.13.2 release + +* Mon Feb 22 2016 Wolfgang Ulbrich - 1.13.1-1 +- update to 1.13.1 release + +* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 +- update to 1.13.0 release + +* Thu Feb 04 2016 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Dec 04 2015 Wolfgang Ulbrich - 1.12.1-1 +- update to 1.12.1 release + +* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 +- update to 1.12.0 release + +* Thu Oct 22 2015 Wolfgang Ulbrich - 1.11.0-1 +- update to 1.11.0 release +- remove upstreamed patch + +* Thu Oct 01 2015 Wolfgang Ulbrich - 1.10.1-2 +- fix usage of --tab at command line + +* Sat Jul 11 2015 Wolfgang Ulbrich - 1.10.1-1 +- update to 1.10.1 release +- remove upstreamed patches + +* Fri Jul 03 2015 Wolfgang Ulbrich - 1.10.0-3 +- use old help from 1.8 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 10 2015 Wolfgang Ulbrich - 1.10.0-1 +- update to 1.10.0 release + +* Wed May 06 2015 Wolfgang Ulbrich - 1.9.91-1 +- update to 1.9.91 release + +* Mon Apr 06 2015 Wolfgang Ulbrich - 1.9.90-11 +- update to 1.9.90 release + +* Thu Jan 22 2015 Wolfgang Ulbrich - 1.9.1-1 +- update to 1.9.1 release + +* Sun Aug 17 2014 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.0-1 +- update to 1.9.0 release + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Mar 05 2014 Dan Mashal - 1.8.0-1 +- Update to 1.8.0 + +* Wed Feb 19 2014 Wolfgang Ulbrich - 1.7.90-1 +- update to 1.7.90 + +* Sun Feb 09 2014 Dan Mashal - 1.7.2-1 +- Update to 1.7.2 + +* Sat Jan 18 2014 Wolfgang Ulbrich - 1.7.1-1 +- update to 1.7.1 release +- remove obsolete configure flags +- clean up BR's +- use modern 'make install' macro +- add --with-gnome --all-name for find language +- clean up file section + +* Fri Dec 06 2013 Dan Mashal - 1.7.0-1 +- Update to 1.7.0 + +* Thu Aug 08 2013 Wolfgang Ulbrich - 1.6.1-11 +- switch to runtime require mate-desktop-libs, fix rhbz #908105 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 15 2013 Wolfgang Ulbrich - 1.6.1.9 +- another fix for better default patch + +* Sat Jun 29 2013 Wolfgang Ulbrich - 1.6.1.8 +- add runtime require gsettings-desktop-schemas to have proxy support +- from gnome gsettings schema + +* Fri Jun 28 2013 Wolfgang Ulbrich - 1.6.1.7 +- improve better_default patch +- remove BR gsettings-desktop-schemas-devel +- remove update-desktop-database scriptlet + +* Mon Jun 17 2013 Dan Mashal - 1.6.1-6 +- Update patch for bold colors + +* Fri May 03 2013 Dan Mashal - 1.6.1-5 +- Update patch again + +* Fri May 03 2013 Dan Mashal - 1.6.1-4 +- Update patch (again) to really fix annoying default settings + +* Fri May 03 2013 Dan Mashal - 1.6.1-3 +- Update patch to really fix annoying default settings +- New defaults: unlimited scrollback black bg + +* Fri May 03 2013 Dan Mashal - 1.6.1-2 +- Add patch to fix annoying default settings + +* Wed Apr 03 2013 Dan Mashal - 1.6.1-1 +- Bugfix release. See Cangelog. + +* Wed Apr 03 2013 Dan Mashal - 1.6.0-1 +- Update to stable 1.6.0 release + +* Tue Mar 26 2013 Dan Mashal - 1.5.1-1 +- Update to latest upstream release + +* Mon Feb 18 2013 Dan Mashal - 1.5.0-3 +- Add hard requires for mate-desktop to fix RHBZ #908105 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jan 19 2013 Dan Mashal - 1.5.0-1 +- Update to latest upstream release +- Special thanks to Shawn Sterling for his help + +* Wed Oct 24 2012 Leigh Scott - 1.4.0-4 +- Add requires libmate + +* Mon Oct 15 2012 Leigh Scott - 1.4.0-3 +- add build requires rarian-compat + +* Mon Oct 15 2012 Leigh Scott - 1.4.0-2 +- remove surplus build requires + +* Sun Oct 14 2012 Leigh Scott - 1.4.0-1 +- initial build diff --git a/mate-terminal_0001-Avoid-NULL-pointer-dereference-in-terminal_screen_ch.patch b/mate-terminal_0001-Avoid-NULL-pointer-dereference-in-terminal_screen_ch.patch new file mode 100644 index 0000000..bae8057 --- /dev/null +++ b/mate-terminal_0001-Avoid-NULL-pointer-dereference-in-terminal_screen_ch.patch @@ -0,0 +1,28 @@ +From 761f1a5d33b99e532d525be76a2cfb70d9734900 Mon Sep 17 00:00:00 2001 +From: rbuj +Date: Wed, 11 Dec 2019 19:13:52 +0100 +Subject: [PATCH] Avoid NULL pointer dereference in + terminal_screen_child_exited + +Fixes #314 +--- + src/terminal-screen.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/terminal-screen.c b/src/terminal-screen.c +index aba6cb1..55a01bc 100644 +--- a/src/terminal-screen.c ++++ b/src/terminal-screen.c +@@ -1956,6 +1956,9 @@ terminal_screen_child_exited (VteTerminal *terminal, int status) + break; + case TERMINAL_EXIT_HOLD: + { ++ if ((status == 9) && (priv->override_command == NULL)) ++ break; ++ + GtkWidget *info_bar; + + info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO, +-- +2.21.0 + diff --git a/mate-terminal_better_defaults-1.19.0.patch b/mate-terminal_better_defaults-1.19.0.patch new file mode 100644 index 0000000..ddc92db --- /dev/null +++ b/mate-terminal_better_defaults-1.19.0.patch @@ -0,0 +1,115 @@ +diff -uprN mate-terminal-1.19.0-orig/src/org.mate.terminal.gschema.xml.in mate-terminal-1.19.0/src/org.mate.terminal.gschema.xml.in +--- mate-terminal-1.19.0-orig/src/org.mate.terminal.gschema.xml.in 2017-12-21 13:52:12.555278000 +0100 ++++ mate-terminal-1.19.0/src/org.mate.terminal.gschema.xml.in 2017-12-21 14:21:55.774254866 +0100 +@@ -94,22 +94,22 @@ + True if the menubar should be shown in new windows, for windows/tabs with this profile. + + +- '#000000' ++ '#E6E6E6' + Default color of text in the terminal + Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). + + +- '#FFFFDD' ++ '#000000' + Default color of terminal background + Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as "red"). + + +- '#000000' ++ '#FFFFFF' + Default color of bold text in the terminal + Default color of bold text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as "red"). This is ignored if bold_color_same_as_fg is true. + + +- true ++ false + Whether bold text should use the same color as normal text + If true, boldface text will be rendered using the same color as normal text. + +@@ -169,7 +169,7 @@ + Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback_unlimited is true, this value is ignored. + + +- false ++ true + Whether an unlimited number of lines should be kept in scrollback + If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal. + +@@ -264,7 +264,7 @@ + Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key. + + +- true ++ false + Whether to use the colors from the theme for the terminal widget + If true, the theme color scheme used for text entry boxes will be used for the terminal, instead of colors provided by the user. + +diff -uprN mate-terminal-1.19.0-orig/src/profile-editor.c mate-terminal-1.19.0/src/profile-editor.c +--- mate-terminal-1.19.0-orig/src/profile-editor.c 2017-12-21 13:52:12.563278000 +0100 ++++ mate-terminal-1.19.0/src/profile-editor.c 2017-12-21 14:31:55.834656182 +0100 +@@ -41,6 +41,11 @@ struct _TerminalColorScheme + static const TerminalColorScheme color_schemes[] = + { + { ++ N_("White on black"), ++ { 1, 1, 1, 1 }, ++ { 0, 0, 0, 1 } ++ }, ++ { + N_("Black on light yellow"), + { 0, 0, 0, 1 }, + { 1, 1, 0.866667, 1 } +@@ -60,11 +65,6 @@ static const TerminalColorScheme color_s + { 0, 1, 0, 1 }, + { 0, 0, 0, 1 } + }, +- { +- N_("White on black"), +- { 1, 1, 1, 1 }, +- { 0, 0, 0, 1 } +- }, + /* Translators: "Solarized" is the name of a colour scheme, "light" can be translated */ + { N_("Solarized light"), + { 0.396078, 0.482352, 0.513725, 1 }, +diff -uprN mate-terminal-1.19.0-orig/src/terminal-profile.c mate-terminal-1.19.0/src/terminal-profile.c +--- mate-terminal-1.19.0-orig/src/terminal-profile.c 2017-12-21 13:52:12.564278000 +0100 ++++ mate-terminal-1.19.0/src/terminal-profile.c 2017-12-21 14:21:55.776254887 +0100 +@@ -129,8 +129,9 @@ enum + + /* Keep these in sync with the GSettings schema! */ + #define DEFAULT_ALLOW_BOLD (TRUE) +-#define DEFAULT_BACKGROUND_COLOR ("#FFFFDD") +-#define DEFAULT_BOLD_COLOR_SAME_AS_FG (TRUE) ++#define DEFAULT_BACKGROUND_COLOR ("#000000") ++#define DEFAULT_BOLD_COLOR ("#FFFFFF") ++#define DEFAULT_BOLD_COLOR_SAME_AS_FG (FALSE) + #define DEFAULT_BACKGROUND_DARKNESS (0.5) + #define DEFAULT_BACKGROUND_IMAGE_FILE ("") + #define DEFAULT_BACKGROUND_IMAGE (NULL) +@@ -145,13 +146,13 @@ enum + #define DEFAULT_DELETE_BINDING (VTE_ERASE_DELETE_SEQUENCE) + #define DEFAULT_EXIT_ACTION (TERMINAL_EXIT_CLOSE) + #define DEFAULT_FONT ("Monospace 12") +-#define DEFAULT_FOREGROUND_COLOR ("#000000") ++#define DEFAULT_FOREGROUND_COLOR ("#E6E6E6") + #define DEFAULT_LOGIN_SHELL (FALSE) + #define DEFAULT_NAME (NULL) + #define DEFAULT_PALETTE (terminal_palettes[TERMINAL_PALETTE_TANGO]) + #define DEFAULT_SCROLL_BACKGROUND (TRUE) + #define DEFAULT_SCROLLBACK_LINES (512) +-#define DEFAULT_SCROLLBACK_UNLIMITED (FALSE) ++#define DEFAULT_SCROLLBACK_UNLIMITED (TRUE) + #define DEFAULT_SCROLLBAR_POSITION (TERMINAL_SCROLLBAR_RIGHT) + #define DEFAULT_SCROLL_ON_KEYSTROKE (TRUE) + #define DEFAULT_SCROLL_ON_OUTPUT (FALSE) +@@ -164,7 +165,7 @@ enum + #define DEFAULT_USE_CUSTOM_DEFAULT_SIZE (FALSE) + #define DEFAULT_USE_SKEY (TRUE) + #define DEFAULT_USE_SYSTEM_FONT (TRUE) +-#define DEFAULT_USE_THEME_COLORS (TRUE) ++#define DEFAULT_USE_THEME_COLORS (FALSE) + #define DEFAULT_VISIBLE_NAME (N_("Unnamed")) + #define DEFAULT_WORD_CHARS ("-A-Za-z0-9,./?%&#:_=+@~") +