upgpkg: bokken-hg 1.8.28.6d1a9a1872ed-1 (fix url and patch)

3 files changed, 38 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f61a37816681..e79e39c14071 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = bokken-hg
 	pkgdesc = GUI for radare2 and pyew
-	pkgver = 1.8.4.a6e0bf349180
-	pkgrel = 2
-	url = http://inguma.eu/projects/bokken
+	pkgver = 1.8.28.6d1a9a1872ed
+	pkgrel = 1
+	url = https://bitbucket.org/inguma/bokken
 	arch = any
 	license = GPL2
 	makedepends = mercurial
 	depends = pygtk
-	depends = pygtksourceview2
+	depends = gtksourceview3
 	depends = python2-pillow
 	depends = graphviz
 	depends = radare2-bindings
 	provides = bokken
 	conflicts = bokken
-	source = bokken-hg::hg+https://inguma.eu/repos/bokken
+	source = bokken-hg::hg+https://bitbucket.org/inguma/bokken
+	source = fix-new-radare.patch
 	sha512sums = SKIP
+	sha512sums = 478de59f170cf5d28ab0dbe16cf9cb1d472d40de3abbe049d9577319b2123b514cd08320213a36fa2ee441add680aa56fdfc721a26ee786ed59f1d12cc1825b9
 
 pkgname = bokken-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index 67f1b4dc3c78..8b2f8e00db0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=bokken-hg
-pkgver=1.8.4.a6e0bf349180
-pkgrel=2
-pkgdesc="GUI for radare2 and pyew"
-url="http://inguma.eu/projects/bokken"
+pkgver=1.8.28.6d1a9a1872ed
+pkgrel=1
+pkgdesc='GUI for radare2 and pyew'
+url='https://bitbucket.org/inguma/bokken'
 arch=('any')
 license=('GPL2')
-depends=('pygtk' 'pygtksourceview2' 'python2-pillow' 'graphviz' 'radare2-bindings')
+depends=('pygtk' 'gtksourceview3' 'python2-pillow' 'graphviz' 'radare2-bindings')
 makedepends=('mercurial')
 provides=('bokken')
 conflicts=("bokken")
-source=(${pkgname}::hg+https://inguma.eu/repos/bokken)
-sha512sums=('SKIP')
+source=(${pkgname}::hg+https://bitbucket.org/inguma/bokken
+        fix-new-radare.patch)
+sha512sums=('SKIP'
+            '478de59f170cf5d28ab0dbe16cf9cb1d472d40de3abbe049d9577319b2123b514cd08320213a36fa2ee441add680aa56fdfc721a26ee786ed59f1d12cc1825b9')
 
 pkgver() {
   cd ${pkgname}
@@ -21,6 +23,8 @@ pkgver() {
 
 prepare() {
   cd ${pkgname}
+  patch -p0 < "${srcdir}/fix-new-radare.patch"
+  sed -e 's|" + self.target|{}".format(self.target)|g' -i ui/main.py
   sed -e 's/env python$/env python2/g' -i ui/xdot.py lib/web/__init__.py lib/web/utils.py
   sed -e 's|/usr/bin/python|/usr/bin/env python2|g' -i bokken.py
   cat > bokken.sh << EOF
@@ -32,13 +36,11 @@ EOF
 
 package() {
   cd ${pkgname}
-
-  install -d "${pkgdir}/usr/share/bokken"
-  install -Dm 755 bokken bokken.py "${pkgdir}/usr/share/bokken"
-  cp -r lib static ui "${pkgdir}/usr/share/bokken"
-  install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm 644 README "${pkgdir}/usr/share/doc/${pkgname}/README.md"
   install -Dm 755 bokken.sh "${pkgdir}/usr/bin/bokken"
+  install -Dm 755 bokken bokken.py -t "${pkgdir}/usr/share/bokken"
+  cp -r lib static ui "${pkgdir}/usr/share/bokken"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/fix-new-radare.patch b/fix-new-radare.patch
new file mode 100644
index 000000000000..28375281bf17
--- /dev/null
+++ b/fix-new-radare.patch
@@ -0,0 +1,16 @@
+--- ui/radare_core.py
++++ ui/radare_core.py.orig
+@@ -456,8 +465,11 @@
+             if entryp:
+                 self.full_fileinfo['eps'] = []
+                 for line in entryp.split('\n'):
+-                    line = line.strip('[').strip(']')
+-                    self.full_fileinfo['eps'].append(['Entry0', hex(int(line))])
++                    line = line.strip()
++                    if line != "":
++                      entries = eval(line.strip()) # fuck it, just use an eval
++                      for entry in entries:
++                        self.full_fileinfo['eps'].append(['Entry0', hex(entry['vaddr'])])
+             # Get symbols
+             symbols = self.send_cmd_str('is')
+             if symbols:
\ No newline at end of file