Merge branch 'improve-archlinux-packages' into develop
This commit is contained in:
commit
432fb81e42
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
_gitname=powerline
|
_gitname=powerline
|
||||||
_gitbranch=develop
|
_gitbranch=develop
|
||||||
pkgname=("python-${_gitname}-git" "powerline-fontpatcher")
|
pkgname=("python-${_gitname}-git" "powerline-fontpatcher-git")
|
||||||
pkgbase=powerline
|
pkgbase=powerline
|
||||||
pkgver=800.c1ae7f3
|
pkgver=808.5c88c0a
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc='The ultimate statusline/prompt utility.'
|
pkgdesc='The ultimate statusline/prompt utility.'
|
||||||
url='https://github.com/Lokaltog/powerline'
|
url='https://github.com/Lokaltog/powerline'
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
|
@ -13,16 +13,16 @@ arch=('any')
|
||||||
depends=('python>=3.2')
|
depends=('python>=3.2')
|
||||||
makedepends=('git' 'python-distribute')
|
makedepends=('git' 'python-distribute')
|
||||||
optdepends=('python-psutil: improved system information'
|
optdepends=('python-psutil: improved system information'
|
||||||
'python-pygit2: improved git support'
|
'python-pygit2: improved git support'
|
||||||
'zsh: better shell prompt'
|
'zsh: better shell prompt'
|
||||||
'gvim: vim compiled with Python support')
|
'gvim: vim compiled with Python support')
|
||||||
provides=('powerline')
|
provides=('powerline')
|
||||||
conflicts=('python2-powerline-git'
|
conflicts=('python2-powerline-git'
|
||||||
'powerline-git')
|
'powerline-git')
|
||||||
install="${_gitname}.install"
|
install="${_gitname}.install"
|
||||||
source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
|
source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
|
||||||
"fontpatcher.py.patch"
|
"fontpatcher.py.patch"
|
||||||
"${install}")
|
"${install}")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
'85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
|
'85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
|
||||||
'7b1257cdacce60e19280f7d918e5f3aa6f13b519dff16ecc6f732c881ef63ca1')
|
'7b1257cdacce60e19280f7d918e5f3aa6f13b519dff16ecc6f732c881ef63ca1')
|
||||||
|
@ -37,17 +37,15 @@ prepare() {
|
||||||
patch -p1 < ../fontpatcher.py.patch
|
patch -p1 < ../fontpatcher.py.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
package_powerline-fontpatcher() {
|
package_powerline-fontpatcher-git() {
|
||||||
pkgdesc='OTF/TTF font patcher for powerline symbols'
|
pkgdesc='OTF/TTF font patcher for Powerline symbols'
|
||||||
depends=('python2' 'fontforge')
|
depends=('python2' 'fontforge')
|
||||||
|
|
||||||
cd "${_gitname}"
|
cd "${_gitname}"
|
||||||
|
|
||||||
msg2 "Installing fontpatcher..."
|
# Font patcher
|
||||||
install -dm755 "${pkgdir}/usr/share/$_gitname"
|
install -Dm755 "font/fontpatcher.py" "${pkgdir}/usr/bin/powerline-fontpatcher"
|
||||||
install -dm755 "${pkgdir}/usr/bin"
|
install -Dm644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname/fontpatcher-symbols.sfd"
|
||||||
install -m755 "font/fontpatcher.py" "${pkgdir}/usr/bin/"
|
|
||||||
install -m644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package_python-powerline-git() {
|
package_python-powerline-git() {
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
_gitname=powerline
|
_gitname=powerline
|
||||||
_gitbranch=develop
|
_gitbranch=develop
|
||||||
pkgname=("python2-${_gitname}-git" "powerline-fontpatcher")
|
pkgname=("python2-${_gitname}-git" "powerline-fontpatcher-git")
|
||||||
pkgbase=powerline
|
pkgbase=powerline
|
||||||
pkgver=800.c1ae7f3
|
pkgver=808.5c88c0a
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc='The ultimate statusline/prompt utility.'
|
pkgdesc='The ultimate statusline/prompt utility.'
|
||||||
url='https://github.com/Lokaltog/powerline'
|
url='https://github.com/Lokaltog/powerline'
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
|
@ -13,17 +13,17 @@ arch=('any')
|
||||||
depends=('python2>=2.6')
|
depends=('python2>=2.6')
|
||||||
makedepends=('git' 'python2-distribute')
|
makedepends=('git' 'python2-distribute')
|
||||||
optdepends=('python2-psutil: improved system information'
|
optdepends=('python2-psutil: improved system information'
|
||||||
'python2-pygit2: improved git support'
|
'python2-pygit2: improved git support'
|
||||||
'mercurial: improved mercurial support'
|
'mercurial: improved mercurial support'
|
||||||
'zsh: better shell prompt'
|
'zsh: better shell prompt'
|
||||||
'gvim: vim compiled with Python support')
|
'gvim: vim compiled with Python support')
|
||||||
provides=('powerline')
|
provides=('powerline')
|
||||||
conflicts=('python-powerline-git')
|
conflicts=('python-powerline-git')
|
||||||
replaces=('powerline-git')
|
replaces=('powerline-git')
|
||||||
install="${_gitname}.install"
|
install="${_gitname}.install"
|
||||||
source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
|
source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
|
||||||
"fontpatcher.py.patch"
|
"fontpatcher.py.patch"
|
||||||
"${install}")
|
"${install}")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
'85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
|
'85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
|
||||||
'e8ab7fb51ac7244bfad973a999c9333ba4334fa391aa890489cf8c8f1211c94f')
|
'e8ab7fb51ac7244bfad973a999c9333ba4334fa391aa890489cf8c8f1211c94f')
|
||||||
|
@ -38,17 +38,15 @@ prepare() {
|
||||||
patch -p1 < ../fontpatcher.py.patch
|
patch -p1 < ../fontpatcher.py.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
package_powerline-fontpatcher() {
|
package_powerline-fontpatcher-git() {
|
||||||
pkgdesc='OTF/TTF font patcher for powerline symbols'
|
pkgdesc='OTF/TTF font patcher for Powerline symbols'
|
||||||
depends=('python2' 'fontforge')
|
depends=('python2' 'fontforge')
|
||||||
|
|
||||||
cd "${_gitname}"
|
cd "${_gitname}"
|
||||||
|
|
||||||
msg2 "Installing fontpatcher..."
|
# Font patcher
|
||||||
install -dm755 "${pkgdir}/usr/share/$_gitname"
|
install -Dm755 "font/fontpatcher.py" "${pkgdir}/usr/bin/powerline-fontpatcher"
|
||||||
install -dm755 "${pkgdir}/usr/bin"
|
install -Dm644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/${_gitname}/fontpatcher-symbols.sfd"
|
||||||
install -m755 "font/fontpatcher.py" "${pkgdir}/usr/bin/"
|
|
||||||
install -m644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package_python2-powerline-git() {
|
package_python2-powerline-git() {
|
||||||
|
|
Loading…
Reference in New Issue