Updated to 2.11.1

1 files changed, 45 insertions, 35 deletions

diff --git a/PKGBUILD b/PKGBUILD
index aef98a1..77ce25f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,66 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
-# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>
+# Maintainer (Arch): Carl Smedstad <carsme@archlinux.org>
+# Contributor (Arch): Eric Bélanger <eric@archlinux.org>
 
 # # I maintain this because:
 # Arch version lacks additional optimization and hardening flags
+# Arch version broken with arch-style lto
 
 pkgname=lincity-ng
-pkgver=2.0
-pkgrel=10.2
+pkgver=2.11.1
+pkgrel=1
 pkgdesc="A city simulation game"
 arch=('x86_64')
-url="https://sourceforge.net/projects/lincity-ng.berlios/"
-license=('GPL' 'custom')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'libgl')
-makedepends=('ftjam' 'mesa' 'glu')
+url="https://github.com/lincity-ng/lincity-ng"
+license=(
+  'CC-BY-SA-2.0'
+  'GPL-2.0-or-later'
+  'LicenseRef-ArevFontsCopyright'
+  'LicenseRef-BitstreamVeraFontsCopyright'
+)
+depends=(
+  'gcc-libs'
+  'glibc'
+  'hicolor-icon-theme'
+  'libglvnd'
+  'libxml2'
+  'physfs'
+  'sdl2'
+  'sdl2_gfx'
+  'sdl2_image'
+  'sdl2_mixer'
+  'sdl2_ttf'
+  'zlib'
+)
+makedepends=(
+  'cmake'
+  'libxslt'
+)
 # # For some reason this breaks compiling. "error: C++ compiler cannot create executables"
 # # But old-fashioned raw injection of -flto=auto via export doesn't.
-#options=(lto)
-source=(https://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2)
-b2sums=('39992e6a2ef78e53eea1b0e347c968f6828089b5267e6d62dac7405ea91b182335431b1718ef9892b649b1437751959deb9fa407dfd899fd1dfca55145d059f2')
+options=(!lto)
+source=(https://github.com/lincity-ng/lincity-ng/archive/$pkgname-$pkgver.tar.gz)
+sha256sums=('536eae1bc4f7a7a42ab330f9650d3608ae963e3464177068c4d8a9ce916e9f42')
+b2sums=('a54c38f60be1b4ac0b6cb9f3e082fbab3bba58cb22fc40abb02ce54d5f25705f6620ebf3c470f665fd96b299bf116867b324bdcbb36619bc321f379fc182e240')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgname}-${pkgver}
 
   export CFLAGS="$CFLAGS -O3 -fPIE -flto=auto"
   export CXXFLAGS="$CXXFLAGS -O3 -fPIE -flto=auto"
   export LDFLAGS="$LDFLAGS,-pie"
-
-  # Build fails due to -Werror=format-security
-  export CFLAGS="$(echo $CFLAGS | sed 's/-Werror=format-security/-Wno-error=format-security/')"
-  export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Werror=format-security/-Wno-error=format-security/')"
   
-  ./configure --prefix=/usr
-  jam "${MAKEFLAGS}"
+  cmake -S . -B build \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -Wno-dev
+  cmake --build build
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  # For reasons of black magic, this program compiles a second time during this step.
-  # FLAGS are set again here to ensure optimization and prevent build failure.
-  # Madness.
-
-  export CFLAGS="$CFLAGS -O3 -fPIE -flto=auto"
-  export CXXFLAGS="$CXXFLAGS -O3 -fPIE -flto=auto"
-  export LDFLAGS="$LDFLAGS,-pie"
-
-  # Build fails due to -Werror=format-security
-  export CFLAGS="$(echo $CFLAGS | sed 's/-Werror=format-security/-Wno-error=format-security/')"
-  export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Werror=format-security/-Wno-error=format-security/')"
-
-  jam "${MAKEFLAGS}" -s prefix="${pkgdir}/usr" install
-
-  install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt"
-  install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt"
+  cd ${pkgname}-${pkgname}-${pkgver}
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" COPYING-data.txt
+  install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" COPYING-fonts.txt
 }