update

3 files changed, 30 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10026b6ab7c8..d933130c769b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Apr 16 12:40:06 UTC 2016
 pkgbase = wxmedit-git
 	pkgdesc = Cross-platform Text/Hex Editor, a fork of MadEdit with bug fixes and improvements
-	pkgver = dee626e
+	pkgver = r1282.a6d6fce
 	pkgrel = 1
 	url = https://wxmedit.github.io/
 	install = wxmedit.install
@@ -16,10 +18,10 @@ pkgbase = wxmedit-git
 	depends = desktop-file-utils
 	depends = boost
 	conflicts = wxmedit
-	source = wxmedit-git::git+https://github.com/hltj/wxMEdit
+	source = wxmedit-git::git://github.com/hltj/wxMEdit.git
 	source = wxmedit-encdet-mozilla.patch
 	md5sums = SKIP
-	md5sums = 46277ca991dc2d7bf227bb6628561f4e
+	md5sums = 357585e05be0a807e4416d31e76df17c
 
 pkgname = wxmedit-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b69dae52633..cccc3ac7f97b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Yunhui Fu <yhfudev at gmail dot com>
 
 pkgname=wxmedit-git
-pkgver=dee626e
+pkgver=r1282.a6d6fce
 pkgrel=1
 pkgdesc="Cross-platform Text/Hex Editor, a fork of MadEdit with bug fixes and improvements"
 arch=("i686" "x86_64")
@@ -12,20 +12,24 @@ conflicts=('wxmedit')
 depends=('wxgtk' 'libucd-git' 'desktop-file-utils' 'boost')
 makedepends=('git' 'libucd-git' 'boost' 'wxgtk')
 source=(
-    "$pkgname::git+https://github.com/hltj/wxMEdit"
+    "$pkgname::git://github.com/hltj/wxMEdit.git"
     wxmedit-encdet-mozilla.patch
     )
 install=wxmedit.install
 md5sums=(
     'SKIP'
-    '46277ca991dc2d7bf227bb6628561f4e'
+    '357585e05be0a807e4416d31e76df17c'
     )
 
+pkgver_git() {
+    cd "${srcdir}/${pkgname}"
+    #local ver="$(git show | grep commit | awk '{print $2}' )"
+    #printf "r%s" "${ver//[[:alpha:]]}"
+    echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
 pkgver() {
-  cd "$srcdir/$pkgname"
-  local ver="$(git show | grep commit | awk '{print $2}'  )"
-  #printf "r%s" "${ver//[[:alpha:]]}"
-  echo ${ver:0:7}
+  pkgver_git
 }
 
 prepare() {
@@ -40,7 +44,7 @@ build() {
 
   ./autogen.sh
   ./configure --prefix=/usr --with-wx-config=/usr/bin/wx-config-2.8
-  make
+  make -j $(cat /proc/cpuinfo | grep processor | wc -l | awk '{print $0 + 1;}')
 }
 
 package() {
diff --git a/wxmedit-encdet-mozilla.patch b/wxmedit-encdet-mozilla.patch
index 9d95e50658b9..52a119bc9025 100644
--- a/wxmedit-encdet-mozilla.patch
+++ b/wxmedit-encdet-mozilla.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.am b/Makefile.am
-index ef95dbb..b70f986 100644
+index b660cc4..e8519c6 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -24,7 +24,7 @@ encdet_src =	src/wxmedit/mad_encdet.cpp \
+@@ -26,7 +26,7 @@ encdet_src =	src/xm/encdet.cpp \
  bin_PROGRAMS = wxmedit
  check_PROGRAMS = wxmedit_test
  TESTS = wxmedit_test
@@ -11,11 +11,11 @@ index ef95dbb..b70f986 100644
  wxmedit_CXXFLAGS = -DDATA_DIR=\"${datadir}\" ${curl_CFLAGS}
  wxmedit_SOURCES =	$(enc_src) \
  	$(encdet_src) \
-diff --git a/src/xm/wxm_encdet.cpp b/src/xm/wxm_encdet.cpp
-index 715c7df..ca4edad 100644
---- a/src/xm/wxm_encdet.cpp
-+++ b/src/xm/wxm_encdet.cpp
-@@ -529,8 +529,13 @@ private:
+diff --git a/src/xm/encdet.cpp b/src/xm/encdet.cpp
+index 8200fdc..4270e93 100644
+--- a/src/xm/encdet.cpp
++++ b/src/xm/encdet.cpp
+@@ -558,8 +558,13 @@ private:
  };

  #endif

  

@@ -23,15 +23,15 @@ index 715c7df..ca4edad 100644
 +#include <libucd.h>

 +#endif

 +

- void DetectEncoding(const wxByte *text, size_t len, wxm::WXMEncodingID &enc, bool skip_utf8)

+ void DetectEncoding(const ubyte* text, size_t len, EncodingID& enc, bool skip_utf8)

  {

 +#if 0

  	UErrorCode status = U_ZERO_ERROR;

  	LocalUCharsetDetectorPointer csd(ucsdet_open(&status));

  	ucsdet_setText(csd.getAlias(), (const char*)text, len, &status);

-@@ -556,6 +561,19 @@ void DetectEncoding(const wxByte *text, size_t len, wxm::WXMEncodingID &enc, boo
- 		else

- 			enc_name.clear();

+@@ -611,6 +616,19 @@ void DetectEncoding(const ubyte* text, size_t len, EncodingID& enc, bool skip_ut
+ 		if(det != ENC_DEFAULT)

+ 			enc = det;

  	}

 +#else

 +    ucd_t det;

@@ -46,6 +46,6 @@ index 715c7df..ca4edad 100644
 +    }

 +    std::string enc_name(buffer);

 +#endif

+ }

  

- 	if(enc_name == "EUC-KR")

- 		enc_name = "UHC";

+ } // namespace xm