From 20b4d5b045ee006669fb898ba734785fd226b40c Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Thu, 16 Mar 2023 23:15:38 +0100
Subject: [PATCH] update to v0.5.18

---
 Cargo.lock                               | 30 ++++++++++++------------
 meson.build                              |  2 +-
 rnote-cli/Cargo.toml                     |  2 +-
 rnote-fileformats/src/rnoteformat/mod.rs |  2 +-
 rnote-ui/Cargo.toml                      |  2 +-
 rnote-ui/data/app.metainfo.xml.in.in     |  8 +++++++
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bf57e6c55d..2c66202066 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.8"
+version = "4.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+checksum = "9a9d6ada83c1edcce028902ea27dd929069c70df4c7600b131b4d9a1ad2879cc"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -556,18 +556,18 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.1.4"
+version = "4.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4"
+checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.8"
+version = "4.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -578,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
+checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
 dependencies = [
  "os_str_bytes",
 ]
@@ -1949,10 +1949,11 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
+checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380"
 dependencies = [
+ "hermit-abi 0.3.1",
  "libc",
  "windows-sys 0.45.0",
 ]
@@ -3365,7 +3366,7 @@ dependencies = [
 
 [[package]]
 name = "rnote"
-version = "0.5.17"
+version = "0.5.18"
 dependencies = [
  "anyhow",
  "cairo-rs",
@@ -3406,7 +3407,7 @@ dependencies = [
 
 [[package]]
 name = "rnote-cli"
-version = "0.5.17"
+version = "0.5.18"
 dependencies = [
  "anyhow",
  "clap",
@@ -4469,12 +4470,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
diff --git a/meson.build b/meson.build
index 5b9a6e4671..2a72ab5a20 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'rnote',
     ['rust', 'cpp'],
-    version: '0.5.17',
+    version: '0.5.18',
     meson_version: '>= 0.57',
 )
 # add a patch suffix for alpha or beta version, starting with a dash.
diff --git a/rnote-cli/Cargo.toml b/rnote-cli/Cargo.toml
index 8b652a03cd..e6f19f3d6b 100644
--- a/rnote-cli/Cargo.toml
+++ b/rnote-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rnote-cli"
-version = "0.5.17"
+version = "0.5.18"
 edition = "2021"
 rust-version = "1.65"
 
diff --git a/rnote-fileformats/src/rnoteformat/mod.rs b/rnote-fileformats/src/rnoteformat/mod.rs
index 22d89df090..99a7f20375 100644
--- a/rnote-fileformats/src/rnoteformat/mod.rs
+++ b/rnote-fileformats/src/rnoteformat/mod.rs
@@ -105,7 +105,7 @@ impl FileFormatLoader for RnoteFile {
 impl FileFormatSaver for RnoteFile {
     fn save_as_bytes(&self, file_name: &str) -> anyhow::Result<Vec<u8>> {
         let output = RnotefileWrapper {
-            version: semver::Version::parse("0.5.17").unwrap(),
+            version: semver::Version::parse("0.5.18").unwrap(),
             data: serde_json::to_value(self).context("to_value() for RnoteFile failed")?,
         };
 
diff --git a/rnote-ui/Cargo.toml b/rnote-ui/Cargo.toml
index 107741cc5d..0f1d94848f 100644
--- a/rnote-ui/Cargo.toml
+++ b/rnote-ui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rnote"
-version = "0.5.17"
+version = "0.5.18"
 edition = "2021"
 rust-version = "1.65"
 build = "build.rs"
diff --git a/rnote-ui/data/app.metainfo.xml.in.in b/rnote-ui/data/app.metainfo.xml.in.in
index d5b50b9e19..b505e56659 100644
--- a/rnote-ui/data/app.metainfo.xml.in.in
+++ b/rnote-ui/data/app.metainfo.xml.in.in
@@ -72,6 +72,14 @@
 
   <!-- The changelog should not be translated -->
   <releases>
+    <release version="0.5.18" date="2023-03-16">
+      <description>
+        <p>this release changes:</p>
+        <ul>
+          <li>fix: panic on app start when color scheme setting is set to "Use Light Colors" / "Use Dark Colors"</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.5.17" date="2023-03-16">
       <description>
         <p>this release changes:</p>