From 79e7640bba69dd00713324be4461c482f237494f Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 28 Jun 2013 23:10:36 -0400 Subject: [PATCH 1/5] arch: add provides=('powerline') to PKGBUILDs. --- packages/archlinux/python-powerline-git/PKGBUILD | 1 + packages/archlinux/python2-powerline-git/PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD index 5bc77d5e..c369879c 100644 --- a/packages/archlinux/python-powerline-git/PKGBUILD +++ b/packages/archlinux/python-powerline-git/PKGBUILD @@ -15,6 +15,7 @@ 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" diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD index 680916cd..1c7beb2d 100644 --- a/packages/archlinux/python2-powerline-git/PKGBUILD +++ b/packages/archlinux/python2-powerline-git/PKGBUILD @@ -16,6 +16,7 @@ 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" From ffb29d60d8cc773275aa537ccd17dd7157cb2c5d Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 28 Jun 2013 22:49:22 -0400 Subject: [PATCH 2/5] arch: add fontpatcher to archlinux/python2-powerline. --- .../archlinux/python2-powerline-git/.gitignore | 1 + packages/archlinux/python2-powerline-git/PKGBUILD | 15 ++++++++++++++- .../python2-powerline-git/fontpatcher.py.patch | 13 +++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/archlinux/python2-powerline-git/fontpatcher.py.patch diff --git a/packages/archlinux/python2-powerline-git/.gitignore b/packages/archlinux/python2-powerline-git/.gitignore index 4ef5aeeb..cc7d5336 100644 --- a/packages/archlinux/python2-powerline-git/.gitignore +++ b/packages/archlinux/python2-powerline-git/.gitignore @@ -2,3 +2,4 @@ !.gitignore !PKGBUILD !*.install +!*.patch diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD index 1c7beb2d..f05a0042 100644 --- a/packages/archlinux/python2-powerline-git/PKGBUILD +++ b/packages/archlinux/python2-powerline-git/PKGBUILD @@ -21,15 +21,22 @@ 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})" } +prepare() { + cd "${srcdir}/${_gitname}" + patch -p1 < ../fontpatcher.py.patch +} + package() { cd "${_gitname}" python2 setup.py install --root="${pkgdir}" --optimize=1 || return 1 @@ -42,6 +49,12 @@ package() { install -m644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf" ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf" + 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" + msg2 "Installing vim plugin..." install -dm755 "${pkgdir}/usr/share/vim/vimfiles/plugin" install -m644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim" diff --git a/packages/archlinux/python2-powerline-git/fontpatcher.py.patch b/packages/archlinux/python2-powerline-git/fontpatcher.py.patch new file mode 100644 index 00000000..fb394ce2 --- /dev/null +++ b/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() + + From 01560ae71436a5c2a29faf57383bad895af76337 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 28 Jun 2013 22:53:02 -0400 Subject: [PATCH 3/5] arch: add fontpatcher to archlinux/python-powerline. --- .../archlinux/python-powerline-git/.gitignore | 1 + packages/archlinux/python-powerline-git/PKGBUILD | 15 ++++++++++++++- .../python-powerline-git/fontpatcher.py.patch | 13 +++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/archlinux/python-powerline-git/fontpatcher.py.patch diff --git a/packages/archlinux/python-powerline-git/.gitignore b/packages/archlinux/python-powerline-git/.gitignore index 4ef5aeeb..cc7d5336 100644 --- a/packages/archlinux/python-powerline-git/.gitignore +++ b/packages/archlinux/python-powerline-git/.gitignore @@ -2,3 +2,4 @@ !.gitignore !PKGBUILD !*.install +!*.patch diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD index c369879c..1395d37d 100644 --- a/packages/archlinux/python-powerline-git/PKGBUILD +++ b/packages/archlinux/python-powerline-git/PKGBUILD @@ -20,15 +20,22 @@ 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})" } +prepare() { + cd "${srcdir}/${_gitname}" + patch -p1 < ../fontpatcher.py.patch +} + package() { cd "${_gitname}" python setup.py install --root="${pkgdir}" --optimize=1 || return 1 @@ -41,6 +48,12 @@ package() { install -m644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf" ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf" + 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" + msg2 "Installing vim plugin..." install -dm755 "${pkgdir}/usr/share/vim/vimfiles/plugin" install -m644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim" diff --git a/packages/archlinux/python-powerline-git/fontpatcher.py.patch b/packages/archlinux/python-powerline-git/fontpatcher.py.patch new file mode 100644 index 00000000..fb394ce2 --- /dev/null +++ b/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() + + From 4083cf4cc0c8c7ca87e74950a0e5c2ab8a2a3695 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 2 Jul 2013 08:38:04 -0400 Subject: [PATCH 4/5] arch: break package() into separate packages. --- .../archlinux/python-powerline-git/PKGBUILD | 24 ++++++++++++------- .../archlinux/python2-powerline-git/PKGBUILD | 24 ++++++++++++------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD index 1395d37d..c4706ed9 100644 --- a/packages/archlinux/python-powerline-git/PKGBUILD +++ b/packages/archlinux/python-powerline-git/PKGBUILD @@ -2,7 +2,8 @@ _gitname=powerline _gitbranch=develop -pkgname="python-${_gitname}-git" +pkgname=("python-${_gitname}-git" "powerline-fontpatcher") +pkgbase=powerline pkgver=793.4ee5072 pkgrel=1 pkgdesc='The ultimate statusline/prompt utility.' @@ -36,7 +37,20 @@ prepare() { patch -p1 < ../fontpatcher.py.patch } -package() { +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 || return 1 @@ -48,12 +62,6 @@ package() { install -m644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf" ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf" - 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" - msg2 "Installing vim plugin..." install -dm755 "${pkgdir}/usr/share/vim/vimfiles/plugin" install -m644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim" diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD index f05a0042..b6994b06 100644 --- a/packages/archlinux/python2-powerline-git/PKGBUILD +++ b/packages/archlinux/python2-powerline-git/PKGBUILD @@ -2,7 +2,8 @@ _gitname=powerline _gitbranch=develop -pkgname="python2-${_gitname}-git" +pkgname=("python2-${_gitname}-git" "powerline-fontpatcher") +pkgbase=powerline pkgver=793.4ee5072 pkgrel=1 pkgdesc='The ultimate statusline/prompt utility.' @@ -37,7 +38,20 @@ prepare() { patch -p1 < ../fontpatcher.py.patch } -package() { +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 || return 1 @@ -49,12 +63,6 @@ package() { install -m644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf" ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf" - 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" - msg2 "Installing vim plugin..." install -dm755 "${pkgdir}/usr/share/vim/vimfiles/plugin" install -m644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim" From 2be3059ebd8da58caf09fe87ac4903b75364d47f Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 2 Jul 2013 08:49:09 -0400 Subject: [PATCH 5/5] arch: update pkgrel to 2. --- packages/archlinux/python-powerline-git/PKGBUILD | 4 ++-- packages/archlinux/python2-powerline-git/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD index c4706ed9..a96d77ca 100644 --- a/packages/archlinux/python-powerline-git/PKGBUILD +++ b/packages/archlinux/python-powerline-git/PKGBUILD @@ -4,8 +4,8 @@ _gitname=powerline _gitbranch=develop pkgname=("python-${_gitname}-git" "powerline-fontpatcher") pkgbase=powerline -pkgver=793.4ee5072 -pkgrel=1 +pkgver=800.c1ae7f3 +pkgrel=2 pkgdesc='The ultimate statusline/prompt utility.' url='https://github.com/Lokaltog/powerline' license=('MIT') diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD index b6994b06..48236d4c 100644 --- a/packages/archlinux/python2-powerline-git/PKGBUILD +++ b/packages/archlinux/python2-powerline-git/PKGBUILD @@ -4,8 +4,8 @@ _gitname=powerline _gitbranch=develop pkgname=("python2-${_gitname}-git" "powerline-fontpatcher") pkgbase=powerline -pkgver=793.4ee5072 -pkgrel=1 +pkgver=800.c1ae7f3 +pkgrel=2 pkgdesc='The ultimate statusline/prompt utility.' url='https://github.com/Lokaltog/powerline' license=('MIT')