require gcc5 as gcc 6 and beyond do not work with older xulrunners

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a04176e4e83..1375be19352d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 05:12:05 UTC 2016
+# Thu Jun 16 23:31:03 UTC 2016
 pkgbase = nightingale-git
 	pkgdesc = No binaries used. Open source fork of the Songbird Media Player with updates and fixes.
 	pkgver = 78bd501
@@ -23,6 +23,7 @@ pkgbase = nightingale-git
 	makedepends = libgnomeui
 	makedepends = python2
 	makedepends = autoconf2.13
+	makedepends = gcc5
 	depends = gst-plugins-bad
 	depends = gst-plugins-base
 	depends = gst-plugins-base-libs
diff --git a/PKGBUILD b/PKGBUILD
index 67b6d69b4f29..ad76d4648450 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="No binaries used. Open source fork of the Songbird Media Player with up
 arch=('i686' 'x86_64')
 url="http://getnightingale.com/"
 license=('GPL2' 'MPL' 'BSD')
-makedepends=('git' 'subversion' 'python' 'unzip' 'libidl2' 'zip' 'glib2' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'autoconf2.13')
+makedepends=('git' 'subversion' 'python' 'unzip' 'libidl2' 'zip' 'glib2' 'pkg-config' 'diffutils' 'libgnomeui' 'python2' 'autoconf2.13' 'gcc5')
 depends=('gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-base-libs' 'gst-plugins-good' 'gstreamer' 'gtk2' 'libxt' 'sqlite3' 'taglib'
 'gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libnotify>=0.4'
 )
@@ -50,6 +50,9 @@ build() {
 		export SB_VENDOR_BUILD_ROOT=${srcdir}
 		export CXXFLAGS="$CXXFLAGS -fpermissive"
 
+		export CC=gcc-5
+		export CXX=g++-5
+
 		# fix mozilla freetype headers
 		#sed -i 's/freetype\///g' xulrunner-1.9.2/mozilla/config/system-headers
 		#sed -i 's/freetype\///g' xulrunner-1.9.2/mozilla/gfx/thebes/src/gfxPangoFonts.cpp