Add patch to fix -Werror=format_security error

I have also added the CC-BY-SA 3.0 and CC0 licenses because they apply
to some assets.

1 files changed, 17 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6bbcfb4a125a..e970703806dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=wyrmsun
 pkgver=5.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Real-time strategy game based on history, mythology and fiction"
 arch=('i686' 'x86_64')
-url="http://andrettin.github.io/"
-license=('GPL2')
+url="https://andrettin.github.io/"
+license=('GPL2' 'CCPL:by-sa' 'custom:CC0')
 depends=('hicolor-icon-theme'
          'qt5-graphicaleffects'
          'qt5-location'
@@ -19,9 +19,18 @@ depends=('hicolor-icon-theme'
          'tolua++')
 makedepends=('boost' 'cmake' 'glu')
 source=("wyrmsun-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmsun/archive/v${pkgver}.tar.gz"
-        "wyrmgus-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v${pkgver}.tar.gz")
+        "wyrmgus-${pkgver}.tar.gz::https://github.com/Andrettin/Wyrmgus/archive/v${pkgver}.tar.gz"
+        'werror_format_security.patch')
 md5sums=('f519b26169499e52517196b24813d2ac'
-         '73b2e1bf4e29c0663af23d025c104f7c')
+         '73b2e1bf4e29c0663af23d025c104f7c'
+         '426efa2e8ee8b3ab46736d634599963c')
+
+prepare() {
+  cd "${srcdir}/Wyrmgus-${pkgver}"
+  # This patch fixes the compilation error with the -Werror=format_security flag
+  # until a new version is released.
+  patch src/player/player.cpp "${srcdir}/werror_format_security.patch"
+}
 
 build() {
   cd "${srcdir}/Wyrmgus-${pkgver}"
@@ -29,8 +38,8 @@ build() {
     -DCMAKE_BUILD_TYPE=None \
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DWITH_GEOJSON=OFF \
-    -DCMAKE_C_FLAGS="$CFLAGS -Wno-error=format-security -DNDEBUG" \
-    -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=format-security -DNDEBUG" \
+    -DCMAKE_C_FLAGS="$CFLAGS -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS -DNDEBUG" \
     -Wno-dev
   cmake --build . --target wyrmgus_main
 
@@ -56,4 +65,5 @@ package() {
 
   cd "${srcdir}/Wyrmsun-${pkgver}"
   cmake --install . --prefix "${pkgdir}/usr/"
+  install -Dm644 cc0.txt "${pkgdir}/usr/share/licenses/${pkgname}/cc0.txt"
 }