Add settings migration patch which is pending for 0.6.0.1

2 files changed, 13 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81753abfbaaf..1771f224a8b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opentabletdriver
 	pkgdesc = A cross-platform open source tablet driver
 	pkgver = 0.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/OpenTabletDriver/OpenTabletDriver
 	install = notes.install
 	arch = x86_64
@@ -20,11 +20,13 @@ pkgbase = opentabletdriver
 	source = opentabletdriver.service
 	source = OpenTabletDriver.desktop
 	source = notes.install
+	source = fix-settings-migration.patch::https://github.com/OpenTabletDriver/OpenTabletDriver/commit/a4616aa0aea08a0b4470c7ba9624a8e7604b0f90.patch
 	sha256sums = ccec597692b17530afef836583cf4af5029bd0edccfa9b86cacc084db90e6178
 	sha256sums = 8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a
 	sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0
 	sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2
 	sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834
 	sha256sums = b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf
+	sha256sums = 1c8441611cdbd3652be66813ff33fa16a2093db43838ce454d7af270b187ee3e
 
 pkgname = opentabletdriver
diff --git a/PKGBUILD b/PKGBUILD
index 914dcbcbbad1..4488d1f20246 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=OpenTabletDriver
 _lpkgname=opentabletdriver
 _spkgname=otd
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open source tablet driver"
 arch=('x86_64')
 url="https://github.com/OpenTabletDriver/OpenTabletDriver"
@@ -19,17 +19,24 @@ source=("OpenTabletDriver-$pkgver.tar.gz::https://github.com/OpenTabletDriver/Op
         "$_spkgname-gui"
         "$_lpkgname.service"
         "$_pkgname.desktop"
-        "notes.install")
+        "notes.install"
+        "fix-settings-migration.patch::https://github.com/OpenTabletDriver/OpenTabletDriver/commit/a4616aa0aea08a0b4470c7ba9624a8e7604b0f90.patch")
 
 sha256sums=('ccec597692b17530afef836583cf4af5029bd0edccfa9b86cacc084db90e6178'
             '8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a'
             '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0'
             '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2'
             '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834'
-            'b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf')
+            'b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf'
+            '1c8441611cdbd3652be66813ff33fa16a2093db43838ce454d7af270b187ee3e')
 
 _srcdir="OpenTabletDriver-$pkgver"
 
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 < "$srcdir/fix-settings-migration.patch"
+}
+
 build() {
     export DOTNET_CLI_TELEMETRY_OPTOUT=1
     export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true