2:46 p.m.
The package rpms/squeekboard.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/squeekboard.git/commit/?id=80357c....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 80357c2083510ebe617f1a9a4482f41cffc3c81b
Author: Nikhil Jha <hi(a)nikhiljha.com>
Date: Wed Mar 25 11:32:51 2020 -0700
initial import (#1811266)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e3e2838
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/squeekboard-v1.9.0.tar.gz
diff --git a/0001-use-latest-compatible-crates.patch
b/0001-use-latest-compatible-crates.patch
new file mode 100644
index 0000000..0a90d6e
--- /dev/null
+++ b/0001-use-latest-compatible-crates.patch
@@ -0,0 +1,99 @@
+From 85bf2b63e14b0324d58a9d6d399dc722d50817bb Mon Sep 17 00:00:00 2001
+From: Nikhil Jha <hi(a)nikhiljha.com>
+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<LayoutId> = 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::<String>())
++ .and_then(|value| value.get::<String>().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::<bool>())
++ .and_then(|value| value.get::<bool>().unwrap())
+ .and_then(|dark_preferred| match dark_preferred {
+ true => Some("dark".into()),
+ false => None,
+--
+2.21.0 (Apple Git-122.2)
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..28a0197
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (squeekboard-v1.9.0.tar.gz) =
8fe334df46dcfa50557bba11e040b5329f290c309a7e31188bce0d2cfd63b4c500828bd47f395a143d6f768316a7157d3640860e4826e37386d9f74c509427f3
diff --git a/squeekboard.desktop b/squeekboard.desktop
new file mode 100644
index 0000000..de2508d
--- /dev/null
+++ b/squeekboard.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Keyboard
+Comment=Squeekboard
+Exec=squeekboard
+X-GNOME-Autostart-enabled=true
+Hidden=false
+NoDisplay=false
\ No newline at end of file
diff --git a/squeekboard.spec b/squeekboard.spec
new file mode 100644
index 0000000..64174f9
--- /dev/null
+++ b/squeekboard.spec
@@ -0,0 +1,74 @@
+Name: squeekboard
+Version: 1.9.0
+Release: 2%{?dist}
+Summary: a Wayland virtual keyboard
+
+License: GPLv3+
+URL: https://source.puri.sm/Librem5/squeekboard
+Source0:
https://source.puri.sm/Librem5/squeekboard/-/archive/v%{version}/squeekbo...
+Source1: squeekboard.desktop
+
+# temporary until upstreamed
+Patch0: 0001-use-latest-compatible-crates.patch
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: gcc
+BuildRequires: meson
+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
+BuildRequires: desktop-file-utils
+
+%description
+Squeekboard is a virtual keyboard supporting Wayland, built primarily
+for the Librem 5 phone. It squeaks because some Rust got inside.
+
+
+%prep
+%autosetup -p1 -n squeekboard-v%{version}
+%cargo_prep
+
+
+%generate_buildrequires
+%cargo_generate_buildrequires -a
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
+cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/xdg/autostart/
+chmod +x %{buildroot}/%{_bindir}/squeekboard-entry
+
+
+%check
+%meson_test
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sm.puri.Squeekboard.desktop
+
+
+%files
+%{_bindir}/squeekboard
+%{_bindir}/squeekboard-entry
+%{_bindir}/squeekboard-test-layout
+%{_datadir}/applications/sm.puri.Squeekboard.desktop
+%{_sysconfdir}/xdg/autostart/squeekboard.desktop
+%doc README.md
+%license COPYING
+
+
+%changelog
+* Tue Mar 24 2020 Nikhil Jha <hi(a)nikhiljha.com> - 1.9.0-2
+- Validate desktop file
+
+* Thu Feb 27 2020 Nikhil Jha <hi(a)nikhiljha.com> - 1.9.0-1
+- Initial packaging