PKGBUILD: Removing the GCC <5.3 patch for linkage breaking. Making master the default branch for this package again.

2 files changed, 5 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 314ca100584a..7b62f8f812c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jan 31 21:09:49 UTC 2016
+# Fri May  6 18:16:51 UTC 2016
 pkgbase = supercollider-git
 	pkgdesc = An environment and programming language for real time audio synthesis and algorithmic composition.
-	pkgver = 3.7.0.beta1.r14.gdabcb9a
+	pkgver = 3.7.1.r280.g3cdfdfc
 	pkgrel = 1
 	url = http://supercollider.sourceforge.net/
 	install = supercollider.install
@@ -36,7 +36,7 @@ pkgbase = supercollider-git
 	optdepends = screen: vim interface
 	provides = supercollider
 	conflicts = supercollider
-	source = supercollider::git+https://github.com/supercollider/supercollider.git#branch=3.7
+	source = supercollider::git+https://github.com/supercollider/supercollider.git
 	source = libatomic.patch
 	md5sums = SKIP
 	md5sums = 2956e6172cafcc9a38bdfdd2bc33e87b
diff --git a/PKGBUILD b/PKGBUILD
index f629553ab8f8..116cb2b371af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-pkgver=3.7.0.beta1.r14.gdabcb9a
+pkgver=3.7.1.r280.g3cdfdfc
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition."
 url="http://supercollider.sourceforge.net/"
@@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface'
             'screen: vim interface')
 conflicts=('supercollider')
 provides=('supercollider')
-source=("${_name}::git+https://github.com/supercollider/supercollider.git#branch=3.7"
+source=("${_name}::git+https://github.com/supercollider/supercollider.git"
         "libatomic.patch")
 md5sums=('SKIP'
          '2956e6172cafcc9a38bdfdd2bc33e87b')
@@ -29,13 +29,6 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/Version.//g'
 }
 
-prepare() {
-  cd $srcdir/$_name
-  msg "Applying patch for fixing linking failure with GCC > 5.1"
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65913
-  patch -Np1 -i ../libatomic.patch
-}
-
 build() {
   cd $srcdir/$_name
   git submodule update --init --recursive .