Compare commits

..

9 Commits

Author SHA1 Message Date
da2093c3c7 Merge branch 'rel-1.42.0' into 'main'
treewide: Document changes and release 1.42.0

See merge request World/Phosh/squeekboard!682
2024-09-30 10:57:27 +00:00
9d043a0647 treewide: Document changes and release 1.42.0
Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/682>
2024-09-30 11:14:46 +02:00
6fd60502bb Cargo.lock: Update dependencies
Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/682>
2024-09-30 11:14:45 +02:00
b9c86165c0 Merge branch 'optimise-size-of-thai-layout' into 'main'
layouts: Improve the size of the Thai (th) layout

See merge request World/Phosh/squeekboard!684
2024-09-30 09:13:06 +00:00
97495b73c2 layouts: Improve the size of the Thai (th) layout
and adjust the views which were arranged differently,
so that those are more similar to other layouts.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/684>
2024-09-29 19:14:05 +02:00
0552b9cd3b Merge branch 'make-fr+bepo-terminal-layout-available' into 'main'
layouts: Adjust French (fr+bepo) terminal-layout and make it available

See merge request World/Phosh/squeekboard!683
2024-09-29 09:01:41 +00:00
76194dba15 layouts: Adjust French (fr+bepo) terminal-layout and make it available
Except for the arrangement of the letter-buttons,
this layout is almost identical to the French (fr) terminal-layout.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/683>
2024-09-29 10:45:45 +02:00
e89ba89aea Merge branch 'meson.build-fixes' into 'main'
*/meson.build: Fix warnings about features deprecated since Meson 0.56

See merge request World/Phosh/squeekboard!681
2024-09-28 19:55:35 +00:00
985e0c976a */meson.build: Fix warnings about features deprecated since Meson 0.56
1.0.0 is currently set as the minimum required version of Meson.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/681>
2024-09-25 13:47:43 +02:00
12 changed files with 203 additions and 142 deletions

45
Cargo.lock generated
View File

@ -62,9 +62,9 @@ dependencies = [
[[package]]
name = "autocfg"
version = "1.3.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
@ -111,9 +111,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.1.21"
version = "1.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
dependencies = [
"shlex",
]
@ -318,7 +318,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]
@ -475,7 +475,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]
@ -548,7 +548,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]
@ -613,9 +613,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "libc"
version = "0.2.158"
version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "linux-raw-sys"
@ -693,9 +693,12 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.19.0"
version = "1.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
dependencies = [
"portable-atomic",
]
[[package]]
name = "pango"
@ -762,6 +765,12 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "portable-atomic"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "proc-macro-crate"
version = "0.1.5"
@ -914,7 +923,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]
@ -925,14 +934,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]
name = "serde_spanned"
version = "0.6.7"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@ -1000,9 +1009,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.77"
version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@ -1045,7 +1054,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.79",
]
[[package]]

16
NEWS
View File

@ -1,20 +1,26 @@
squeekboard 1.42.0~rc1
----------------------
squeekboard 1.42.0
------------------
Released September 2024
* New layouts:
* Belarusian (by)
* French (fr+bepo) terminal-layout
* Japanese (jp)
* Serbian (rs), (rs+latin), (rs+latinunicode)
* Changed layouts:
* Thai (th):
* There is less empty space now.
* Most buttons are wider now.
* The arrangement of buttons for the `symbols` and `numbers` views, is more consistent with other layouts now.
* Fixes:
* "Keyboard Settings" in the language-selection-popover will now open the correct panel in GNOME Settings.
* On some relatively small screens in horizontal orientation, the compact shape was used instead of the wide shape,
even though the wide shape can fit into the same height. The wide shape will be used on those screens now.
* Changes:
* The height of the panel will adapt to screens differently now.
In particular, the panel will now be 1/3 of the screen's height on most monitors in horizontal orientation,
* The height of the panel will adapt to screens differently.
In particular, the panel will be 1/3 of the screen's height on most monitors in horizontal orientation,
and as tall as it can be, while maintaining the aspect-ratio of the wide shape (16:5) without empty space next to it,
for most monitors in vertical orientation.
* Settings for adjusting the height of the panel for the keyboard have been added.
* GSettings for adjusting the height of the panel for the keyboard have been added.
* The documentation has been improved. In particular, it should now be much easier to learn how to test changes to Squeekboard and layouts.
* After building a Debian-package for Squeekboard and installing it, `update-alternatives` is now supported.
* The layout-files now have the English name of the language for which the respective layout is, in a comment at the top of the file.

View File

@ -2,47 +2,47 @@
---
outlines:
default: { width: 35.33, height: 45.5 }
halfwidth: { width: 17.665, height: 45.5 }
narrow: { width: 22.5, height: 45.5 }
special: { width: 35.33, height: 45.5 }
change-view: { width: 42, height: 45.5 }
change-view-2: { width: 50, height: 45.5 }
action: { width: 59, height: 45.5 }
wide: { width: 50, height: 45.5 }
spaceline: { width: 119.47, height: 45.5 }
small: { width: 50.471, height: 24 }
altline: { width: 52.67, height: 45.5 }
change-view: { width: 52.67, height: 45.5 }
large: { width: 52.67, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 100.96, height: 45.5 }
special: { width: 35.33, height: 45.5 }
views:
base:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "b é p o w v d l j z"
- "a u i e c t s r n m"
- "Shift_L y x k q g h f . BackSpace"
- "show_numbers show_eschars preferences space SlashSmall show_actions Return"
- "Shift_L y x k q g h f BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
- "B É P O W V D L J Z"
- "A U I E C T S R N M"
- "Shift_L Y X K Q G H F MinusSmall BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return"
- "Shift_L Y X K Q G H F BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
numbers:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space . Return"
symbols:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / < > = [ ] . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
- "show_numbers \\ / < > = [ ] BackSpace"
- "show_letters show_eschars preferences space . Return"
eschars:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
- "show_numbers æ œ ä ë ï ö ü BackSpace"
- "show_letters show_eschars preferences space . Return"
actions:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6"
@ -50,7 +50,7 @@ views:
- "Esc Tab Pause Insert Up Del"
- "show_letters_actions Menu Break Left Down Right"
buttons:
F1:
outline: "action"
@ -223,14 +223,5 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
ColonSmall:
outline: "narrow"
text: ":"
MinusSmall:
outline: "narrow"
text: "-"
SlashSmall:
outline: "narrow"
text: "/"
.:
outline: "narrow"
outline: "large"

View File

@ -2,55 +2,53 @@
---
outlines:
default: { width: 54, height: 37 }
halfwidth: { width: 27, height: 37 }
narrow: { width: 40.5, height: 37 }
special: { width: 54, height: 37 }
action: { width: 90, height: 37 }
small: { width: 67.4, height: 22 }
altline: { width: 81, height: 37 }
change-view: { width: 81, height: 37 }
large: { width: 81, height: 37 }
action: { width: 90, height: 37 }
wide: { width: 90, height: 37 }
change-view-2: { width: 90, height: 37 }
spaceline: { width: 153, height: 37 }
small: { width: 67.4, height: 22 }
special: { width: 54, height: 37 }
views:
base:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "b é p o w v d l j z"
- "a u i e c t s r n m"
- "Shift_L y x k q g h f . BackSpace"
- "show_numbers show_eschars preferences space SlashSmall show_actions Return"
- "Shift_L y x k q g h f BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →"
- "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
- "B É P O W V D L J Z"
- "A U I E C T S R N M"
- "Shift_L Y X K Q G H F MinusSmall BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return"
- "Shift_L Y X K Q G H F BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
numbers:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
- "show_letters show_eschars preferences space . Return"
symbols:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / < > = [ ] BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
- "show_letters show_eschars preferences space . Return"
eschars:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
- "show_letters show_eschars preferences space . Return"
actions:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6"
- "F7 F8 F9 F10 F11 F12"
- "Esc Tab Pause Insert Up Del"
- "show_letters_actions Menu Break Left Down Right"
buttons:
F1:
@ -228,14 +226,5 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
ColonSmall:
outline: "halfwidth"
text: ":"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
.:
outline: "halfwidth"
outline: "large"

View File

@ -1,44 +1,45 @@
# Language: Thai
---
outlines:
default: { width: 34, height: 52 }
large: { width: 44, height: 52 }
altline: { width: 52.67, height: 52 }
wide: { width: 86.67, height: 52 }
change-view: { width: 52.67, height: 52 }
change-view-2: { width: 86.67, height: 52 }
spaceline: { width: 184, height: 52 }
special: { width: 44, height: 52 }
placeholder: { width: 34, height: 52 }
default: { width: 37.142, height: 52 }
special: { width: 37.142, height: 52 }
special-2: { width: 40.856, height: 52 }
special-3: { width: 74.284, height: 52 }
change-view: { width: 37.142, height: 52 }
change-view-2: { width: 74.284, height: 52 }
spaceline: { width: 215.424, height: 52 }
large: { width: 40.856, height: 52 }
placeholder: { width: 37.142, height: 52 }
fill: { width: 74.284, height: 52 }
views:
base:
- "ๅ / _ ภ ถ ุ ึ ค ต จ ข ช"
- "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
- "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
- "Shift_L ผ ป แ อ ิ ื ท ม ใ ฝ BackSpace"
- "show_numbers preferences space .-large Return"
- "show_upper ผ ป แ อ ิ ื ท ม ใ ฝ BackSpace"
- "show_numbers preferences space .-large Return"
upper:
- "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
- " \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
- "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
- "Shift_L ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ BackSpace"
- "show_numbers preferences space .-large Return"
- "show_upper ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ BackSpace"
- "show_numbers preferences space .-large Return"
numbers:
- "-- -- -- -- -- -- -- -- -- -- -- --"
- "-- -- , \" ' : ; ! ? -- -- --"
- "-- 1 2 3 4 5 6 7 8 9 0 --"
- "show_symbols @ # $ % & - _ + ( ) BackSpace"
- "show_letters preferences space .-large Return"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # $ % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters preferences space .-large Return"
symbols:
- "-- -- -- -- -- -- -- -- -- -- -- --"
- "-- -- \\ / < > = [ ] -- -- --"
- "-- © ® £ € ¥ ^ ° * { } --"
- "show_numbers_from_symbols ~ ` | · √ π τ ÷ × BackSpace"
- "show_letters preferences space .-large Return"
- "© ® £ € ¥ ^ ° * { }"
- "~ ` | · √ π τ ÷ ×"
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
- "show_letters preferences space .-large Return"
buttons:
Shift_L:
show_upper:
action:
locking:
lock_view: "upper"
@ -46,12 +47,12 @@ buttons:
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
outline: "special"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
outline: "special-2"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
@ -61,7 +62,7 @@ buttons:
show_numbers_from_symbols:
action:
set_view: "numbers"
outline: "change-view"
outline: "change-view-2"
label: "123"
show_letters:
action:
@ -71,18 +72,42 @@ buttons:
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
outline: "change-view-2"
label: "*/="
space:
outline: "spaceline"
text: " "
Return:
outline: "wide"
outline: "special-3"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""
.-large:
outline: "large"
text: "."
--:
outline: "placeholder"
text: ""
5:
outline: "fill"
6:
outline: "fill"
"&":
outline: "fill"
-:
outline: "fill"
"'":
outline: "fill"
::
outline: "fill"
¥:
outline: "fill"
^:
outline: "fill"
:
outline: "fill"
π:
outline: "fill"
<:
outline: "fill"
">":
outline: "fill"

View File

@ -1,43 +1,45 @@
# Language: Thai
---
outlines:
default: { width: 75, height: 56 }
altline: { width: 75, height: 56 }
wide: { width: 135, height: 56 }
change-view: { width: 75, height: 56 }
change-view-2: { width: 135, height: 56 }
spaceline: { width: 480, height: 56 }
special: { width: 75, height: 56 }
placeholder: { width: 75, height: 56 }
default: { width: 56, height: 42 }
special: { width: 56, height: 42 }
special-2: { width: 61.6, height: 42 }
special-3: { width: 112, height: 42 }
change-view: { width: 56, height: 42 }
change-view-2: { width: 112, height: 42 }
spaceline: { width: 324.8, height: 42 }
large: { width: 61.6, height: 42 }
placeholder: { width: 56, height: 42 }
fill: { width: 112, height: 42 }
views:
base:
- "ๅ / _ ภ ถ ุ ึ ค ต จ ข ช"
- "ๆ ไ ำ พ ะ ั ี ร น ย บ ล"
- "ฟ ห ก ด เ ้ ่ า ส ว ง ฃ"
- "Shift_L ผ ป แ อ ิ ื ท ม ใ ฝ BackSpace"
- "show_numbers preferences space . Return"
- "show_upper ผ ป แ อ ิ ื ท ม ใ ฝ BackSpace"
- "show_numbers preferences space .-large Return"
upper:
- "+ ๑ ๒ ๓ ๔ ู ฿ ๕ ๖ ๗ ๘ ๙"
- " \" ฎ ฑ ธ ํ ๊ ณ ฯ ญ ฐ ,"
- "ฤ ฆ ฏ โ ฌ ็ ๋ ษ ศ ซ . ฅ"
- "Shift_L ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ BackSpace"
- "show_numbers preferences space . Return"
- "show_upper ( ) ฉ ฮ ฺ ์ ? ฒ ฬ ฦ BackSpace"
- "show_numbers preferences space .-large Return"
numbers:
- "-- -- -- -- -- -- -- -- -- -- -- --"
- "-- -- , \" ' : ; ! ? -- -- --"
- "-- 1 2 3 4 5 6 7 8 9 0 --"
- "show_symbols @ # $ % & - _ + ( ) BackSpace"
- "show_letters preferences space . Return"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # $ % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters preferences space .-large Return"
symbols:
- "-- -- -- -- -- -- -- -- -- -- -- --"
- "-- -- \\ / < > = [ ] -- -- --"
- "-- © ® £ € ¥ ^ ° * { } --"
- "show_numbers_from_symbols ~ ` | · √ π τ ÷ × BackSpace"
- "show_letters preferences space . Return"
- "© ® £ € ¥ ^ ° * { }"
- "~ ` | · √ π τ ÷ ×"
- "show_numbers_from_symbols \\ / < > = [ ] BackSpace"
- "show_letters preferences space .-large Return"
buttons:
Shift_L:
show_upper:
action:
locking:
lock_view: "upper"
@ -45,12 +47,12 @@ buttons:
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
outline: "special"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
outline: "special-2"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
@ -60,7 +62,7 @@ buttons:
show_numbers_from_symbols:
action:
set_view: "numbers"
outline: "change-view"
outline: "change-view-2"
label: "123"
show_letters:
action:
@ -70,15 +72,42 @@ buttons:
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
outline: "change-view-2"
label: "*/="
space:
outline: "spaceline"
text: " "
Return:
outline: "wide"
outline: "special-3"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""
text: ""
.-large:
outline: "large"
text: "."
5:
outline: "fill"
6:
outline: "fill"
"&":
outline: "fill"
-:
outline: "fill"
"'":
outline: "fill"
::
outline: "fill"
¥:
outline: "fill"
^:
outline: "fill"
:
outline: "fill"
π:
outline: "fill"
<:
outline: "fill"
">":
outline: "fill"

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
squeekboard (1.42.0) experimental; urgency=medium
* */meson.build: Fix warnings about features deprecated since Meson 0.56
* layouts: Adjust French (fr+bepo) terminal-layout and make it available
* layouts: Improve the size of the Thai (th) layout
* Cargo.lock: Update dependencies
-- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Mon, 30 Sep 2024 11:13:46 +0200
squeekboard (1.42.0~rc1) experimental; urgency=medium
[ MoonlightWave-12 ]

View File

@ -1,7 +1,7 @@
project(
'squeekboard',
'c', 'rust',
version: '1.42.0.rc1',
version: '1.42.0',
license: 'GPLv3',
meson_version: '>=1.0.0',
default_options: [
@ -93,7 +93,7 @@ copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in', check:
prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_Cargo.toml.in', check: true)
path_data = configuration_data()
path_data.set('path', meson.source_root())
path_data.set('path', meson.project_source_root())
cargo_toml = configure_file(
input: 'meson_Cargo.toml.in',
output: 'Cargo.toml',

View File

@ -1,5 +1,5 @@
wayland_protos = dependency('wayland-protocols', version: '>=1.12')
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wl_protocol_dir = wayland_protos.get_variable(pkgconfig : 'pkgdatadir')
wl_scanner = find_program('wayland-scanner')
gen_scanner_client_header = generator(wl_scanner,

View File

@ -1,7 +1,7 @@
gnome = import('gnome')
dbus_src = gnome.gdbus_codegen(
'sm.puri.OSK0',
join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
join_paths(meson.project_source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
)
config_h = configure_file(
@ -83,7 +83,7 @@ test(
'rstest',
cargo_script,
args: ['test'] + cargo_build_flags,
env: ['SOURCE_DIR=' + meson.source_root()],
env: ['SOURCE_DIR=' + meson.project_source_root()],
# This is a whole Cargo-based test suite, let it run for a while
timeout: 900,
depends: [build_rstests],

View File

@ -173,6 +173,8 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
("terminal/fr", include_str!("../data/keyboards/terminal/fr.yaml")),
("terminal/fr_wide", include_str!("../data/keyboards/terminal/fr_wide.yaml")),
("terminal/fr+bepo", include_str!("../data/keyboards/terminal/fr+bepo.yaml")),
("terminal/fr+bepo_wide", include_str!("../data/keyboards/terminal/fr+bepo_wide.yaml")),
("terminal/us", include_str!("../data/keyboards/terminal/us.yaml")),
("terminal/us_wide", include_str!("../data/keyboards/terminal/us_wide.yaml")),

View File

@ -114,6 +114,7 @@ foreach layout : [
'terminal/de', 'terminal/de_wide',
'terminal/es', 'terminal/es_wide',
'terminal/fr', 'terminal/fr_wide',
'terminal/fr+bepo', 'terminal/fr+bepo_wide',
'terminal/us', 'terminal/us_wide',
'terminal/us+dvorak', 'terminal/us+dvorak_wide',
@ -136,7 +137,7 @@ foreach layout : [
+ ['--example', 'test_layout', '--', layout]
+ extra,
timeout: timeout,
workdir: meson.build_root(),
workdir: meson.project_build_root(),
)
endforeach
@ -147,8 +148,8 @@ if get_option('find_orphans')
cargo_script,
args: ['run'] + cargo_build_flags
+ ['--example', 'find_orphan_layouts',
'--', meson.source_root() + '/data/keyboards/'],
'--', meson.project_source_root() + '/data/keyboards/'],
timeout: timeout,
workdir: meson.build_root(),
workdir: meson.project_build_root(),
)
endif