Updated to new maintained repository.

2 files changed, 25 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4093ff3fe0a9..6614ce9f23fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = barnard-git
 	pkgdesc = A command line mumble client.
-	pkgver = r90.c9876db
-	pkgrel = 3
+	pkgver = r98.c16cc73
+	pkgrel = 1
 	epoch = 1
-	url = https://github.com/bmmcginty/barnard
+	url = https://git.2mb.codes/~cmb/barnard
 	install = barnard-git.install
 	arch = aarch64
 	arch = armv7h
@@ -13,10 +13,7 @@ pkgbase = barnard-git
 	makedepends = go
 	depends = openal
 	depends = opus
-	source = barnard::git+https://github.com/bmmcginty/barnard.git
-	source = https://github.com/bmmcginty/go-openal/pull/1.patch
+	source = barnard::git+https://git.2mb.codes/~cmb/barnard
 	sha512sums = SKIP
-	sha512sums = 8089b15fc08a9b4342babf4391448be6cd989a0a576e703fe0628ace134eb5e154dbd7eddfad237e3350966a3f97c46c93e52bc37afb421f3ecd7dc3e35b00c7
 
 pkgname = barnard-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 632091dcb223..f6a012ea5771 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,23 @@
 # Maintainer: Michael Taboada <michael@2mb.solutions>
                                                                                                                                                                 
 pkgname="barnard-git"
-pkgver=r90.c9876db
-pkgrel=3
+pkgver=r98.c16cc73
+pkgrel=1
 epoch=1
 pkgdesc="A command line mumble client."
 arch=('aarch64' 'armv7h' 'x86_64')
-url="https://github.com/bmmcginty/barnard"
+url="https://git.2mb.codes/~cmb/barnard"
 license=('GPL2')
 depends=('openal' 'opus')
 makedepends=('git' 'go')
-source=("barnard::git+https://github.com/bmmcginty/barnard.git"
-  "https://github.com/bmmcginty/go-openal/pull/1.patch")
+source=("barnard::git+https://git.2mb.codes/~cmb/barnard")
 install="${pkgname}.install"
-sha512sums=('SKIP'
-            '8089b15fc08a9b4342babf4391448be6cd989a0a576e703fe0628ace134eb5e154dbd7eddfad237e3350966a3f97c46c93e52bc37afb421f3ecd7dc3e35b00c7')
+sha512sums=('SKIP')
 
-  prepare(){
-      mkdir -p gopath/src/github.com/bmmcginty
-        ln -rTsf barnard gopath/src/github.com/bmmcginty/barnard
-    export GOPATH="${srcdir}/gopath"
-  cd gopath/src/github.com/bmmcginty/barnard
-    GO111MODULE=auto go get -v -d
-    pushd "$srcdir/gopath/src/github.com/bmmcginty/go-openal"
-    patch -p1 -i "$srcdir/1.patch"
-    popd
-              }
+prepare(){
+  cd "${pkgname%-git}"
+  mkdir -p build/
+}
 
 pkgver() {
     cd "${srcdir}/barnard"
@@ -34,25 +26,21 @@ pkgver() {
 }
 
 build() {
-  export GOPATH="${srcdir}/gopath"
-  cd "${srcdir}/gopath/src/github.com/bmmcginty/barnard"
-  GO111MODULE=auto go install \
-    -gcflags "all=-trimpath=$GOPATH" \
-    -asmflags "all=-trimpath=$GOPATH" \
-    -ldflags "-extldflags $LDFLAGS" -v
+  cd "${pkgname%-git}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  go build -o build
 }
                                                                                                                                                                 
 package() {
-  mkdir -p "$pkgdir/usr/bin"
-  mkdir -p "$pkgdir/usr/share/barnard"
-  mkdir -p "$pkgdir/usr/share/doc/barnard"
-  install -p -m755 "$srcdir/gopath/bin/barnard" "$pkgdir/usr/bin"
-  install -p -m755 "$srcdir/barnard/barnard-ui" "$pkgdir/usr/bin"
-  install -p -m755 "$srcdir/barnard/extras/barnard-sound.sh" "$pkgdir/usr/share/barnard/barnard-sound.sh"
-  install -p -m644 "$srcdir/barnard/README.md" "$pkgdir/usr/share/doc/barnard"
-                                                                                                                                                                
-  #mkdir -p "$pkgdir/$GOPATH"
-  #cp -Rv --preserve=timestamps "$srcdir/"{src,pkg} "$pkgdir/$GOPATH"
+  cd "${pkgname%-git}"
+  install -Dm755 build/barnard "$pkgdir"/usr/bin/barnard
+  install -m755 "$srcdir/barnard/barnard-ui" "$pkgdir/usr/bin"
+  install -Dm755 "$srcdir/barnard/extras/barnard-sound.sh" "$pkgdir/usr/share/barnard/barnard-sound.sh"
+  install -Dm644 "$srcdir/barnard/README.md" "$pkgdir/usr/share/doc/barnard"
 }
                                                                                                                                                                 
 # vim:set ts=2 sw=2 et: