diff --git a/.gitignore b/.gitignore index e06b13c..e7bc4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /squeekboard-v1.9.0.tar.gz /squeekboard-v1.9.1.tar.gz +/squeekboard-v1.9.2.tar.gz diff --git a/0001-use-latest-compatible-crates.patch b/0001-use-latest-compatible-crates.patch deleted file mode 100644 index 0a90d6e..0000000 --- a/0001-use-latest-compatible-crates.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 85bf2b63e14b0324d58a9d6d399dc722d50817bb Mon Sep 17 00:00:00 2001 -From: Nikhil Jha -Date: Sat, 29 Feb 2020 10:13:05 -0800 -Subject: [PATCH] use latest compatible crates - ---- - Cargo.toml | 10 +++++----- - src/popover.rs | 6 +++--- - src/style.rs | 4 ++-- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index e59996f..eb0b20b 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -3,16 +3,16 @@ name = "rs" - version = "0.1.0" - - [dependencies] --bitflags = "1.0.*" --clap = { version = "2.32.*", default-features = false } -+bitflags = "1.2.*" -+clap = { version = "2.33.*", default-features = false } - maplit = "1.0.*" --regex = "1.1.*" -+regex = "1.3.*" - serde = { version = "1.0.*", features = ["derive"] } - serde_yaml = "0.8.*" - xkbcommon = { version = "0.4.*", features = ["wayland"] } - - [dependencies.cairo-rs] --version = "0.5.*" -+version = "0.8.*" - - [dependencies.cairo-sys-rs] - version = "" -@@ -33,7 +33,7 @@ version = "" - features = ["v2_44"] - - [dependencies.gtk] --version = "0.5.*" -+version = "0.8.*" - features = ["v3_22"] - - [dependencies.gtk-sys] -diff --git a/src/popover.rs b/src/popover.rs -index 8330a92..7e947f4 100644 ---- a/src/popover.rs -+++ b/src/popover.rs -@@ -13,7 +13,7 @@ use ::resources; - - use gio::ActionMapExt; - use gio::SettingsExt; --use gio::SimpleActionExt; -+use gtk::prelude::BuilderExtManual; - use glib::translate::FromGlibPtrNone; - use glib::variant::ToVariant; - use gtk::PopoverExt; -@@ -134,7 +134,7 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder { - - fn set_layout(kind: String, name: String) { - let settings = gio::Settings::new("org.gnome.desktop.input-sources"); -- let inputs = settings.get_value("sources").unwrap(); -+ let inputs = settings.get_value("sources"); - let current = (kind.clone(), name.clone()); - let inputs = variants::get_tuples(inputs).into_iter() - .filter(|t| t != ¤t); -@@ -285,7 +285,7 @@ pub fn show( - .map(|name| LayoutId::Local(name.to_string())); - - let settings = gio::Settings::new("org.gnome.desktop.input-sources"); -- let inputs = settings.get_value("sources").unwrap(); -+ let inputs = settings.get_value("sources"); - let inputs = variants::get_tuples(inputs); - - let system_layouts: Vec = inputs.into_iter() -diff --git a/src/style.rs b/src/style.rs -index 153431a..2d7d539 100644 ---- a/src/style.rs -+++ b/src/style.rs -@@ -99,13 +99,13 @@ fn get_theme_name(settings: >k::Settings) -> GtkTheme { - name: { - settings.get_property("gtk-theme-name") - .or_print(logging::Problem::Surprise, "No theme name") -- .and_then(|value| value.get::()) -+ .and_then(|value| value.get::().unwrap()) - .unwrap_or(DEFAULT_THEME_NAME.into()) - }, - variant: { - settings.get_property("gtk-application-prefer-dark-theme") - .or_print(logging::Problem::Surprise, "No settings key") -- .and_then(|value| value.get::()) -+ .and_then(|value| value.get::().unwrap()) - .and_then(|dark_preferred| match dark_preferred { - true => Some("dark".into()), - false => None, --- -2.21.0 (Apple Git-122.2) - diff --git a/0002-use-latest-compatible-crates.patch b/0002-use-latest-compatible-crates.patch new file mode 100644 index 0000000..42592ac --- /dev/null +++ b/0002-use-latest-compatible-crates.patch @@ -0,0 +1,100 @@ +diff --git a/Cargo.toml b/Cargo.toml +index e59996f..9476300 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,16 +3,16 @@ name = "rs" + version = "0.1.0" + + [dependencies] +-bitflags = "1.0.*" +-clap = { version = "2.32.*", default-features = false } ++bitflags = "1.2.*" ++clap = { version = "2.33.*", default-features = false } + maplit = "1.0.*" +-regex = "1.1.*" ++regex = "1.3.*" + serde = { version = "1.0.*", features = ["derive"] } + serde_yaml = "0.8.*" + xkbcommon = { version = "0.4.*", features = ["wayland"] } + + [dependencies.cairo-rs] +-version = "0.5.*" ++version = "0.8.*" + + [dependencies.cairo-sys-rs] + version = "" +@@ -33,7 +33,7 @@ version = "" + features = ["v2_44"] + + [dependencies.gtk] +-version = "0.5.*" ++version = "0.8.*" + features = ["v3_22"] + + [dependencies.gtk-sys] +diff --git a/src/layout.rs b/src/layout.rs +index 09fc4f7..a56b8c3 100644 +--- a/src/layout.rs ++++ b/src/layout.rs +@@ -99,8 +99,8 @@ pub mod c { + + impl Bounds { + pub fn contains(&self, point: &Point) -> bool { +- (point.x > self.x && point.x < self.x + self.width +- && point.y > self.y && point.y < self.y + self.height) ++ point.x > self.x && point.x < self.x + self.width ++ && point.y > self.y && point.y < self.y + self.height + } + } + +diff --git a/src/popover.rs b/src/popover.rs +index 96d3a97..4f85f0e 100644 +--- a/src/popover.rs ++++ b/src/popover.rs +@@ -13,7 +13,7 @@ use ::resources; + + use gio::ActionMapExt; + use gio::SettingsExt; +-use gio::SimpleActionExt; ++use gtk::prelude::BuilderExtManual; + use glib::translate::FromGlibPtrNone; + use glib::variant::ToVariant; + use gtk::PopoverExt; +@@ -154,7 +154,7 @@ fn get_settings(schema_name: &str) -> Option { + fn set_layout(kind: String, name: String) { + let settings = get_settings("org.gnome.desktop.input-sources"); + if let Some(settings) = settings { +- let inputs = settings.get_value("sources").unwrap(); ++ let inputs = settings.get_value("sources"); + let current = (kind.clone(), name.clone()); + let inputs = variants::get_tuples(inputs).into_iter() + .filter(|t| t != ¤t); +@@ -308,7 +308,7 @@ pub fn show( + let settings = get_settings("org.gnome.desktop.input-sources"); + let inputs = settings + .map(|settings| { +- let inputs = settings.get_value("sources").unwrap(); ++ let inputs = settings.get_value("sources"); + variants::get_tuples(inputs) + }) + .unwrap_or_else(|| Vec::new()); +diff --git a/src/style.rs b/src/style.rs +index 153431a..2d7d539 100644 +--- a/src/style.rs ++++ b/src/style.rs +@@ -99,13 +99,13 @@ fn get_theme_name(settings: >k::Settings) -> GtkTheme { + name: { + settings.get_property("gtk-theme-name") + .or_print(logging::Problem::Surprise, "No theme name") +- .and_then(|value| value.get::()) ++ .and_then(|value| value.get::().unwrap()) + .unwrap_or(DEFAULT_THEME_NAME.into()) + }, + variant: { + settings.get_property("gtk-application-prefer-dark-theme") + .or_print(logging::Problem::Surprise, "No settings key") +- .and_then(|value| value.get::()) ++ .and_then(|value| value.get::().unwrap()) + .and_then(|dark_preferred| match dark_preferred { + true => Some("dark".into()), + false => None, diff --git a/sources b/sources index 69ddb09..0cfb22e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squeekboard-v1.9.1.tar.gz) = 1924bc062e4e130e9d840152f36bcc2a0ebaed529b53dfe65116246f090785a9d0d1555b5e5ae7a941726a5a46d004bc7e16a73309bff472300cd9880bed9e59 +SHA512 (squeekboard-v1.9.2.tar.gz) = 609fbbbc888b35ce0b6cba114fb7f85e00bdaf6899afc7fb9fcfd87900985b67f5c646b55fb8e760543e0f9be7d1bc2d243536d498e5e22f99d8bcebd236f2fd diff --git a/squeekboard.spec b/squeekboard.spec index 05b093d..85245c3 100644 --- a/squeekboard.spec +++ b/squeekboard.spec @@ -1,5 +1,5 @@ Name: squeekboard -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Summary: a Wayland virtual keyboard @@ -9,7 +9,7 @@ Source0: https://source.puri.sm/Librem5/squeekboard/-/archive/v%{version} Source1: squeekboard.desktop # temporary until upstreamed -Patch0: 0001-use-latest-compatible-crates.patch +Patch0: 0002-use-latest-compatible-crates.patch ExclusiveArch: %{rust_arches} @@ -19,7 +19,6 @@ BuildRequires: rust-packaging BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 -BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(wayland-client) >= 1.14 BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(wayland-protocols) >= 1.12 @@ -67,6 +66,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sm.puri.Squeekboard. %changelog +* Fri Jun 19 2020 Torrey Sorensen - 1.9.2-1 +- Update to 1.9.2, including updated patch file. +- Remove unused libcroco + * Tue Mar 24 2020 Nikhil Jha - 1.9.1-1 - Update to 1.9.1