OpenTabletDriver v0.6

3 files changed, 37 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b78c5441bf6..81753abfbaaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,30 @@
 pkgbase = opentabletdriver
 	pkgdesc = A cross-platform open source tablet driver
-	pkgver = 0.5.3.3
-	pkgrel = 4
+	pkgver = 0.6.0
+	pkgrel = 1
 	url = https://github.com/OpenTabletDriver/OpenTabletDriver
 	install = notes.install
 	arch = x86_64
 	license = LGPL3
 	makedepends = git
-	makedepends = dotnet-sdk>=5.0
-	depends = dotnet-runtime-5.0
-	depends = dotnet-host>=5.0
+	makedepends = dotnet-sdk>=6.0
+	depends = dotnet-runtime>=6.0
+	depends = dotnet-host>=6.0
 	depends = gtk3
 	depends = libevdev
 	optdepends = libxrandr: x11 display querying support
 	optdepends = libx11
-	source = OpenTabletDriver-0.5.3.3.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v0.5.3.3.tar.gz
-	source = git+https://github.com/OpenTabletDriver/OpenTabletDriver-udev#commit=f4c859ea3286a8
+	source = OpenTabletDriver-0.6.0.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v0.6.0.tar.gz
 	source = otd
 	source = otd-gui
 	source = opentabletdriver.service
 	source = OpenTabletDriver.desktop
 	source = notes.install
-	sha256sums = 5673851a3b56ae47e4f1d28ff6131ea8f1ac282ab7250ac4687dfbe760805037
-	sha256sums = SKIP
+	sha256sums = ccec597692b17530afef836583cf4af5029bd0edccfa9b86cacc084db90e6178
 	sha256sums = 8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a
 	sha256sums = 20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0
 	sha256sums = 88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2
 	sha256sums = 4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834
-	sha256sums = aa10ff32dd3d6762b1cb0174f6000c49bf4d4670887d3f47ec0a4ac584cff859
+	sha256sums = b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf
 
 pkgname = opentabletdriver
diff --git a/PKGBUILD b/PKGBUILD
index 45a4621b2909..914dcbcbbad1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,102 +4,64 @@ pkgname=opentabletdriver
 _pkgname=OpenTabletDriver
 _lpkgname=opentabletdriver
 _spkgname=otd
-pkgver=0.5.3.3
-pkgrel=4
+pkgver=0.6.0
+pkgrel=1
 pkgdesc="A cross-platform open source tablet driver"
 arch=('x86_64')
 url="https://github.com/OpenTabletDriver/OpenTabletDriver"
 license=('LGPL3')
-depends=('dotnet-runtime-5.0' 'dotnet-host>=5.0' 'gtk3' 'libevdev')
+depends=('dotnet-runtime>=6.0' 'dotnet-host>=6.0' 'gtk3' 'libevdev')
 optdepends=('libxrandr: x11 display querying support' 'libx11')
-makedepends=('git' 'dotnet-sdk>=5.0')
+makedepends=('git' 'dotnet-sdk>=6.0')
 install="notes.install"
 source=("OpenTabletDriver-$pkgver.tar.gz::https://github.com/OpenTabletDriver/OpenTabletDriver/archive/v$pkgver.tar.gz"
-        'git+https://github.com/OpenTabletDriver/OpenTabletDriver-udev#commit=f4c859ea3286a8'
         "$_spkgname"
         "$_spkgname-gui"
         "$_lpkgname.service"
         "$_pkgname.desktop"
         "notes.install")
 
-sha256sums=('5673851a3b56ae47e4f1d28ff6131ea8f1ac282ab7250ac4687dfbe760805037'
-            'SKIP'
+sha256sums=('ccec597692b17530afef836583cf4af5029bd0edccfa9b86cacc084db90e6178'
             '8a09d29e683aefcbf54e5fe891d5688f959d9399804f9c151f0e8f6e6a1ede1a'
             '20aac1584a8e08b5a9add1d02ce38e60ddfede615227df6f25c7422217df82b0'
             '88f7d9ae1e9402cfbf9266ddf0de642195b64de13a3d5ce6f93460ba035cf7f2'
             '4399359bf6107b612d10aaa06abb197db540b00a973cfec64c2b40d1fbbb2834'
-            'aa10ff32dd3d6762b1cb0174f6000c49bf4d4670887d3f47ec0a4ac584cff859')
+            'b28aa1d2d4f531d877f6601eb5e684f78cee7acfe2bd7af739e5144fd36bafdf')
 
 _srcdir="OpenTabletDriver-$pkgver"
 
-prepare() {
-    cd "$srcdir/$_pkgname-udev/.modules"
-    rmdir "$_pkgname"
-    ln -s "$srcdir/$_srcdir" "$_pkgname"
-}
-
 build() {
     export DOTNET_CLI_TELEMETRY_OPTOUT=1
     export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 
     cd "$srcdir/$_srcdir"
 
-    dotnet publish        OpenTabletDriver.Daemon   \
-        --configuration   Release                   \
-        --framework       net5                      \
-        --runtime         linux-x64                 \
-        --self-contained  false                     \
-        --output          "./$_pkgname/out"         \
-        /p:SuppressNETCoreSdkPreviewMessage=true    \
-        /p:PublishTrimmed=false
-
-    dotnet publish        OpenTabletDriver.Console  \
-        --configuration   Release                   \
-        --framework       net5                      \
-        --runtime         linux-x64                 \
-        --self-contained  false                     \
-        --output          "./$_pkgname/out"         \
-        /p:SuppressNETCoreSdkPreviewMessage=true    \
-        /p:PublishTrimmed=false
-
-    dotnet publish        OpenTabletDriver.UX.Gtk   \
-        --configuration   Release                   \
-        --framework       net5                      \
-        --runtime         linux-x64                 \
-        --self-contained  false                     \
-        --output          "./$_pkgname/out"         \
-        /p:SuppressNETCoreSdkPreviewMessage=true    \
-        /p:PublishTrimmed=false
+    if check_option "strip" y; then
+        EXTRA_OPTIONS="/p:DebugType=None /p:DebugSymbols=false"
+    fi
 
-    cd "$srcdir/$_pkgname-udev"
-    dotnet build          OpenTabletDriver.udev     \
-        --configuration   Release                   \
-        --framework       net5                      \
-        --runtime         linux-x64                 \
-        --output          "./$_pkgname.udev/out"    \
-        /p:SuppressNETCoreSdkPreviewMessage=true
+    ./build.sh linux-x64 \
+        $EXTRA_OPTIONS
 
-    dotnet "./$_pkgname.udev/out/$_pkgname.udev.dll" \
-        "$srcdir/$_srcdir/$_pkgname/Configurations" \
-        "90-$_lpkgname.rules" > /dev/null
+    ./generate-rules.sh
 }
 
 package() {
-    cd "$srcdir"
+    cd "$srcdir/$_srcdir"
 
     install -do root "$pkgdir/usr/share/$_pkgname"
 
-    cd "$srcdir/$_srcdir/$_pkgname/out"
+    shopt -s nullglob
+    cd bin
     for binary in *.dll *.json *.pdb; do
         install -Dm 755 -o root "$binary" -t "$pkgdir/usr/share/$_pkgname"
     done
-    cd "$srcdir"
 
+    cd "$srcdir"
     sed -i "s/OTD_VERSION/$pkgver/" "$_pkgname.desktop"
 
-    install -Dm 644 -o root "$srcdir/$_pkgname-udev/90-$_lpkgname.rules" -t "$pkgdir/usr/lib/udev/rules.d"
-    install -Dm 644 -o root "$srcdir/$_srcdir/$_pkgname.UX/Assets/$_spkgname.png" -t "$pkgdir/usr/share/pixmaps"
-    cp -r "$srcdir/$_srcdir/$_pkgname/Configurations" "$pkgdir/usr/share/$_pkgname/"
+    install -Dm 644 -o root "$_srcdir/bin/99-$_lpkgname.rules" -t "$pkgdir/usr/lib/udev/rules.d"
+    install -Dm 644 -o root "$_srcdir/$_pkgname.UX/Assets/$_spkgname.png" -t "$pkgdir/usr/share/pixmaps"
 
     install -Dm 755 -o root "$_spkgname" -t "$pkgdir/usr/bin"
     install -Dm 755 -o root "$_spkgname-gui" -t "$pkgdir/usr/bin"
diff --git a/notes.install b/notes.install
index a530b9b1cf51..44e6d45b7b04 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://github.com/InfinityGhost/OpenTabletDriver/wiki/Linux-FAQ${RESET} may help."
+	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
 }
 
@@ -41,3 +41,13 @@ post_install() {
 	msg_modules
 	msg_faq
 }
+
+post_upgrade() {
+  if [ $(vercmp $2 'v0.6.0-1') -lt 0 ]; then
+    return 0
+  fi
+  echo -e "${BOLD}The plugin API and tablet configuration format has changed in OpenTabletDriver 0.6${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 "Mismatching GUI and daemon versions isn't supported, so make sure to restart the OpenTabletDriver daemon"
+  echo
+}