74e75d2dae
Merge branch 'fixbuild' into 'master'
...
Fix Cargo interaction with Debian build system
See merge request Librem5/squeekboard!162
2019-09-20 19:29:13 +00:00
a3e421db3d
build: Fix Debian Cargo.toml mismatch
...
Debian uses a separate registry for the packages it distributes. Checksums for some Debian packages don't match anything that's available on crates.io, which is the default source of dependencies. *linked-hash-map* in particular doesn't provide any hash.
As a result, Debian's `Cargo.lock` and crates.io's `Cargo.lock` are not matching, and building is only possible with one or the other, depending on what's checked in.
As a separate issue, Debian packages are usually not checked in in multiple versions, so checking in Debian's `Cargo.lock` would result in the package not building whenever a bugfix is distributed (due to checksum changes).
This change removes the crates.io `Cargo.lock` so that a new one will be created whenever a .deb is built, solving the above. What keeps falsely passing builds from happening is `Cargo.toml` specifying no interface changes, as well as Build-Depends, which seem enough for any other Debian package.
2019-09-20 09:52:36 +00:00
241e5c0fc6
debian: Use Debian versions of dependencies
2019-09-20 09:40:18 +00:00
28e0c26671
build: Change dependencies to match Debian packages
2019-09-20 09:40:18 +00:00
7d0070a155
debian: Use CARGO_HOME more like librsvg does
2019-09-20 09:37:46 +00:00
9093226abe
Merge branch 'update-symbols-button' into 'master'
...
Update symbols button to reflect the symbols view
See merge request Librem5/squeekboard!166
2019-09-19 14:48:58 +00:00
45dc51f08f
Update symbols button to reflect the symbols view
2019-09-16 17:07:41 +02:00
b486dc8afd
Merge branch 'testing' into 'master'
...
tests: Describe how to test
See merge request Librem5/squeekboard!165
2019-09-13 19:55:25 +00:00
e70a64a47e
Merge branch 'cleanups' into 'master'
...
Cleanups
See merge request Librem5/squeekboard!164
2019-09-13 19:52:19 +00:00
225b243446
tests: Describe how to test
2019-09-13 15:55:26 +00:00
db994da531
keysyms: Remove dead code
2019-09-13 15:25:48 +00:00
d47aff357b
layout: Remove dead code
2019-09-13 15:21:29 +00:00
96c2c2dd1f
Merge branch 'test_layouts' into 'master'
...
Test layouts
See merge request Librem5/squeekboard!163
2019-09-13 15:12:46 +00:00
c8cc5b1997
layout: Bundle number layout
2019-09-13 09:11:20 +00:00
edb28cb859
tests: Verify all bundled layouts
2019-09-13 09:09:17 +00:00
b07689939b
Merge branch 'fixbuild' into 'master'
...
build: Fix cargo behaviour
See merge request Librem5/squeekboard!161
2019-09-12 11:32:16 +00:00
6072e5768a
build: Fix cargo behaviour
...
Cargo caused .deb builds to crash by storing its data in $HOME.
https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules says TMP_DIR may be used freely, so that's where Cargo will keep its stuff now.
2019-09-12 11:26:03 +00:00
fe8d66a635
Merge branch 'autokeysym' into 'master'
...
Unicode key name -> keysym conversion
See merge request Librem5/squeekboard!160
2019-09-11 15:20:44 +00:00
c8658b00e3
Merge branch 'warnings' into 'master'
...
warnings: Fix some C stuff
See merge request Librem5/squeekboard!159
2019-09-11 14:58:19 +00:00
0989771a3b
Merge branch 'simple_cargo' into 'master'
...
cargo: Allow for manual cargo invokations
See merge request Librem5/squeekboard!158
2019-09-11 13:34:42 +00:00
9c2acde826
Merge branch 'reparse' into 'master'
...
rewrite of the parsing
See merge request Librem5/squeekboard!152
2019-09-11 12:33:25 +00:00
2352e31f01
us: Simplify by using Unicode directly
2019-09-11 12:03:57 +00:00
8e654346a2
keysyms: Derive from Unicode labels
2019-09-11 12:03:57 +00:00
015ba79f65
Merge branch 'fix_tests' into reparse
2019-09-11 12:03:24 +00:00
d6aa54f30c
Merge branch 'fix_tests' into 'master'
...
Fix doctests
See merge request Librem5/squeekboard!157
2019-09-11 11:55:26 +00:00
fd0d8d4244
warnings: Fix some C stuff
2019-09-10 11:06:18 +00:00
c725cd7f14
cargo: Allow for manual cargo invokations
2019-09-10 10:17:28 +00:00
0922d4a87a
tests: Allow the building of doctests
...
Also allows for standalone tests and examples to be built and run with Cargo.
2019-09-10 09:34:25 +00:00
51562d5185
Fix imservice docstring
2019-09-10 09:27:21 +00:00
ed8b6eec28
More float_ord docs
2019-09-10 09:27:21 +00:00
e9c236a682
float_ord: Fix test
2019-09-10 09:27:19 +00:00
04a47ad0af
Merge branch '33-multi-touch-typing-not-yet-working' into 'master'
...
Resolve "Multi-touch typing not-yet working"
Closes #33
See merge request Librem5/squeekboard!135
2019-09-10 09:15:50 +00:00
99c577be60
Merge remote-tracking branch 'upstream/master' into reparse
2019-09-10 09:11:57 +00:00
db8340181f
Merge branch '88-visual-improvements' into 'master'
...
Resolve colors used in "Visual Improvements"
See merge request Librem5/squeekboard!155
2019-09-10 08:16:57 +00:00
4f18ffd34e
Resolve colors used in "Visual Improvements"
2019-09-10 08:16:56 +00:00
4306ec9c1e
Merge branch 'drop_bitflags' into 'master'
...
deps: Remove bitflags
See merge request Librem5/squeekboard!156
2019-09-09 20:16:44 +00:00
31c12e5182
layout: Convert numbers to yaml
2019-09-09 19:10:42 +00:00
521796a46d
deps: Remove bitflags
...
This removes the need to use a modified copy and makes running tests easier.
2019-09-09 19:00:40 +00:00
a187221d3f
Convert nb layout to yaml
2019-09-09 16:35:21 +00:00
583b546e81
Fix CI error
2019-09-09 15:49:25 +00:00
aa9523338f
Merge branch 'buttonlists' into reparse
2019-09-09 15:11:59 +00:00
0ed66e0eab
locked: Use keys instead of buttons
2019-09-09 13:54:55 +00:00
6523275b6a
views: Change based on layout file
2019-09-09 13:25:03 +00:00
b9e9ca368a
Merge branch 'cargo' into 'master'
...
rust: Use Cargo to build the Rust portion
See merge request Librem5/squeekboard!147
2019-09-07 17:52:24 +00:00
c4886e362a
Merge branch 'dorota.czaplejewicz/squeekboard-cargo' into 'cargo'
...
Add new meson and current ninja to the build dependencies
See merge request dorota.czaplejewicz/squeekboard!8
2019-09-07 11:37:42 +00:00
fc5f671e57
Add new meson and current ninja to the dependencies
2019-09-06 22:15:02 +02:00
035ecd6df1
Merge branch 'clean' into 'master'
...
cleanup: Vala bindings
See merge request Librem5/squeekboard!154
2019-09-04 12:46:42 +00:00
26d1a6047c
Merge branch 'fixes' into reparse
2019-09-04 10:18:53 +00:00
60a89b6c3f
Merge branch 'wrapping' into reparse
2019-09-04 10:01:22 +00:00
b84c402c4a
WIP
...
WIP
WIP: keymap generation test passes
meta: Update features and version
WiP: cargo.lock
WIP: don't crash
WIP: no outlines
parsing: New tests
WIP: base level works
WIP: remove old keyboard
symbols correctly input
WIP: lodaing files
WIP: fallback works
Valid fallback
2019-09-04 09:44:31 +00:00
