[gentoo-commits] repo/proj/guru:dev commit in: x11-misc/squeekboard/files/, x11-misc/squeekboard/
commit: bfa0e3566c89b4d264de6f71508a4c7e4edb0aaa
Author: Marco Scardovi scardovi com>
AuthorDate: Thu Jun 24 12:06:44 2021 +
Commit: Marco Scardovi scardovi com>
CommitDate: Thu Jun 24 12:09:05 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bfa0e356
x11-misc/squeekboard: remove unused files
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi scardovi.com>
x11-misc/squeekboard/files/448.patch | 470 -
x11-misc/squeekboard/files/450.patch | 38 --
x11-misc/squeekboard/files/terminal.yaml | 157 -
x11-misc/squeekboard/squeekboard-1.14.0.ebuild | 4 +-
4 files changed, 2 insertions(+), 667 deletions(-)
diff --git a/x11-misc/squeekboard/files/448.patch
b/x11-misc/squeekboard/files/448.patch
deleted file mode 100644
index 07956402e..0
--- a/x11-misc/squeekboard/files/448.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-From 93e4345e823dbb9d9ee187d1f5b32c6dd7dffdd3 Mon Sep 17 00:00:00 2001
-From: Dorota Czaplejewicz
-Date: Mon, 5 Apr 2021 08:17:07 +
-Subject: [PATCH 1/2] layout: Take into account text purpose again
-
- src/data.rs | 17 +++--
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/data.rs b/src/data.rs
-index e5aa3910..71711c3f 100644
a/src/data.rs
-+++ b/src/data.rs
-@@ -239,13 +239,18 @@ fn load_layout_data_with_fallback(
- .map(PathBuf::from)
- .or_else(|| xdg::data_path("squeekboard/keyboards"));
-
--log_print!(
--logging::Level::Debug,
--"load_layout_data_with_fallback() -> name:{}, purpose:{:?},
overlay:{}, layout_name:{}",
--name, purpose, overlay,
--);
-+let layout_purpose = match overlay {
-+"" => match purpose {
-+ContentPurpose::Number => "number",
-+ContentPurpose::Digits => "number",
-+ContentPurpose::Phone => "number",
-+ContentPurpose::Terminal => "terminal",
-+_ => "",
-+},
-+overlay => overlay,
-+};
-
--for (kind, source) in list_layout_sources(, kind, overlay, path) {
-+for (kind, source) in list_layout_sources(, kind, layout_purpose,
path) {
- let layout = load_layout_data(source.clone());
- match layout {
- Err(e) => match (e, source) {
---
-GitLab
-
-
-From 190876903281774bf0f304269ad7f047f44482b1 Mon Sep 17 00:00:00 2001
-From: Dorota Czaplejewicz
-Date: Mon, 5 Apr 2021 10:36:41 +
-Subject: [PATCH 2/2] layouts: Make selection testable
-
-From now on, all the parameters for loading layout are handled inside a single
pure function, which makes them possible to test.
-
-As a side benefit, the old preference order function composed of a mess of
nested procedures is gone.
- src/data.rs | 312 ++
- src/layout.rs | 2 +-
- 2 files changed, 212 insertions(+), 102 deletions(-)
-
-diff --git a/src/data.rs b/src/data.rs
-index 71711c3f..29cd4ba4 100644
a/src/data.rs
-+++ b/src/data.rs
-@@ -69,8 +69,12 @@ pub mod c {
- let overlay_str = as_str()
- .expect("Bad overlay name")
- .expect("Empty overlay name");
-+let overlay_str = match overlay_str {
-+"" => None,
-+other => Some(other),
-+};
-
--let (kind, layout) = load_layout_data_with_fallback(, type_,
variant, _str);
-+let (kind, layout) = load_layout_data_with_fallback(, type_,
variant, overlay_str);
- let layout = ::layout::Layout::new(layout, kind);
- Box::into_raw(Box::new(layout))
- }
-@@ -113,97 +117,156 @@ impl fmt::Display for DataSource {
- }
- }
-
--type LayoutSource = (ArrangementKind, DataSource);
--
--/// Lists possible sources, with 0 as the most preferred one
--/// Trying order: native lang of the right kind, native base,
--/// fallback lang of the right kind, fallback base
--/// The `purpose` argument is not ContentPurpose,
--/// but rather ContentPurpose and overlay in one.
--fn list_layout_sources(
--name: ,
--kind: ArrangementKind,
--purpose: ,
--keyboards_path: Option,
--) -> Vec {
--// Just a simplification of often called code.
--let add_by_name = |
--mut ret: Vec,
--purpose: ,
--name: ,
--kind: ,
--| -> Vec {
--let name = if purpose == "" { name.into() }
--else { format!("{}/{}", purpose, name) };
--
--if let Some(path) = keyboards_path.clone() {
--ret.push((
--kind.clone(),
--DataSource::File(
--path.join(name.clone())
--.with_extension("yaml")
--)
--))
--}
--
--ret.push((
--kind.clone(),
--DataSource::Resource(name)
--));
--ret
--};
--
--// Another grouping.
--let add_by_kind = |ret, purpose: ,
[gentoo-commits] repo/proj/guru:dev commit in: x11-misc/squeekboard/files/, x11-misc/squeekboard/
commit: ac041841174f531f9c4feac0f02eb3427c56387d Author: Marco Scardovi scardovi com> AuthorDate: Tue Jun 22 17:57:52 2021 + Commit: Marco Scardovi scardovi com> CommitDate: Tue Jun 22 17:57:52 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ac041841 x11-misc/squeekboard: add package squeekboard is the keyboard for phosh Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> x11-misc/squeekboard/Manifest | 45 +++ x11-misc/squeekboard/files/448.patch | 470 + x11-misc/squeekboard/files/450.patch | 38 ++ x11-misc/squeekboard/files/terminal.yaml | 157 + x11-misc/squeekboard/metadata.xml | 11 + x11-misc/squeekboard/squeekboard-1.14.0.ebuild | 98 ++ 6 files changed, 819 insertions(+) diff --git a/x11-misc/squeekboard/Manifest b/x11-misc/squeekboard/Manifest new file mode 100644 index 0..c48753229 --- /dev/null +++ b/x11-misc/squeekboard/Manifest @@ -0,0 +1,45 @@ +DIST atk-0.7.0.crate 43814 BLAKE2B dc1d569df7a53506b50d484f7d04240ec3179b3915abacc5790310fa0b03587df07cf3ec5ed9922a877eb2d82c1cf3eef937bace3e2cf1b30895be27131b80a3 SHA512 4369d48607d58cfde6fd1dbe006eca2ffbf0212750d991b0a534586e75496e9cb99636e2b916ae3e6c3cbc0aa3345bddf1b2e7d2561a9c16769646029be9041b +DIST atk-sys-0.9.1.crate 21064 BLAKE2B 752cd426951051af696413725189286f465433388dfa84efc2ef6963af6b387b56cee830fd595c39049f9721f4c9b3c51828c3d17c7362b85a6cf648e17e5dbb SHA512 a2eb083abfd585bb7bea6415c1b0a6981c1e071b11dbbd41442d5ab438219d13ab28bf957640616644fb11760d2371c929f379ab414b8b00b297f3af25680a92 +DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b +DIST cairo-rs-0.7.1.crate 45803 BLAKE2B f12439219c6df2d35464d2e20c7e5b9a2ab3a5c92a87fd93f491b4e483553d4b078ff787e0e502f58a97521918a9e0633ffdf765c9087edd257087c9c72ba870 SHA512 3a8825c352ebea72d7cfc947654e85e0395990c4572913858d71b6c7eabb60efec0a9e9fdebb409530aed5535edaec5fcfb0f77f1f2dd6794503feff2e384ba7 +DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b +DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c +DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf +DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8 +DIST fragile-0.3.0.crate 10203 BLAKE2B 3b04d4acc57f5a76a0d2625db8b0d643f2199e175110b47ee40fc82afd3d1d01c75d92e0d1ec798340a93afb939f215504a16346730955b475e321246ed8bc09 SHA512 5307919178a440abf932857162b66b7a1a769513820c55c6827e8031894029f2d84920773899e6ae39ba1d8a8c0da2816ce9af7007416ab4e0e2c115090d8a1c +DIST gdk-0.11.0.crate 83537 BLAKE2B d616ec093a3ab852d068760f55ed5b39c90389d2a2c320d6a041cda12f98d99e873a0d26803335c3bfadb8289f32f06b2d5a961c16cd18c0baf6e4d91138f607 SHA512 483bbc99f06b9cf23ea3aabd540138711868bbd95bafbac20fdcf56e8e445fb3c44b79ef5f3c43015a21288e19adf399f446f971cf3413498c7d80ac500a98e0 +DIST gdk-pixbuf-0.7.0.crate 15011 BLAKE2B ee46401bd80b5b5f865d7bac2b1ec28e01db657e4e0716b585bc72faebc6bb0ca694811e487a4dcc67d2572fc1e49775382e79abbccc3d8f8caa2f5b5848e9cb SHA512 a413656b7c18acc030225b14134b1481902d19e1845ec73cf430921020dee7c99dd5e5469f60780aed2d3552d83792c6a193ddeba686324284eff2d78cc0b813 +DIST gdk-pixbuf-sys-0.9.1.crate 8641 BLAKE2B 8cbeffd4acbdd38ba43b5b39a84e0d20d9ea0230115f09f8b0c0e95b405027fee1a65e452e2abd2485097036c9f5dca8e01069f51a5651199db9be50aef6087a SHA512 22ca779b0065289da0bbc024bbc23cabc5e2fc81f8ea781107a83e41504edcf42d3dcde7079b091f1070596566df1f2180d226dcab21d8c388d7505d0fb171a7 +DIST gdk-sys-0.9.1.crate 59958 BLAKE2B 9e0c30d138b908ff56dfe9db5b0ed75a1ed14c9f3158df3b595346888cc40c08d8df8d204ab59fff8391a87396cf6c29a9881c8dfb5fdeb3e8d82bff76869961 SHA512
