From bed275baa7f9f935cffdcbbd08c63c465c445ea4 Mon Sep 17 00:00:00 2001 From: Felix Zwettler Date: Thu, 29 Sep 2022 12:25:39 +0200 Subject: [PATCH] update app to v0.5.5 --- Cargo.lock | 50 ++++++++++++++-------------- meson.build | 2 +- rnote-fileformats/src/rnoteformat.rs | 8 ++--- rnote-ui/Cargo.toml | 2 +- rnote-ui/data/app.metainfo.xml.in.in | 6 ++-- rnote-ui/po/rnote.pot | 6 +++- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b03535b68..192044ade5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -523,26 +523,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -1494,9 +1492,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bbaead50122b06e9a973ac20bc7445074d99ad9a0a0654934876908a9cec82c" +checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1542,9 +1540,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" +checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" dependencies = [ "bytemuck", "byteorder", @@ -1670,10 +1668,11 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libadwaita" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ad2318c7abc8629b1d1ed381bd0356c184ae8f4caebc044ef9de1782c86046" +checksum = "73815fa30ca62d1db2713fe87cfd1cea41cad076ccdece6bb8328032db152f47" dependencies = [ + "bitflags", "futures-channel", "gdk-pixbuf", "gdk4", @@ -1688,9 +1687,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.2.0-alpha.2" +version = "0.2.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835f99b92f6e7f43ddb2c0ca79d9d21124a170190876505e03484f337f7edc7" +checksum = "b91960ec236b6fecdace0491ae1e4aac938d1c6adffd5939f811f3ed6592a59e" dependencies = [ "gdk4-sys", "gio-sys", @@ -1698,6 +1697,7 @@ dependencies = [ "gobject-sys", "gtk4-sys", "libc", + "pango-sys", "system-deps", ] @@ -1726,7 +1726,7 @@ checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "librsvg" version = "2.55.0" -source = "git+https://gitlab.gnome.org/GNOME/librsvg#eabaca185cc3a3be4d5cdba506a0475b8ae25c05" +source = "git+https://gitlab.gnome.org/GNOME/librsvg#e9f6b7dfcde2ce59e0d163b44766ddb03eddb72f" dependencies = [ "byteorder", "cairo-rs", @@ -2510,7 +2510,7 @@ version = "0.5.0" dependencies = [ "base64", "font-kit", - "image 0.24.3", + "image 0.24.4", "piet", "rustybuzz 0.4.0", "svg", @@ -2651,9 +2651,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -2887,7 +2887,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.5.4" +version = "0.5.5" dependencies = [ "anyhow", "cairo-rs", @@ -3422,9 +3422,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -3478,18 +3478,18 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", diff --git a/meson.build b/meson.build index 9af88d6544..0d5fade1c1 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'rnote', 'rust', - version: '0.5.4', + version: '0.5.5', meson_version: '>= 0.56', ) # add a patch suffix for alpha or beta version, starting with a dash. diff --git a/rnote-fileformats/src/rnoteformat.rs b/rnote-fileformats/src/rnoteformat.rs index b25ce63532..754d373747 100644 --- a/rnote-fileformats/src/rnoteformat.rs +++ b/rnote-fileformats/src/rnoteformat.rs @@ -37,7 +37,7 @@ struct RnotefileWrapper { #[derive(Debug, Clone, Serialize, Deserialize)] /// the Rnote file in format version 0.5.x. The actual (de-) serialization into strong types is happening in `rnote-engine`. -/// This struct exists to allow for upgrading older versions before loading it in. +/// This struct exists to allow for upgrading older versions before loading the file in. #[serde(rename = "rnotefile_maj0_min5")] pub struct RnotefileMaj0Min5 { @@ -65,7 +65,7 @@ impl FileFormatLoader for RnotefileMaj0Min5 { )?) } else { Err(anyhow::anyhow!( - "failed to load rnote file from bytes, invalid version", + "failed to load rnote file from bytes, unsupported version", )) } } @@ -74,7 +74,7 @@ impl FileFormatLoader for RnotefileMaj0Min5 { impl FileFormatSaver for RnotefileMaj0Min5 { fn save_as_bytes(&self, file_name: &str) -> anyhow::Result> { let output = RnotefileWrapper { - version: semver::Version::parse("0.5.4").unwrap(), + version: semver::Version::parse("0.5.5").unwrap(), data: serde_json::to_value(self)?, }; @@ -84,7 +84,7 @@ impl FileFormatSaver for RnotefileMaj0Min5 { } } -// The file format is expected only to break on minor versions in prelease (0.x.x) and on major versions after 1.0.0 release. (equivalent to API breaks according to the semver spec) +// The file format is expected only to break on minor versions in prelease (0.x.x) and on major versions after 1.0.0 release. (equivalent to API's conforming to the semver spec) // Older formats can be added here, with the naming scheme RnoteFileMajMin, where X: semver major, Y: semver minor version. // Then TryFrom is implemented to allow conversions and chaining from older to newer versions. diff --git a/rnote-ui/Cargo.toml b/rnote-ui/Cargo.toml index 88821babce..74eacce824 100644 --- a/rnote-ui/Cargo.toml +++ b/rnote-ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rnote" -version = "0.5.4" +version = "0.5.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rnote-ui/data/app.metainfo.xml.in.in b/rnote-ui/data/app.metainfo.xml.in.in index 52d1424fc3..5a66351c65 100644 --- a/rnote-ui/data/app.metainfo.xml.in.in +++ b/rnote-ui/data/app.metainfo.xml.in.in @@ -66,13 +66,13 @@ - +

this release changes:

  • Port to libadwaita 1.2 with an updated about window, improved dialogs
    • -
  • new feature: a "permanently hide scrollbars" toggle in the settings
    • -
  • new feature: a "paste from clipboard" button in the selector page
    • +
  • new feature: "permanently hide scrollbars" toggle in the settings
    • +
  • new feature: "paste from clipboard" button in the selector page
  • improved window title, now shows the current document name
  • tweaked app icon
diff --git a/rnote-ui/po/rnote.pot b/rnote-ui/po/rnote.pot index 2905441541..c970d88b4d 100644 --- a/rnote-ui/po/rnote.pot +++ b/rnote-ui/po/rnote.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rnote\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-26 15:25+0200\n" +"POT-Creation-Date: 2022-09-29 12:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -953,6 +953,10 @@ msgstr "" msgid "Delete selection" msgstr "" +#: rnote-ui/data/ui/penssidebar/selectorpage.ui:185 +msgid "Paste from Clipboard" +msgstr "" + #: rnote-ui/data/ui/penssidebar/shaperpage.ui:33 msgid "Shaper style" msgstr ""