apply floft's patches

- build on latest gcc
- fix download url
- patch to fix typo from upstream

3 files changed, 20 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9deb5f3cebc1..addcf0abbb34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,16 +8,18 @@ pkgbase = crrcsim
 	license = GPL
 	makedepends = gawk
 	makedepends = plib>=1.8.4
-	makedepends = gcc5
+	makedepends = gcc
 	depends = sdl>=1.2.5
 	depends = portaudio
 	depends = libjpeg
 	depends = cgal
 	source = crrcsim.desktop
 	source = crrcsim.png
+	source = fix_bug.patch
 	source = http://sourceforge.net/projects/crrcsim/files/crrcsim/crrcsim-0.9.13/crrcsim-0.9.13.tar.gz
 	sha256sums = 2af239b7dc1d74967b1ec86665c7a7c28c9564306d7d299533235eacb8bf02de
 	sha256sums = 37d71a1be23afea19ad41179223eda997a3af103e2b2879784fd352de70a5696
+	sha256sums = 94b5d965327ca2d2db808aa088e6dba8ec204443843d71317d94d6e6e2b8c679
 	sha256sums = abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698
 
 pkgname = crrcsim
diff --git a/PKGBUILD b/PKGBUILD
index 3e1752cb7653..6a247e4fa673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,24 +10,21 @@ arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/crrcsim/"
 license=('GPL')
 depends=('sdl>=1.2.5' 'portaudio' 'libjpeg' 'cgal')
-makedepends=('gawk' 'plib>=1.8.4' 'gcc5')
+makedepends=('gawk' 'plib>=1.8.4' 'gcc')
 source=("${pkgname}.desktop"
         "${pkgname}.png"
+        "fix_bug.patch"
         "http://sourceforge.net/projects/crrcsim/files/crrcsim/crrcsim-${pkgver}/crrcsim-${pkgver}.tar.gz")
 sha256sums=('2af239b7dc1d74967b1ec86665c7a7c28c9564306d7d299533235eacb8bf02de'
             '37d71a1be23afea19ad41179223eda997a3af103e2b2879784fd352de70a5696'
+            '94b5d965327ca2d2db808aa088e6dba8ec204443843d71317d94d6e6e2b8c679'
             'abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698')
 
-prepare() {
-  mkdir -p "${srcdir}/gcc-bin-override"
-  ln -sf "/usr/bin/gcc-5" "${srcdir}/gcc-bin-override/gcc"
-  ln -sf "/usr/bin/g++-5" "${srcdir}/gcc-bin-override/g++"
-  export PATH="${srcdir}/gcc-bin-override:${PATH}"
-}
-
 build() {
   cd "${pkgname}-${pkgver}"
   sed -i "s/-lCGAL/\"-lCGAL -lgmp\"/g" ./configure.ac
+  sed -i "s/boost_thread-mt/boost_thread/g" ./configure.ac
+  patch -p1 -i "$srcdir/fix_bug.patch"
   ./autogen.sh
   ./configure --prefix=/usr
   make
diff --git a/fix_bug.patch b/fix_bug.patch
new file mode 100644
index 000000000000..b8eadeece910
--- /dev/null
+++ b/fix_bug.patch
@@ -0,0 +1,12 @@
+diff -ru crrcsim-0.9.13.old/src/mod_video/crrc_animation.cpp crrcsim-0.9.13/src/mod_video/crrc_animation.cpp
+--- crrcsim-0.9.13.old/src/mod_video/crrc_animation.cpp	2016-04-10 09:57:14.000000000 -0700
++++ crrcsim-0.9.13/src/mod_video/crrc_animation.cpp	2018-10-30 16:13:09.055770007 -0700
+@@ -84,7 +84,7 @@
+       else
+       {
+         std::cerr << "createAnimation: unknown animation type \'"
+-                  << type << "\'" << std::cerr;
++                  << type << "\'" << std::endl;
+       }
+       
+       if (anim != NULL)