[arch-commits] Commit in 0ad/trunk (PKGBUILD icu68.patch)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 10:32:43
  Author: foutrelis
Revision: 779928

Fix build with ICU 68 (patch from FreeBSD)

Added:
  0ad/trunk/icu68.patch
Modified:
  0ad/trunk/PKGBUILD

-------------+
 PKGBUILD    |    3 +++
 icu68.patch |   17 +++++++++++++++++
 2 files changed, 20 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 10:25:21 UTC (rev 779927)
+++ PKGBUILD	2020-12-19 10:32:43 UTC (rev 779928)
@@ -14,10 +14,12 @@
          '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)
 sha512sums=('82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135'
+            'f45626e6da1415e7012d9533afe2a936bc015df85fd76b0db279f4a176baf2334557b5402e9e4969d84341a1ca6f72c6168acc709f1c0be1b165e6d58462bf78'
             '1aaab2a71b363b0acbb6beb724bbb4c4b3a8fc607c7958f65e9653e29dedfc502f84262955d1b5ba5dc54b2c97a3882809967e74dfd3de54ae09ee6b08816a90'
             '4cd709847f50de291a7eb5f2049e06f6725799a793d845ac40b1ffdd8f3674d426736dc7ea226dc9f261e8edc3c68972edc704f4aa42b05ed37f6866b5680ddd'
             '06b0641698c89bb0331f5af0254f0e224877580e196fc030bbe37140926c93d5392512f129dfd5922fcc588a28cad1832e94f36a523027678880b5b0522cff34')
@@ -26,6 +28,7 @@
   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
 

Added: icu68.patch
===================================================================
--- icu68.patch	                        (rev 0)
+++ icu68.patch	2020-12-19 10:32:43 UTC (rev 779928)
@@ -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();