From 0f95f4aeee5385b9cb7cf0bccc96803c9fbf3e4d Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Tue, 17 Apr 2018 23:21:05 +0200
Subject: libre/openttd: rebuilt against updated icu

---
 libre/openttd/PKGBUILD | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'libre/openttd')

diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD
index 4a7177eb4..c03462fb9 100644
--- a/libre/openttd/PKGBUILD
+++ b/libre/openttd/PKGBUILD
@@ -1,32 +1,38 @@
-# $Id: PKGBUILD 184972 2016-08-03 10:06:19Z lcarlier $
+# $Id$
 # Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=openttd
 pkgver=1.7.2
-pkgrel=1.parabola1
-pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation'
-arch=('i686' 'x86_64' 'armv7h')
-url='http://www.openttd.org'
+pkgrel=3
+pkgrel+=.parabola1
+pkgdesc='An engine for running Transport Tycoon Deluxe.'
+pkgdesc+=' (without nonfree openttd-opensfx recommendation)'
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+url='https://www.openttd.org'
 license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
-optdepends=('openttd-opengfx: free graphics') 
-source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
+depends+=('icu>=61' 'icu<62')
+optdepends=('openttd-opengfx: free graphics')
+source=("https://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
 sha256sums=('fe51a0bade8fdf6ce3ec696418ecf75c95783cdcabfd7b204eec5c0bb5d149d4')
 
 build() {
   cd ${pkgname}-${pkgver} 
 
+  # http://site.icu-project.org/download/61#TOC-Migration-Issues
+  CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
  ./configure \
     --prefix-dir=/usr \
     --binary-name=${pkgname} \
     --binary-dir=bin \
     --data-dir=share/${pkgname} \
-    --install-dir=${pkgdir} \
+    --install-dir="${pkgdir}" \
     --doc-dir=share/doc/${pkgname} \
-    --menu-name="OpenTTD" \
-    --personal-dir=.${pkgname}    
+    --menu-name="OpenTTD"
 
   make
 }
-- 
cgit v1.2.2