[arch-commits] Commit in poedit/trunk (PKGBUILD icu59.patch)

[Evangelos Foutras]

    Date: Wednesday, April 26, 2017 @ 08:04:21
  Author: foutrelis
Revision: 225448

Fix build with ICU 59

Added:
  poedit/trunk/icu59.patch
Modified:
  poedit/trunk/PKGBUILD

-------------+
 PKGBUILD    |   13 ++++++++++---
 icu59.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 08:02:44 UTC (rev 225447)
+++ PKGBUILD	2017-04-26 08:04:21 UTC (rev 225448)
@@ -16,13 +16,20 @@
 # poedit-2.0: https://github.com/vslavik/poedit/issues/366
 depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell')
 makedepends=('boost' 'libsm')
-source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-${pkgver}.tar.gz)
-sha256sums=('8766874175b2221ef670d89b32f0fe900cde3e27e5dcb2c1b6cf6d01e8d56ff3')
+source=(https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-${pkgver}.tar.gz
+        icu59.patch)
+sha256sums=('8766874175b2221ef670d89b32f0fe900cde3e27e5dcb2c1b6cf6d01e8d56ff3'
+            '4d2fcbc1ce5a8d8bab878687337c1f038ed1a83b37652e0a41d7f5c2b26b27bc')
 
+prepare() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    patch -Np1 -i ../icu59.patch
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr --libexecdir=/usr/lib/poedit
-    make
+    make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
 }
 
 package() {

Added: icu59.patch
===================================================================
--- icu59.patch	                        (rev 0)
+++ icu59.patch	2017-04-26 08:04:21 UTC (rev 225448)
@@ -0,0 +1,11 @@
+diff -upr poedit-2.0.1.orig/src/unicode_helpers.cpp poedit-2.0.1/src/unicode_helpers.cpp
+--- poedit-2.0.1.orig/src/unicode_helpers.cpp	2017-04-26 10:55:31.807183266 +0300
++++ poedit-2.0.1/src/unicode_helpers.cpp	2017-04-26 11:02:47.373899526 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include "unicode_helpers.h"
+ 
++#include <unicode/unistr.h>
+ #include "str_helpers.h"
+ 
+ #include <unicode/ubidi.h>