[arch-commits] Commit in performous/trunk (PKGBUILD performous-boost-1.70.patch)

[Antonio Rojas]

    Date: Friday, September 13, 2019 @ 12:26:50
  Author: arojas
Revision: 510313

Fix build with pango 1.44 and boost 1.70

Added:
  performous/trunk/performous-boost-1.70.patch
Modified:
  performous/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   13 ++++++++-----
 performous-boost-1.70.patch |   10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-13 12:16:03 UTC (rev 510312)
+++ PKGBUILD	2019-09-13 12:26:50 UTC (rev 510313)
@@ -15,12 +15,14 @@
         boost-1.67.patch
         performous-libswresample.patch
         performous-opencv4.patch
-        performous-boost-1.69.patch)
+        performous-boost-1.69.patch
+        performous-boost-1.70.patch)
 sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1'
             'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1'
             'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde826520000888d6a4c2e888a8bae311f17'
             '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56'
-            '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd')
+            '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd'
+            '7a4a11f0150930ea0527067519487629e714bc732eb111c1d4ca9b13cd8d0775182b22f8a96093223f7aab8524f63bdf901886169e6559adcd5e6b6a9b14edb4')
 
 prepare() {
   cd performous-${pkgver}
@@ -28,6 +30,7 @@
   patch -Np1 -i ../performous-libswresample.patch
   patch -p1 -i ../performous-opencv4.patch # Fix build with openCV 4
   patch -p1 -i ../performous-boost-1.69.patch # Fix build with boost 1.69
+  patch -p1 -i ../performous-boost-1.70.patch # Fix build with boost 1.70
 }
 
 build() {
@@ -36,9 +39,9 @@
   mkdir -p build
   cd build
 
-  cmake -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr ..
-
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I/usr/include/harfbuzz" # Workaround build failure with pango 1.44
   make
 }
 

Added: performous-boost-1.70.patch
===================================================================
--- performous-boost-1.70.patch	                        (rev 0)
+++ performous-boost-1.70.patch	2019-09-13 12:26:50 UTC (rev 510313)
@@ -0,0 +1,10 @@
+--- a/game/svg.cc
++++ b/game/svg.cc
+@@ -4,6 +4,7 @@
+ #include "configuration.hh"
+ #include "../common/image.hh"
+ 
++#include <boost/smart_ptr/shared_ptr.hpp>
+ #include <librsvg/rsvg.h>
+ #include <iostream>
+