fix(aur): Cleanup

This commit is contained in:
Michael Carlberg 2017-01-27 04:15:41 +01:00
parent dc366079ae
commit b241018786
4 changed files with 20 additions and 29 deletions

View File

@ -25,8 +25,6 @@ pkgbase = polybar-git
optdepends = siji-git: Font used in example config optdepends = siji-git: Font used in example config
provides = polybar provides = polybar
conflicts = polybar conflicts = polybar
conflicts = lemonbuddy-git
conflicts = lemonbuddy
source = polybar::git+https://github.com/jaagr/polybar.git source = polybar::git+https://github.com/jaagr/polybar.git
install = polybar.install install = polybar.install
md5sums = SKIP md5sums = SKIP

View File

@ -19,33 +19,30 @@ optdepends=("alsa-lib: volume module support"
"curl: github module support") "curl: github module support")
makedepends=("cmake" "git" "python" "python2" "pkg-config") makedepends=("cmake" "git" "python" "python2" "pkg-config")
provides=("polybar") provides=("polybar")
conflicts=("polybar" "lemonbuddy-git" "lemonbuddy") conflicts=("polybar")
install="${_pkgname}.install" install="${_pkgname}.install"
source=("${_pkgname}::git+${url}.git") source=("${_pkgname}::git+${url}.git")
md5sums=("SKIP") md5sums=("SKIP")
pkgver() { pkgver() {
cd "$_pkgname" || exit git -C "${_pkgname}" describe --long --tags | sed "s/-/.r/;s/-/./g"
git describe --long --tags | sed "s/-/.r/;s/-/./g"
} }
prepare() { prepare() {
cd "$_pkgname" || exit git -C "${_pkgname}" submodule update --init --recursive
git submodule update --init --recursive mkdir -p "${_pkgname}/build"
mkdir build
} }
build() { build() {
cd "${_pkgname}" || exit cd "${_pkgname}/build" || exit 1
[ -x version.sh ] && ./version.sh >/dev/null if [ -x ../common/version.sh ]; then
cd build || exit ../common/version.sh
fi
cmake -DCMAKE_INSTALL_PREFIX=/usr .. cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make cmake --build .
} }
package() { package() {
cd "${_pkgname}/build" || exit cmake --build "${_pkgname}/build" --target install -- DESTDIR="${pkgdir}"
make DESTDIR="$pkgdir/" install install -Dm644 "${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
cd .. || exit
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
} }

View File

@ -7,6 +7,7 @@ pkgbase = polybar
arch = x86_64 arch = x86_64
license = MIT license = MIT
makedepends = cmake makedepends = cmake
makedepends = git
makedepends = python makedepends = python
makedepends = python2 makedepends = python2
makedepends = pkg-config makedepends = pkg-config
@ -23,8 +24,6 @@ pkgbase = polybar
optdepends = ttf-unifont: Font used in example config optdepends = ttf-unifont: Font used in example config
optdepends = siji-git: Font used in example config optdepends = siji-git: Font used in example config
conflicts = polybar-git conflicts = polybar-git
conflicts = lemonbuddy-git
conflicts = lemonbuddy
source = polybar::git+https://github.com/jaagr/polybar.git#tag=3.0.2 source = polybar::git+https://github.com/jaagr/polybar.git#tag=3.0.2
install = polybar.install install = polybar.install
md5sums = SKIP md5sums = SKIP

View File

@ -16,27 +16,24 @@ optdepends=("alsa-lib: volume module support"
"ttf-unifont: Font used in example config" "ttf-unifont: Font used in example config"
"siji-git: Font used in example config" "siji-git: Font used in example config"
"curl: github module support") "curl: github module support")
makedepends=("cmake" "python" "python2" "pkg-config") makedepends=("cmake" "git" "python" "python2" "pkg-config")
conflicts=("polybar-git" "lemonbuddy-git" "lemonbuddy") conflicts=("polybar-git")
install="${pkgname}.install" install="${pkgname}.install"
source=("${pkgname}::git+${url}.git#tag=${pkgver}") source=("${pkgname}::git+${url}.git#tag=${pkgver}")
md5sums=("SKIP") md5sums=("SKIP")
prepare() { prepare() {
cd "$pkgname" || exit git -C "${pkgname}" submodule update --init --recursive
git submodule update --init --recursive mkdir -p "${pkgname}/build"
mkdir build
} }
build() { build() {
cd "${pkgname}/build" || exit cd "${pkgname}/build" || exit 1
cmake -DCMAKE_INSTALL_PREFIX=/usr .. cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make cmake --build .
} }
package() { package() {
cd "${pkgname}/build" || exit cmake --build "${pkgname}/build" --target install -- DESTDIR="${pkgdir}"
make DESTDIR="${pkgdir}/" install install -Dm644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
cd .. || exit
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
} }