summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoroi_wtf2016-05-13 22:40:55 +0200
committeroi_wtf2016-05-13 22:41:25 +0200
commitfe10896c6892f41fc3dde6c3d3502d40e4c57e6c (patch)
tree2339968288684602d36ebc5da60b1f3089f9cbef
parent5815ce3ad600700d25ae1b23d41391a493f36868 (diff)
downloadaur-fe10896c6892f41fc3dde6c3d3502d40e4c57e6c.tar.gz
fixes for GCC 6.x
-rw-r--r--.SRCINFO4
-rw-r--r--0006-fix-std-pow.patch10
-rw-r--r--PKGBUILD3
3 files changed, 16 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4adaa19049b5..6b250a35fdb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Mar 21 21:31:51 UTC 2016
+# Fri May 13 20:38:42 UTC 2016
pkgbase = dosbox-daum
pkgdesc = Emulator with builtin DOS for running DOS Games (Daum version)
pkgver = 20150125
@@ -30,6 +30,7 @@ pkgbase = dosbox-daum
source = 0003-intel-tbb-needs-new-cpp-std-and-ld-lookup.patch
source = 0004-fix-64bit-pointersize.patch
source = 0005-fix-MIN.patch
+ source = 0006-fix-std-pow.patch
source = dosbox.png
sha256sums = 061336cd3971e37fa0d342c6644e19776a2ddfc20d8f197abca1f8ee27dabea6
sha256sums = cbe78dab758c5ece5616b2456178fe3ebe1429e9796b4088902c6c0856475bf6
@@ -37,6 +38,7 @@ pkgbase = dosbox-daum
sha256sums = c42273cfe631b44a909ed5f444374244d801859a211d53ee842801336c1d4fb0
sha256sums = 8125c7fb2f1428e25f4d50a48df16bb5b692286216bfe5a8ef463d15cef25831
sha256sums = 224bb0b5b45941baae9ad02cb4da7eef5186d4a05ead4e4b70d4e6b371f73c85
+ sha256sums = b9165a8f814977ba26938214927c42073d5fcc5d226c1005d525c0eed43d7d32
sha256sums = 491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b
pkgname = dosbox-daum
diff --git a/0006-fix-std-pow.patch b/0006-fix-std-pow.patch
new file mode 100644
index 000000000000..fb866e9dd815
--- /dev/null
+++ b/0006-fix-std-pow.patch
@@ -0,0 +1,10 @@
+--- src/src/gui/xBRZ/xbrz.cpp.orig 2016-05-13 22:35:12.534869565 +0200
++++ src/src/gui/xBRZ/xbrz.cpp 2016-05-13 22:34:35.558177931 +0200
+@@ -15,6 +15,7 @@
+
+ #include "xbrz.h"
+ #include <cassert>
++#include <cmath>
+ #include <algorithm>
+ #include <vector>
+
diff --git a/PKGBUILD b/PKGBUILD
index e9818820274d..196c76be4806 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,6 +20,7 @@ source=("source-${pkgver}.7z::http://ykhwong.x-y.net/downloads/dosbox/patch/sour
'0003-intel-tbb-needs-new-cpp-std-and-ld-lookup.patch'
'0004-fix-64bit-pointersize.patch'
'0005-fix-MIN.patch'
+ '0006-fix-std-pow.patch'
'dosbox.png')
sha256sums=('061336cd3971e37fa0d342c6644e19776a2ddfc20d8f197abca1f8ee27dabea6'
'cbe78dab758c5ece5616b2456178fe3ebe1429e9796b4088902c6c0856475bf6'
@@ -27,6 +28,7 @@ sha256sums=('061336cd3971e37fa0d342c6644e19776a2ddfc20d8f197abca1f8ee27dabea6'
'c42273cfe631b44a909ed5f444374244d801859a211d53ee842801336c1d4fb0'
'8125c7fb2f1428e25f4d50a48df16bb5b692286216bfe5a8ef463d15cef25831'
'224bb0b5b45941baae9ad02cb4da7eef5186d4a05ead4e4b70d4e6b371f73c85'
+ 'b9165a8f814977ba26938214927c42073d5fcc5d226c1005d525c0eed43d7d32'
'491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b')
prepare(){
@@ -46,6 +48,7 @@ prepare(){
fi
patch -p0 -i "$srcdir"/0005-fix-MIN.patch
+ patch -p1 -i "$srcdir"/0006-fix-std-pow.patch
gendesk -f --pkgname "dosbox" --pkgdesc "$pkgdesc"