diff --git a/.gitignore b/.gitignore index 55c25f7..2d66d58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /elementary-terminal-0.5.tar.gz /elementary-terminal-0.5.1.tar.gz +/elementary-terminal-0.5.2.tar.gz diff --git a/00-fix-vala-042-type-error.patch b/00-fix-vala-042-type-error.patch new file mode 100644 index 0000000..4678404 --- /dev/null +++ b/00-fix-vala-042-type-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/PantheonTerminalWindow.vala b/src/PantheonTerminalWindow.vala +index 6ed3f06..6c23d5f 100644 +--- a/src/PantheonTerminalWindow.vala ++++ b/src/PantheonTerminalWindow.vala +@@ -231,7 +231,7 @@ namespace PantheonTerminal { + + /** Returns true if the code parameter matches the keycode of the keyval parameter for + * any keyboard group or level (in order to allow for non-QWERTY keyboards) **/ +- protected bool match_keycode (int keyval, uint code) { ++ protected bool match_keycode (uint keyval, uint code) { + Gdk.KeymapKey [] keys; + Gdk.Keymap keymap = Gdk.Keymap.get_default (); + if (keymap.get_entries_for_keyval (keyval, out keys)) { diff --git a/elementary-terminal.spec b/elementary-terminal.spec index 06b8451..1ac1f7b 100644 --- a/elementary-terminal.spec +++ b/elementary-terminal.spec @@ -3,13 +3,17 @@ Name: elementary-terminal Summary: The terminal of the 21st century -Version: 0.5.1 +Version: 0.5.2 Release: 1%{?dist} License: LGPLv3 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Add upstream change to fix building with vala 0.42+ +# https://github.com/elementary/terminal/commit/28f2bf4 +Patch0: 00-fix-vala-042-type-error.patch + BuildRequires: appstream BuildRequires: desktop-file-utils BuildRequires: gettext @@ -56,7 +60,7 @@ notifications when using the fish shell. %build -%meson +%meson -Dubuntu-bionic-patched-vte=false %meson_build @@ -94,6 +98,10 @@ appstream-util validate-relax --nonet \ %changelog +* Mon Aug 27 2018 Fabio Valentini - 0.5.2-1 +- Update to version 0.5.2. +- Fix FTBFS issue with vala 0.42. + * Tue Jul 24 2018 Fabio Valentini - 0.5.1-1 - Update to version 0.5.1. diff --git a/sources b/sources index 43103ec..0e7dc7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (elementary-terminal-0.5.1.tar.gz) = bfd6cd05bdc89607c30cdedf9bbb0507f1187c4ee1c4e530bd32b6898b759f91ccdec9410b67faf9fcee54a9013ef582b1a61020bd9b58d31b0da9172925c288 +SHA512 (elementary-terminal-0.5.2.tar.gz) = 2d111f48d1f7dd5f278ebb29954e211d099b247a44cea7847b79e560fd05d1acb957b676a97638fa21737d5a5175aee9c14a76970d77f3b37435a9372e52f2d2