Add 'git' and 'pandoc'. Fix "undefined reference" errors. Skip

non-version number tags in pkgver().

2 files changed, 14 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efc93fc37281..7fb55bc62add 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
-# Generated by mksrcinfo v7
-# Tue Oct 20 10:31:20 UTC 2015
+# Generated by mksrcinfo v8
+# Mon Jan  4 11:54:13 UTC 2016
 pkgbase = pmus-git
 	pkgdesc = Practical Music Search is a highly configurable, ncurses-based client for MPD
-	pkgver = 0.42.r298.gd5a51ca
+	pkgver = 0.42.r351.g786cbfd
 	pkgrel = 1
 	url = https://ambientsound.github.io/pms/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = git
+	makedepends = pandoc
 	depends = intltool
 	depends = libmpdclient
 	depends = ncurses
diff --git a/PKGBUILD b/PKGBUILD
index 31984781be08..47be0ed6e04e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=pmus
 pkgname=$_pkgname-git
-pkgver=0.42.r298.gd5a51ca
+pkgver=0.42.r351.g786cbfd
 pkgrel=1
 pkgdesc="Practical Music Search is a highly configurable, ncurses-based client for MPD"
 arch=('i686' 'x86_64')
@@ -14,6 +14,7 @@ license=('GPL')
 #makedepends=('boost')
 #depends=('boost-libs' 'intltool' 'libmpdclient' 'ncurses')
 
+makedepends=('git' 'pandoc')
 depends=('intltool' 'libmpdclient' 'ncurses')
 provides=($_pkgname)
 conflicts=($_pkgname)
@@ -22,7 +23,7 @@ md5sums=(SKIP)
 
 pkgver() {
   cd $pkgname
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags --match "[0-9]*" | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -36,6 +37,12 @@ prepare() {
 
 build() {
   cd $pkgname
+
+  # A fix for "undefined reference" errors: remove -D_FORTIFY_SOURCE=2 and -O2 from build flags
+  CPPFLAGS="$(echo $CPPFLAGS | sed "s|-D_FORTIFY_SOURCE=\w||g")"                   
+  CFLAGS="$(echo $CFLAGS | sed "s|-O\w||g")"
+  CXXFLAGS="$(echo $CXXFLAGS | sed "s|-O\w||g")"
+
   ./rebuild.sh
 }