Update to r4977

2 files changed, 32 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3116773b0b0e..53124a51444a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: cornholio <vigo.the.unholy.carpathian@gmail.com>
 
 pkgname=mailpile-git
-pkgver=r4960.bdd1cf5
+pkgver=r4977.2438e49
 pkgrel=1
 pkgdesc="A modern, fast web-mail client with user-friendly encryption and privacy features."
 arch=('any')
@@ -10,15 +10,18 @@ depends=('python2-pillow' 'python2-lxml' 'python2-jinja' 'spambayes' 'python2-pg
 url="http://www.mailpile.is"
 provides=("mailpile")
 conflicts=("mailpile")
-source=('git://github.com/pagekite/Mailpile.git')
-md5sums=('SKIP')
+source=('git://github.com/pagekite/Mailpile.git' 'fix-rootdir.patch')
+md5sums=('SKIP' '777cd528c847876b6f720af8f21951db')
 
 pkgver() {
   cd "${srcdir}/Mailpile"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-build() {
+prepare() {
+
+	# Fix path
+	patch -p1 < fix-rootdir.patch
 
 	cd "${srcdir}/Mailpile"
 
@@ -26,11 +29,11 @@ build() {
 	find . -type f -exec sed -i 's^bin/python^bin/python2^g' {} \;
 	sed -i 's^python ^python2 ^g' Makefile
 
-	# Set absolute paths for static files
-	sed -i "s^('static/^('/usr/share/mailpile/static/^g" mailpile/config.py
-	sed -i "s^'static/^'/usr/share/mailpile/static/^g" mailpile/defaults.py
-	sed -i '/os.path.dirname(              # scripts/d' mp
-	sed -i 's^__file__))^"/usr/share/mailpile/mailpile")^g' mp
+}
+
+build() {
+
+	cd "${srcdir}/Mailpile"
 
 	# Compile bytecode
 	printf '#!/bin/env python2\nimport compileall\ncompileall.compile_dir("mailpile", force=1)' > compile.py
@@ -42,10 +45,10 @@ build() {
 package() {
 
 	mkdir -p "${pkgdir}/usr/bin"
-	mkdir -p "${pkgdir}/usr/share/mailpile"
+	mkdir -p "${pkgdir}/usr/share"
 
-	cp -r "${srcdir}/Mailpile/mailpile" "${pkgdir}/usr/share/mailpile/"
-	cp -r "${srcdir}/Mailpile/locale" "${pkgdir}/usr/share/mailpile/"
+	cp -r "${srcdir}/Mailpile/shared-data" "${pkgdir}/usr/share/mailpile"
+	cp -r "${srcdir}/Mailpile/mailpile" "${pkgdir}/usr/share/mailpile/mailpile"
 	cp "${srcdir}/Mailpile/mp" "${pkgdir}/usr/bin/"
 
 	find "${pkgdir}/usr" -type f -exec chmod 644 {} \;
diff --git a/fix-rootdir.patch b/fix-rootdir.patch
new file mode 100644
index 000000000000..fc96edb87ffc
--- /dev/null
+++ b/fix-rootdir.patch
@@ -0,0 +1,17 @@
+diff -Naur src/Mailpile/scripts/mailpile src/Mailpile-arch/scripts/mailpile
+--- src/Mailpile/scripts/mailpile	2016-02-22 11:16:38.027643894 -0500
++++ src/Mailpile-arch/scripts/mailpile	2016-02-22 11:38:12.453109125 -0500
+@@ -1,12 +1,7 @@
+ #!/usr/bin/env python2
+ import sys, os
+ 
+-# Make imports work without PYTHONPATH
+-mailpile_root = os.path.dirname(     # Mailpile root
+-    os.path.dirname(                 # scripts/
+-        os.path.realpath(__file__)   # this script
+-    )
+-)
++mailpile_root = "/usr/share/mailpile"
+ 
+ sys.path.append(mailpile_root)
+