PKGBUILD: Updating to newest upstream post-3.8.0 version. Until upstream master branchs holds the newest Version tag again, pkgver() will rely on un-annoted tag 3.8.0 (from branch 3.8).

2 files changed, 16 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69c6c54dbda0..687ed0de13fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Dec 21 15:44:32 UTC 2016
+# Thu May 25 12:16:20 UTC 2017
 pkgbase = supercollider-git
 	pkgdesc = An environment and programming language for real time audio synthesis and algorithmic composition.
-	pkgver = 3.8.0.r0.g0947edd
+	pkgver = 3.8.0.r1392.gcd76d209f
 	pkgrel = 1
 	url = http://supercollider.github.io/
 	install = supercollider.install
@@ -25,16 +25,10 @@ pkgbase = supercollider-git
 	depends = qt5-webkit
 	optdepends = emacs: emacs interface
 	optdepends = gedit: gedit interface
-	optdepends = vim: vim interface
-	optdepends = ruby: vim support
-	optdepends = tmux: vim interface
-	optdepends = screen: vim interface
 	provides = supercollider
 	conflicts = supercollider
 	source = supercollider::git+https://github.com/supercollider/supercollider.git
-	source = supercollider-cxxflags.patch
 	md5sums = SKIP
-	md5sums = 4f62489286fe8008d6013fc59047c20b
 
 pkgname = supercollider-git
 
diff --git a/PKGBUILD b/PKGBUILD
index abe7ddf668f0..992283f97d2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-_pkgbranch="3.8"
-pkgver=3.8.0.r0.g0947edd
+_latest_tag="3.8.0"
+pkgver=3.8.0.r1392.gcd76d209f
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -12,29 +12,24 @@ license=('GPL3')
 depends=('jack' 'fftw' 'cwiid' 'qt5-webkit')
 makedepends=('avahi' 'boost' 'cmake' 'emacs' 'libsndfile' 'qt5-tools' 'ruby' 'vim')
 optdepends=('emacs: emacs interface'
-            'gedit: gedit interface'
-            'vim: vim interface'
-            'ruby: vim support'
-            'tmux: vim interface'
-            'screen: vim interface')
+            'gedit: gedit interface')
 conflicts=('supercollider')
 provides=('supercollider')
 install="${_name}.install"
-source=("${_name}::git+https://github.com/supercollider/supercollider.git"
-        "${_name}-cxxflags.patch")
-md5sums=('SKIP'
-         '4f62489286fe8008d6013fc59047c20b')
+source=("${_name}::git+https://github.com/supercollider/supercollider.git")
+md5sums=('SKIP')
 
-prepare() {
-  cd "$_name"
-  git checkout origin/${_pkgbranch}
-  # Fix CXXFLAGS
-  patch -p1 -i ../supercollider-cxxflags.patch
-}
+#prepare() {
+#  cd "$_name"
+#  git checkout origin/${_pkgbranch}
+#  # Fix CXXFLAGS
+#  patch -p1 -i ../supercollider-cxxflags.patch
+#}
 
 pkgver() {
   cd "$_name"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/Version.//g'
+#  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/Version.//g'
+  git describe HEAD | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/Version.3.7.2/'"$_latest_tag"'/g'
 }
 
 build() {
@@ -90,6 +85,7 @@ build() {
     ;;
     *)
     cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+      -DSC_VIM=OFF \
       -DCMAKE_BUILD_TYPE=Release 2>&1 | tee cmake-output.txt
     make 2>&1 | tee make-output.txt
     ;;