diff --git a/00-fix-vala-036-compilation.patch b/00-fix-vala-036-compilation.patch new file mode 100644 index 0000000..a4ca0d6 --- /dev/null +++ b/00-fix-vala-036-compilation.patch @@ -0,0 +1,82 @@ +From 894dfeaaa42e48b0c564ac78613da7beb14527df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Tue, 14 Mar 2017 10:51:05 +0100 +Subject: [PATCH] Fix build with latest Vala + +--- + src/Services/Adapter.vala | 24 ++++++++++++------------ + src/Services/Device.vala | 30 +++++++++++++++--------------- + 2 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/src/Services/Adapter.vala b/src/Services/Adapter.vala +index fd6aa5a..b06b041 100644 +--- a/src/Services/Adapter.vala ++++ b/src/Services/Adapter.vala +@@ -25,16 +25,16 @@ public interface Bluetooth.Services.Adapter : Object { + public abstract void start_discovery () throws IOError; + public abstract void stop_discovery () throws IOError; + +- public abstract string[] UUIDs { public owned get; private set; } +- public abstract bool discoverable { public get; public set; } +- public abstract bool discovering { public get; private set; } +- public abstract bool pairable { public get; public set; } +- public abstract bool powered { public get; public set; } +- public abstract string address { public owned get; private set; } +- public abstract string alias { public owned get; public set; } +- public abstract string modalias { public owned get; private set; } +- public abstract string name { public owned get; private set; } +- public abstract uint @class { public get; private set; } +- public abstract uint discoverable_timeout { public get; private set; } +- public abstract uint pairable_timeout { public get; private set; } ++ public abstract string[] UUIDs { owned get; } ++ public abstract bool discoverable { get; set; } ++ public abstract bool discovering { get; } ++ public abstract bool pairable { get; set; } ++ public abstract bool powered { get; set; } ++ public abstract string address { owned get; } ++ public abstract string alias { owned get; set; } ++ public abstract string modalias { owned get; } ++ public abstract string name { owned get; } ++ public abstract uint @class { get; } ++ public abstract uint discoverable_timeout { get; } ++ public abstract uint pairable_timeout { get; } + } +diff --git a/src/Services/Device.vala b/src/Services/Device.vala +index 282381c..636631f 100644 +--- a/src/Services/Device.vala ++++ b/src/Services/Device.vala +@@ -27,19 +27,19 @@ public interface Bluetooth.Services.Device : Object { + public abstract void disconnect_profile (string UUID) throws IOError; + public abstract void pair () throws IOError; + +- public abstract string[] UUIDs { public owned get; private set; } +- public abstract bool blocked { public owned get; public set; } +- public abstract bool connected { public owned get; private set; } +- public abstract bool legacy_pairing { public owned get; private set; } +- public abstract bool paired { public owned get; private set; } +- public abstract bool trusted { public owned get; public set; } +- public abstract int16 RSSI { public owned get; private set; } +- public abstract ObjectPath adapter { public owned get; private set; } +- public abstract string address { public owned get; private set; } +- public abstract string alias { public owned get; public set; } +- public abstract string icon { public owned get; private set; } +- public abstract string modalias { public owned get; private set; } +- public abstract string name { public owned get; private set; } +- public abstract uint16 appearance { public owned get; private set; } +- public abstract uint32 @class { public owned get; private set; } ++ public abstract string[] UUIDs { owned get; } ++ public abstract bool blocked { owned get; set; } ++ public abstract bool connected { owned get; } ++ public abstract bool legacy_pairing { owned get; } ++ public abstract bool paired { owned get; } ++ public abstract bool trusted { owned get; set; } ++ public abstract int16 RSSI { owned get; } ++ public abstract ObjectPath adapter { owned get; } ++ public abstract string address { owned get; } ++ public abstract string alias { owned get; set; } ++ public abstract string icon { owned get; } ++ public abstract string modalias { owned get; } ++ public abstract string name { owned get; } ++ public abstract uint16 appearance { owned get; } ++ public abstract uint32 @class { owned get; } + } diff --git a/switchboard-plug-bluetooth.spec b/switchboard-plug-bluetooth.spec index 6cc9408..a2408d9 100644 --- a/switchboard-plug-bluetooth.spec +++ b/switchboard-plug-bluetooth.spec @@ -3,11 +3,14 @@ Name: switchboard-plug-bluetooth Summary: Switchboard Bluetooth plug Version: 0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ -URL: http://launchpad.net/switchboard-plug-bluetooth -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 @@ -31,7 +34,8 @@ devices. %prep -%autosetup +%setup -q +%patch0 -p1 %build @@ -54,6 +58,9 @@ popd %changelog +* Thu May 18 2017 Fabio Valentini - 0.1-2 +- Add upstream patch to fix compilation with vala 0.35+. + * Mon Feb 20 2017 Fabio Valentini - 0.1-1 - Initial package.