Switched source repo to OpenBoardView, moved binary and bvconv to /usr/bin, added GTK3 dependency to fix open file dialog being unavailable

2 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d0c3dc99214..663fd8580fba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openboardview-git
 	pkgdesc = Linux SDL/ImGui edition software for viewing .brd files
-	pkgver = R5
+	pkgver = r532.9fc1822
 	pkgrel = 1
 	url = http://openboardview.org/
 	arch = i686
@@ -17,7 +17,8 @@ pkgbase = openboardview-git
 	depends = sdl2
 	depends = fontconfig
 	depends = sqlite
-	source = openboardview-git::git+https://github.com/inflex/OpenBoardView.git#tag=R5
+	depends = gtk3
+	source = openboardview-git::git+https://github.com/OpenBoardView/OpenBoardView.git#branch=master
 	sha512sums = SKIP
 
 pkgname = openboardview-git
diff --git a/PKGBUILD b/PKGBUILD
index b5cc31db4d88..1fcf3c8c582e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,22 @@
 _pkgname=openboardview
 __pkgname=OpenBoardView
 pkgname=${_pkgname}-git
-pkgver=R7.2
+pkgver=r532.9fc1822
 pkgrel=1
 pkgdesc="Linux SDL/ImGui edition software for viewing .brd files"
 arch=('i686' 'x86_64')
 url="http://openboardview.org/"
 license=('MIT')
-depends=('sdl2' 'fontconfig' 'sqlite')
+depends=('sdl2' 'fontconfig' 'sqlite' 'gtk3')
 makedepends=('git' 'cmake' 'sdl2' 'zlib' 'gtk3' 'fontconfig' 'sqlite' 'libpng')
-source=("${pkgname}::git+https://github.com/inflex/${__pkgname}.git#tag=${pkgver}")
+source=("${pkgname}::git+https://github.com/${__pkgname}/${__pkgname}.git#branch=master")
 sha512sums=('SKIP')
 
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 build() {
   cd "${srcdir}/${pkgname}"
   git submodule update --init --recursive
@@ -22,12 +27,12 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}"
-  mkdir -p "${pkgdir}/opt/${_pkgname}/"
-  cp -dr --no-preserve=ownership {bin,utilities} "${pkgdir}/opt/${_pkgname}/"
+  mkdir -p "${pkgdir}"/usr/bin
+  install -D -m755 bin/${_pkgname} "${pkgdir}/usr/bin/${_pkgname}"
+  install -D -m755 utilities/bvconv.sh "${pkgdir}/usr/bin/bvconv"
 
+  mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  mkdir -p "${pkgdir}"/usr/bin
-  ln -s /opt/openboardview/bin/openboardview "${pkgdir}"/usr/bin/openboardview
 }
 
 # vim:set ts=2 sw=2 et: