[arch-commits] Commit in widelands/trunk (PKGBUILD widelands-gcc7.patch)

[Antonio Rojas]

    Date: Sunday, May 21, 2017 @ 17:35:50
  Author: arojas
Revision: 228927

boost 1.64 rebuild

Added:
  widelands/trunk/widelands-gcc7.patch
Modified:
  widelands/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   15 +++++++++++----
 widelands-gcc7.patch |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-21 15:29:12 UTC (rev 228926)
+++ PKGBUILD	2017-05-21 17:35:50 UTC (rev 228927)
@@ -6,7 +6,7 @@
 pkgname=widelands
 pkgver=19
 _realver=build${pkgver}
-pkgrel=5
+pkgrel=6
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64')
 url="http://widelands.org/"
@@ -16,11 +16,18 @@
 replaces=('widelands-data')
 source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
         $pkgname.desktop
-        $pkgname.png)
+        $pkgname.png
+        widelands-gcc7.patch)
 sha512sums=('80d70542f30c47498c38c5066ecbfa094cfa16fa3c8c75a950420b334cc019766a90a9f715d326506ce425848da1d75fa6f87e33e3551019c0dd8a4ccf99d666'
             'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727'
-            'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac')
+            'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac'
+            'a60c6f0309579b167664cf0c1022e6c293dad328c2698793d3bc63e880bc3933db8c708494502e898016443d4ec0deac7bd4f80d201dc681098d8197af98193d')
 
+prepare() {
+    # Fix build with GCC 7 - don't turn warnings to errors
+    patch -p0 -i widelands-gcc7.patch
+}
+
 build() {
     cd $srcdir/$pkgname-$_realver-src
 
@@ -31,7 +38,7 @@
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DWL_INSTALL_BASEDIR=/usr \
         -DWL_INSTALL_DATADIR=/usr/share/widelands
-    make
+    make VERBOSE=1
 }
 
 package() {

Added: widelands-gcc7.patch
===================================================================
--- widelands-gcc7.patch	                        (rev 0)
+++ widelands-gcc7.patch	2017-05-21 17:35:50 UTC (rev 228927)
@@ -0,0 +1,15 @@
+--- widelands-build19-src/CMakeLists.txt.orig	2017-05-21 16:53:12.517380329 +0000
++++ widelands-build19-src/CMakeLists.txt	2017-05-21 16:53:23.590697586 +0000
+@@ -176,12 +176,6 @@
+   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused-macros")
+ endif()
+ 
+-# Turn some warnings into errors.
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
+-
+ IF (WIN32)
+   add_definitions(-DMINGW_HAS_SECURE_API)
+   if (CMAKE_SIZEOF_VOID_P EQUAL 4)