Date: Tuesday, January 15, 2019 @ 16:53:20 Author: eworm Revision: 423353
fix bool for boost 1.69.0 Added: glob2/trunk/glob2-bool.patch Modified: glob2/trunk/PKGBUILD ------------------+ PKGBUILD | 7 +++++-- glob2-bool.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-15 16:24:34 UTC (rev 423352) +++ PKGBUILD 2019-01-15 16:53:20 UTC (rev 423353) @@ -16,12 +16,14 @@ source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/" - glob2-scons3.patch) + glob2-scons3.patch + glob2-bool.patch) sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a' '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba' '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20' - '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc') + '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc' + '81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591') prepare() { cd "$pkgname-$pkgver" @@ -30,6 +32,7 @@ patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff" patch -p1 -i "$srcdir/glob2-gcc6.patch" patch -p1 -i "$srcdir/glob2-scons3.patch" + patch -p1 -i "$srcdir/glob2-bool.patch" } build() { Added: glob2-bool.patch =================================================================== --- glob2-bool.patch (rev 0) +++ glob2-bool.patch 2019-01-15 16:53:20 UTC (rev 423353) @@ -0,0 +1,13 @@ +diff --git a/src/AIEcho.cpp b/src/AIEcho.cpp +index 77d9f63..0e5f59e 100644 +--- a/src/AIEcho.cpp ++++ b/src/AIEcho.cpp +@@ -4387,7 +4387,7 @@ bool enemy_building_iterator::operator!=(const enemy_building_iterator& rhs) con + { + if(is_end && rhs.is_end) + return false; +- return is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site; ++ return bool {is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site}; + } + +