summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian 'gonX' Jensen2022-11-18 22:19:03 +0100
committerSebastian 'gonX' Jensen2022-11-18 22:19:03 +0100
commit41786e67570324a9124cbd64655ebceaf81803b5 (patch)
tree61ed81b8cc7196495140be47def470772806e3dd
parenta07e1ccc7957789e6c205989e3f70c1e9201fad2 (diff)
downloadaur-41786e67570324a9124cbd64655ebceaf81803b5.tar.gz
Actually fix 0.7.0.0pre versioning
OpenTabletDriver itself would still report 0.6.0.4, but luckily with the right commit
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3e12ee472d52..5b8509ed1500 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = opentabletdriver-git
pkgdesc = A cross-platform open source tablet driver
pkgver = v0.7.0.0pre.r163.gd50c1324
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/OpenTabletDriver/OpenTabletDriver
install = notes.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index fed479963d3a..54e9f6121580 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=OpenTabletDriver
_lpkgname=opentabletdriver
_spkgname=otd
pkgver=v0.7.0.0pre.r163.gd50c1324
-pkgrel=3
+pkgrel=4
pkgdesc="A cross-platform open source tablet driver"
arch=('x86_64')
url="https://github.com/OpenTabletDriver/OpenTabletDriver"
@@ -50,7 +50,12 @@ build() {
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
cd "$srcdir/$_pkgname"
- PREFIX=$(git describe --long --tags | sed 's/-.*//;s/v//')
+ # check for the DI rewrite commit that makes plugins incompatible
+ if git merge-base --is-ancestor 10a3c07206028f7df5befbdeca6aadb30efe4cb3 HEAD >/dev/null; then
+ PREFIX="0.7.0.0-pre"
+ else
+ PREFIX=$(git describe --long --tags | sed 's/-.*//;s/v//')
+ fi
if check_option "strip" y; then
EXTRA_OPTIONS="/p:DebugType=None /p:DebugSymbols=false"