Remove obsolete patch (fixed upstream)

Also:

- Grammar fix in pkgdesc
- Get version from git tags

3 files changed, 11 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be5b2296cdec..319cdc6151d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = seq66-git
-	pkgdesc = A live-looping sequencer with an Qt graphical interface (git version)
-	pkgver = 0.98.3.r773.0e0722f6
+	pkgdesc = A live-looping sequencer with a Qt graphical interface (git version)
+	pkgver = 0.98.3.1.r0.g5efdce36
 	pkgrel = 1
 	url = https://github.com/ahlstromcj/seq66
 	arch = i686
@@ -13,12 +13,10 @@ pkgbase = seq66-git
 	makedepends = liblo
 	depends = qt5-base
 	provides = seq66
-	provides = seq66=0.98.3
+	provides = seq66=0.98.3.1
 	conflicts = seq66
 	source = seq66::git+https://github.com/ahlstromcj/seq66.git
-	source = seq66-destdir.patch
 	md5sums = SKIP
-	md5sums = b0acb87040cef1ff9ddaff9154be6632
 
 pkgname = seq66-git
 	depends = qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index 9c32bd55810a..3b745203052b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 _pkgname=seq66
 pkgname="${_pkgname}-git"
-pkgver=0.98.3.r773.0e0722f6
+pkgver=0.98.3.1.r0.g5efdce36
 pkgrel=1
-pkgdesc="A live-looping sequencer with an Qt graphical interface (git version)"
+pkgdesc="A live-looping sequencer with a Qt graphical interface (git version)"
 arch=('i686' 'x86_64')
 url="https://github.com/ahlstromcj/seq66"
 license=('GPL2')
@@ -13,23 +13,17 @@ makedepends=('git' 'alsa-lib' 'jack' 'liblo')
 groups=('pro-audio')
 provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/ahlstromcj/${_pkgname}.git"
-        'seq66-destdir.patch')
-md5sums=('SKIP'
-         'b0acb87040cef1ff9ddaff9154be6632')
+source=("${_pkgname}::git+https://github.com/ahlstromcj/${_pkgname}.git")
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-
   local ver=$(tail -n 1 VERSION)
-  echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd "${srcdir}/${_pkgname}"
 
-  # some install commands do not respect DESTDIR properly
-  patch -p1 -r -N -i "${srcdir}"/seq66-destdir.patch
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    echo "$ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  )
 }
 
 build() {
diff --git a/seq66-destdir.patch b/seq66-destdir.patch
deleted file mode 100644
index 92eac2f96054..000000000000
--- a/seq66-destdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 98af1d7e..6e4013d9 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -136,8 +136,10 @@ install-data-local:
- 	cp -r -p $(top_builddir)/data/seq66cli/* $(datafolder)/seq66cli/
- 	cp -r -p $(top_builddir)/data/win/* $(datafolder)/win/
- 	cp -r -p $(top_builddir)/data/wrk/* $(datafolder)/wrk/
--	cp -p $(top_srcdir)/data/share/applications/seq66.desktop $(datadir)/applications/
--	cp -r -p $(top_srcdir)/data/share/icons/* $(datadir)/icons/
-+	mkdir -p $(DESTDIR)$(datadir)/applications
-+	cp -p $(top_srcdir)/data/share/applications/seq66.desktop $(DESTDIR)$(datadir)/applications
-+	mkdir -p $(DESTDIR)$(datadir)/icons
-+	cp -r -p $(top_srcdir)/data/share/icons/* $(DESTDIR)$(datadir)/icons/
- 	@echo "Copying Seq66 documentation to $(docfolder)..."
- 	mkdir -p $(docfolder)
- 	cp -r -p $(top_srcdir)/data/share/doc/*.pdf $(docfolder)
-@@ -154,8 +156,8 @@ install-data-local:
- uninstall-hook:
- 	rm -rf $(datafolder)
- 	rm -rf $(docfolder)
--	rm -f $(datadir)/applications/seq66.desktop
--	find $(datadir)/icons/ -iname "*seq66*.png" -exec rm -f '{}' \;
-+	rm -f $(DESTDIR)$(datadir)/applications/seq66.desktop
-+	find $(DESTDIR)$(datadir)/icons/ -iname "*seq66*.png" -exec rm -f '{}' \;
- 
- #******************************************************************************
- # Makefile.am (seq66/include)