0.7.0.0pre compatibility

(0.7.0.0pre is an unofficial tag)

3 files changed, 17 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1296f6235e01..6d01578ac82f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opentabletdriver-git
 	pkgdesc = A cross-platform open source tablet driver
-	pkgver = v0.6.0.4.r20.g325c28ca
+	pkgver = v0.7.0.0pre.r21.g10a3c072
 	pkgrel = 2
 	url = https://github.com/OpenTabletDriver/OpenTabletDriver
 	install = notes.install
@@ -8,7 +8,7 @@ pkgbase = opentabletdriver-git
 	license = LGPL3
 	makedepends = git
 	makedepends = dotnet-sdk>=6.0
-	depends = dotnet-runtime>=6.0.4
+	depends = dotnet-runtime-6.0
 	depends = dotnet-host>=6.0
 	depends = gtk3
 	depends = libevdev
@@ -27,6 +27,6 @@ pkgbase = opentabletdriver-git
 	sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0
 	sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2
 	sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834
-	sha256sums = c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442
+	sha256sums = cddf5b0928bc6e1d8d87ac503b4dd31536d956b1f37e7e3fa1c1b47a0ad23880
 
 pkgname = opentabletdriver-git
diff --git a/PKGBUILD b/PKGBUILD
index e505bed3c47c..67f1bc019fb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=opentabletdriver-git
 _pkgname=OpenTabletDriver
 _lpkgname=opentabletdriver
 _spkgname=otd
-pkgver=v0.6.0.4.r20.g325c28ca
+pkgver=v0.7.0.0pre.r21.g10a3c072
 pkgrel=2
 pkgdesc="A cross-platform open source tablet driver"
 arch=('x86_64')
@@ -30,11 +30,16 @@ sha256sums=('SKIP'
             '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0'
             '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2'
             '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834'
-            'c18e36c7287db4dc16df687693f7ffe548620b26c03b2a98b0b44f4fdedfd442')
+            'cddf5b0928bc6e1d8d87ac503b4dd31536d956b1f37e7e3fa1c1b47a0ad23880')
 
 pkgver() {
     cd "$srcdir/$_pkgname"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    # check for the DI rewrite commit that makes plugins incompatible
+    if git merge-base --is-ancestor 10a3c07206028f7df5befbdeca6aadb30efe4cb3 HEAD >/dev/null; then
+        git describe --long --tags 10a3c07206028f7df5befbdeca6aadb30efe4cb3 | sed 's/0.6.0.4/0.7.0.0pre/' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    else
+        git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    fi
 }
 
 build() {
diff --git a/notes.install b/notes.install
index 9254262f4e6f..19e4246c7173 100644
--- a/notes.install
+++ b/notes.install
@@ -27,7 +27,7 @@ msg_modules() {
 }
 
 msg_faq() {
-	echo -e "In the case that you still have issues after following these instructions, the FAQ at ${GREEN}https://opentabletdriver.net/Wiki/FAQ/Linux${RESET} may help."
+	echo -e "In case that you still have issues after following these instructions, the FAQ at ${GREEN}https://opentabletdriver.net/Wiki/FAQ/Linux${RESET} may help."
 	echo
 }
 
@@ -51,4 +51,9 @@ post_upgrade() {
     echo -e "You may want to clear the contents of the ${GREEN}Plugins/${RESET} and ${GREEN}Configurations/${RESET} folder in ${GREEN}~/.config/OpenTabletDriver/${RESET}"
     echo
   fi
+  if [ $(vercmp $2 0.7.0.0pre) -lt 0 ]; then
+    echo -e "${BOLD}The plugin API and tablet configuration format has again changed in OpenTabletDriver 0.7${RESET}"
+    echo -e "You may want to clear the contents of the ${GREEN}Plugins/${RESET} and ${GREEN}Configurations/${RESET} folder in ${GREEN}~/.config/OpenTabletDriver/${RESET}"
+    echo
+  fi
 }