adopt and fix

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f21d78199c5f..4e75cd575674 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = galapix
 	pkgdesc = A zoomable image viewer for large collections of images
 	pkgver = 0.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Galapix/galapix
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = galapix
 	makedepends = gtkglextmm
 	makedepends = libglademm
 	makedepends = boost
+	makedepends = gcc7
 	depends = curl
 	depends = glew
 	depends = imagemagick
diff --git a/PKGBUILD b/PKGBUILD
index fca1d063cc93..d62ee9a126fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=galapix
 pkgver=0.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A zoomable image viewer for large collections of images"
 arch=('i686' 'x86_64')
 url="https://github.com/Galapix/galapix"
 license=('GPL3')
 depends=('curl' 'glew' 'imagemagick' 'libexif' 'libjpeg' 'libpng' 'mesa' 'sdl' 'sqlite3')
-makedepends=('scons' 'patch' 'gtkglextmm' 'libglademm' 'boost')
+makedepends=('scons' 'patch' 'gtkglextmm' 'libglademm' 'boost' 'gcc7')
 optdepends=('xcftools: XCF format support'
             'gimp-ufraw: RAW format support')
 source=($pkgname-$pkgver.tar.gz::https://github.com/Galapix/galapix/archive/v$pkgver.tar.gz
@@ -18,17 +18,18 @@ md5sums=('7a7df7812a0c45e12273ace0c7c4ed48'
          '34f0386d3247edc62e3ff4e55892d286')
 
 prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   patch -Np0 -i "${srcdir}"/imagemagick_plugin.patch
   patch -Np0 -i "${srcdir}"/png_string_fix.patch
+  sed -ie '1 i#include <functional>' src/galapix/tile_provider.hpp
 }
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  scons
+  cd $pkgname-$pkgver
+  scons CXX=g++-7
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   install -Dm755 build/$pkgname.sdl "${pkgdir}"/usr/bin/$pkgname
 }