Merge remote-tracking branch 'mmlb/add-fontpatcher-to-PKGBUILD' into develop

packages/archlinux/python-powerline-git/.gitignore

@@ -2,3 +2,4 @@
 !.gitignore
 !PKGBUILD
 !*.install
+!*.patch

packages/archlinux/python-powerline-git/PKGBUILD

@@ -2,9 +2,10 @@
 
 _gitname=powerline
 _gitbranch=develop
-pkgname="python-${_gitname}-git"
-pkgver=793.4ee5072
-pkgrel=1
+pkgname=("python-${_gitname}-git" "powerline-fontpatcher")
+pkgbase=powerline
+pkgver=800.c1ae7f3
+pkgrel=2
 pkgdesc='The ultimate statusline/prompt utility.'
 url='https://github.com/Lokaltog/powerline'
 license=('MIT')
@@ -15,20 +16,41 @@ optdepends=('python-psutil: improved system information'
 	'python-pygit2: improved git support'
 	'zsh: better shell prompt'
 	'gvim: vim compiled with Python support')
+provides=('powerline')
 conflicts=('python2-powerline-git'
 	'powerline-git')
 install="${_gitname}.install"
 source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
+	"fontpatcher.py.patch"
 	"${install}")
 sha256sums=('SKIP'
-	'7b1257cdacce60e19280f7d918e5f3aa6f13b519dff16ecc6f732c881ef63ca1')
+            '85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
+            '7b1257cdacce60e19280f7d918e5f3aa6f13b519dff16ecc6f732c881ef63ca1')
 
 pkgver() {
 	cd "${_gitname}"
 	echo "$(git rev-list --count ${_gitbranch}).$(git rev-parse --short ${_gitbranch})"
 }
 
-package() {
+prepare() {
+	cd "${srcdir}/${_gitname}"
+	patch -p1 < ../fontpatcher.py.patch
+}
+
+package_powerline-fontpatcher() {
+	pkgdesc='OTF/TTF font patcher for powerline symbols'
+	depends=('python2' 'fontforge')
+
+	cd "${_gitname}"
+
+	msg2 "Installing fontpatcher..."
+	install -dm755 "${pkgdir}/usr/share/$_gitname"
+	install -dm755 "${pkgdir}/usr/bin"
+	install -m755 "font/fontpatcher.py" "${pkgdir}/usr/bin/"
+	install -m644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname"
+}
+
+package_python-powerline-git() {
 	cd "${_gitname}"
 	python setup.py install --root="${pkgdir}" --optimize=1
 

packages/archlinux/python-powerline-git/fontpatcher.py.patch

@@ -0,0 +1,13 @@
+diff --git a/font/fontpatcher.py b/font/fontpatcher.py
+index e2bbf2a..aa172f6 100755
+--- a/font/fontpatcher.py
++++ b/font/fontpatcher.py
+@@ -21,7 +21,7 @@ except ImportError:
+ parser = argparse.ArgumentParser(description='Font patcher for Powerline. Requires FontForge with Python bindings. Stores the patched font as a new, renamed font file by default.')
+ parser.add_argument('target_fonts', help='font files to patch', metavar='font', nargs='+', type=argparse.FileType('rb'))
+ parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename_font')
+-parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='{0}/fontpatcher-symbols.sfd'.format(sys.path[0]), type=argparse.FileType('rb'))
++parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='/usr/share/powerline/fontpatcher-symbols.sfd', type=argparse.FileType('rb'))
+ args = parser.parse_args()
+ 
+ 

packages/archlinux/python2-powerline-git/.gitignore

@@ -2,3 +2,4 @@
 !.gitignore
 !PKGBUILD
 !*.install
+!*.patch

packages/archlinux/python2-powerline-git/PKGBUILD

@@ -2,9 +2,10 @@
 
 _gitname=powerline
 _gitbranch=develop
-pkgname="python2-${_gitname}-git"
-pkgver=793.4ee5072
-pkgrel=1
+pkgname=("python2-${_gitname}-git" "powerline-fontpatcher")
+pkgbase=powerline
+pkgver=800.c1ae7f3
+pkgrel=2
 pkgdesc='The ultimate statusline/prompt utility.'
 url='https://github.com/Lokaltog/powerline'
 license=('MIT')
@@ -16,20 +17,41 @@ optdepends=('python2-psutil: improved system information'
 	'mercurial: improved mercurial support'
 	'zsh: better shell prompt'
 	'gvim: vim compiled with Python support')
+provides=('powerline')
 conflicts=('python-powerline-git')
 replaces=('powerline-git')
 install="${_gitname}.install"
 source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
+	"fontpatcher.py.patch"
 	"${install}")
 sha256sums=('SKIP'
-	'e8ab7fb51ac7244bfad973a999c9333ba4334fa391aa890489cf8c8f1211c94f')
+            '85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
+            'e8ab7fb51ac7244bfad973a999c9333ba4334fa391aa890489cf8c8f1211c94f')
 
 pkgver() {
 	cd "${_gitname}"
 	echo "$(git rev-list --count ${_gitbranch}).$(git rev-parse --short ${_gitbranch})"
 }
 
-package() {
+prepare() {
+	cd "${srcdir}/${_gitname}"
+	patch -p1 < ../fontpatcher.py.patch
+}
+
+package_powerline-fontpatcher() {
+	pkgdesc='OTF/TTF font patcher for powerline symbols'
+	depends=('python2' 'fontforge')
+
+	cd "${_gitname}"
+
+	msg2 "Installing fontpatcher..."
+	install -dm755 "${pkgdir}/usr/share/$_gitname"
+	install -dm755 "${pkgdir}/usr/bin"
+	install -m755 "font/fontpatcher.py" "${pkgdir}/usr/bin/"
+	install -m644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname"
+}
+
+package_python2-powerline-git() {
 	cd "${_gitname}"
 	python2 setup.py install --root="${pkgdir}" --optimize=1
 

packages/archlinux/python2-powerline-git/fontpatcher.py.patch

@@ -0,0 +1,13 @@
+diff --git a/font/fontpatcher.py b/font/fontpatcher.py
+index e2bbf2a..aa172f6 100755
+--- a/font/fontpatcher.py
++++ b/font/fontpatcher.py
+@@ -21,7 +21,7 @@ except ImportError:
+ parser = argparse.ArgumentParser(description='Font patcher for Powerline. Requires FontForge with Python bindings. Stores the patched font as a new, renamed font file by default.')
+ parser.add_argument('target_fonts', help='font files to patch', metavar='font', nargs='+', type=argparse.FileType('rb'))
+ parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename_font')
+-parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='{0}/fontpatcher-symbols.sfd'.format(sys.path[0]), type=argparse.FileType('rb'))
++parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='/usr/share/powerline/fontpatcher-symbols.sfd', type=argparse.FileType('rb'))
+ args = parser.parse_args()
+ 
+