fixed for icu 64

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66f5c71ca95a..f8d075f18865 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
-# Generated by mksrcinfo v8
-# Mon Dec 25 12:23:56 UTC 2017
 pkgbase = wxmedit
 	pkgdesc = Cross-platform Text/Hex Editor, a fork of MadEdit with bug fixes and improvements
 	pkgver = 3.1_FIX1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wxmedit.github.io/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = boost
+	depends = curl
 	depends = wxgtk
-	depends = icu
-	depends = desktop-file-utils
 	source = https://github.com/hltj/wxMEdit/archive/3.1_FIX1.tar.gz
 	sha256sums = 51dd81ddd44c83017d2e54f8b0a11a50e56075e8edc01d738865478fdddd8017
 
diff --git a/PKGBUILD b/PKGBUILD
index a92c48a28fd3..0c2a43340e33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=wxmedit
 pkgver=3.1_FIX1
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform Text/Hex Editor, a fork of MadEdit with bug fixes and improvements"
 arch=("i686" "x86_64")
 url="https://wxmedit.github.io/"
 license=('GPL')
-depends=('wxgtk' 'icu' 'desktop-file-utils')
+depends=('curl' 'wxgtk')
 makedepends=('boost')
 source=("https://github.com/hltj/wxMEdit/archive/$pkgver.tar.gz")
 sha256sums=('51dd81ddd44c83017d2e54f8b0a11a50e56075e8edc01d738865478fdddd8017')
@@ -19,6 +19,10 @@ build() {
   sed 's|boost/tr1/unordered_set.hpp|boost/unordered_set.hpp|g' -i `grep 'boost/tr1/unordered_set.hpp' . -rIl`
   sed 's|boost/tr1/unordered_map.hpp|boost/unordered_map.hpp|g' -i `grep 'boost/tr1/unordered_map.hpp' . -rIl`
   sed 's/std::tr1/boost/g' -i `grep 'std::tr1::' . -rIl`
+  sed 's/UnicodeString/icu::UnicodeString/g' -i `grep 'UnicodeString' . -rIl`
+  sed 's/BreakIterator/icu::BreakIterator/g' -i `grep 'BreakIterator' . -rIl`
+  sed 's/LocalUCharsetDetectorPointer/icu::LocalUCharsetDetectorPointer/g' -i `grep 'LocalUCharsetDetectorPointer' . -rIl`
+  sed 's/Locale/icu::Locale/g' -i src/wxmedit/wxm_lines.cpp src/wxmedit/wxmedit.cpp
 
   ./configure --prefix=/usr --with-wx-config=/usr/bin/wx-config
   make