diff --git a/.gitignore b/.gitignore index d401bff..e14b05f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /squeekboard-v1.10.0.tar.gz /squeekboard-v1.11.0.tar.gz /squeekboard-v1.11.1.tar.gz +/squeekboard-v1.12.0.tar.gz diff --git a/0002-use-latest-compatible-crates.patch b/0002-use-latest-compatible-crates.patch index 0d5116a..4e63a5e 100644 --- a/0002-use-latest-compatible-crates.patch +++ b/0002-use-latest-compatible-crates.patch @@ -14,14 +14,15 @@ index c4be97b..9ba7ed7 100755 +cargo "$@" diff --git a/meson.build b/meson.build -index 38498c4..91209c7 100644 +index 5a049fe..c152846 100644 --- a/meson.build +++ b/meson.build -@@ -71,32 +71,6 @@ summary = [ +@@ -82,33 +82,6 @@ summary = [ ] message('\n'.join(summary)) -# Rust deps are changing, depending on compile flags. Cargo can't handle it alone. +-# As a side effect, Cargo.toml never gets used. -cargo_toml_in = files('Cargo.toml.in') -path_data = configuration_data() -path_data.set('path', meson.source_root()) @@ -49,9 +50,9 @@ index 38498c4..91209c7 100644 - dep_cargo = find_program('cargo') cargo_script = find_program('cargo.sh') - cargo_build = find_program('cargo_build.sh') + cargo_build = find_program('cargo_build.py') diff --git a/src/meson.build b/src/meson.build -index f5bd27a..b1595f6 100644 +index d85be96..76b3a2d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -57,8 +57,7 @@ rslibs = custom_target( @@ -73,8 +74,8 @@ index f5bd27a..b1595f6 100644 ) test( -@@ -82,7 +81,7 @@ test( - args: ['test'] + cargo_build_flags, +@@ -83,7 +82,7 @@ test( + env: ['SOURCE_DIR=' + meson.source_root()], # this is a whole Carg-based test suite, let it run for a while timeout: 900, - depends: [build_rstests, cargo_toml], diff --git a/sources b/sources index 21ce73a..9383bcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squeekboard-v1.11.1.tar.gz) = 7455652c3ea328d8c4f7324ca75d0d482009e6ed03a1cf143624d8bf10d37c139bd42960cd3a752a971d57ce3926cc845dcf3847db7b0f7a66301f2a923a2ef2 +SHA512 (squeekboard-v1.12.0.tar.gz) = 854646fa5558935bbac7f2104dfef3f077737b10955e3b85aa44ce11152599b76ad7348765c2e2e6b47a70760408c1efed473dbde8b3a4f6d1503a2c1e07e8b9 diff --git a/squeekboard.spec b/squeekboard.spec index d7d7026..cfbb862 100644 --- a/squeekboard.spec +++ b/squeekboard.spec @@ -1,5 +1,5 @@ Name: squeekboard -Version: 1.11.1 +Version: 1.12.0 Release: 1%{?dist} Summary: a Wayland virtual keyboard @@ -68,16 +68,19 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sm.puri.Squeekboard. %license COPYING %changelog -* Mon Nov 23 2020 Torrey Sorensen - 1.11.1-1 +* Wed Jan 20 2021 Torrey Sorensen - 1.12.1-1 +- Update to 1.12.0 + +* Mon Nov 23 2020 Torrey Sorensen - 1.11.1-1 - Update to 1.11.1 -* Sat Nov 14 2020 Torrey Sorensen - 1.11.0-1 +* Sat Nov 14 2020 Torrey Sorensen - 1.11.0-1 - Update to 1.11.0 -* Fri Oct 23 2020 Torrey Sorensen - 1.10.0-1 +* Fri Oct 23 2020 Torrey Sorensen - 1.10.0-1 - Update to 1.10.0 -* Sun Aug 09 2020 Torrey Sorensen - 1.9.3-1 +* Sun Aug 09 2020 Torrey Sorensen - 1.9.3-1 - Update to 1.9.3 including new dependencies and new patch file and Cargo.toml * Wed Jul 29 2020 Fedora Release Engineering - 1.9.2-3 @@ -86,7 +89,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sm.puri.Squeekboard. * Mon Jul 20 2020 Josh Stone - 1.9.2-2 - Bump to cairo 0.9 and gtk 0.9 -* Fri Jun 19 2020 Torrey Sorensen - 1.9.2-1 +* Fri Jun 19 2020 Torrey Sorensen - 1.9.2-1 - Update to 1.9.2, including updated patch file. - Remove unused libcroco - Temporarily excluding ppc64le architecture