From e4950d1d47402e63dd80c4a4e40ae297aa673b48 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: May 18 2017 12:16:32 +0000 Subject: R2: add backported patch to fix compilation with vala 0.35+ --- diff --git a/00-fix-vala-036-compilation.patch b/00-fix-vala-036-compilation.patch new file mode 100644 index 0000000..bcb40ed --- /dev/null +++ b/00-fix-vala-036-compilation.patch @@ -0,0 +1,16 @@ +diff --git a/src/Pages/Shortcuts/custom_tree.vala b/src/Pages/Shortcuts/custom_tree.vala +index 762c569..86e72fa 100644 +--- a/src/Pages/Shortcuts/custom_tree.vala ++++ b/src/Pages/Shortcuts/custom_tree.vala +@@ -252,7 +252,11 @@ namespace Pantheon.Keyboard.Shortcuts { + tv.model.get_value (iter, Column.SCHEMA, out relocatable_schema); + + CustomShortcutSettings.remove_shortcut ((string) relocatable_schema); ++#if VALA_0_36 ++ list_store.remove (ref iter); ++#else + list_store.remove (iter); ++#endif + } + + bool tree_key_press (Gdk.EventKey ev) { diff --git a/switchboard-plug-keyboard.spec b/switchboard-plug-keyboard.spec index 8cc612d..c6dd3e5 100644 --- a/switchboard-plug-keyboard.spec +++ b/switchboard-plug-keyboard.spec @@ -3,11 +3,14 @@ Name: switchboard-plug-keyboard Summary: Switchboard Keyboard plug Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ -URL: https://launchpad.net/switchboard-plug-keyboard -Source0: https://launchpad.net/%{name}/loki/%{version}/+download/%{name}-%{version}.tar.xz +URL: https://launchpad.net/%{name} +Source0: %{url}/loki/%{version}/+download/%{name}-%{version}.tar.xz + +# Patch to fix compilation on vala 0.35+ +Patch0: 00-fix-vala-036-compilation.patch BuildRequires: cmake BuildRequires: gettext @@ -30,7 +33,7 @@ same time. Keyboard shortcuts are also part of this plug. %prep -%autosetup +%autosetup -p1 %build @@ -53,6 +56,9 @@ popd %changelog +* Thu May 18 2017 Fabio Valentini - 0.3.2-2 +- Add upstream patch to fix compilation with vala 0.35+. + * Tue Feb 07 2017 Fabio Valentini - 0.3.2-1 - Update to version 0.3.2.