Rebuild for icu 68.2

2 files changed, 25 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0f28523..3f960b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 pkgname=0ad
 pkgver=a23.1
 _pkgver=0.0.23b-alpha
-pkgrel=13
+pkgrel=14
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('x86_64')
 url="https://play0ad.com/"
@@ -19,10 +19,12 @@ depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
          'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
 source=(https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz
+icu68.patch
         zen2-workaround.patch
         missing-includes.patch
         0ad-fcollada.patch)
 b2sums=('db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1'
+        'e70955d4528184cb5f07fa90916a9caf7e7705a1f8587af5888895548c0115dd9e4e49eaeea6a8e152452b7d52077641a17d8d774e3b6f4c0c1dd9676b547358'
         'c3569351f855c2e528add0789261bfc4bc41a248af885db65b828027294932dd4ab20ef42f29a86401adaabc3c55809ed2e1c89c268719554444b5f73f56e0d8'
         '0ec294936fbe185fc172d39813b2d11ea2c1958b022155fb43809731378bb6b8294ccb4648432f6a9cc9e615ecda9a414f01a6cce258c7ea49306f4fd6fc49c3'
         '57b5cbb747669419586d9adb8b39f5678448c1c5c6df028f552256399a9a3f5b0fff61173a9dbe5d51274cc44399db23ce09a3d8797104a4f9b4d6faf00b12e4')
@@ -30,7 +32,8 @@ b2sums=('db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
   sed -i "s/env python/env python2/g" libraries/source/cxxtest-4.4/bin/cxxtestgen
-
+  
+  patch -Np0 -i "$srcdir"/icu68.patch
   patch -Np0 -i "$srcdir"/zen2-workaround.patch
   patch -Np1 -i "$srcdir"/missing-includes.patch
 
@@ -47,11 +50,11 @@ build() {
   CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
   
   # 0ad is prone to OOM, use 1 thread per 8GB ram
-  export MAKEFLAGS="-j4"
+  export MAKEFLAGS="-j8"
 
   # -fPIE and -pie break compilation
-  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4 -fPIC"
-  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4 -fPIC"
+  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=8 -fPIC"
+  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=8 -fPIC"
 
   export SDL2_CONFIG="pkg-config sdl2"
   export WX_CONFIG="wx-config-gtk3"
diff --git a/icu68.patch b/icu68.patch
new file mode 100644
index 0000000..5e9199d
--- /dev/null
+++ b/icu68.patch
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+../../../source/i18n/L10n.cpp:208:82: error: use of undeclared identifier 'TRUE'
+                currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE;
+                                                                                               ^
+
+--- source/i18n/L10n.cpp.orig	2018-04-10 18:13:32 UTC
++++ source/i18n/L10n.cpp
+@@ -205,7 +205,7 @@ void L10n::ReevaluateCurrentLocaleAndReload()
+ 	else
+ 	{
+ 		GetDictionaryLocale(locale, currentLocale);
+-		currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE;
++		currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == true;
+ 		useLongStrings = false;
+ 	}
+ 	LoadDictionaryForCurrentLocale();