From 0eb74fe4a186569e73f07c3db0deb6b775362861 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 12 Dec 2013 12:49:05 +0900 Subject: [PATCH] pkgbuild: follow AUR enlightenment17-git naming. --- configure.ac | 1 - pkgbuild/.gitignore | 2 +- pkgbuild/{PKGBUILD.in => PKGBUILD} | 21 ++++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) rename pkgbuild/{PKGBUILD.in => PKGBUILD} (69%) diff --git a/configure.ac b/configure.ac index 171e6e429..f12cc8ac0 100644 --- a/configure.ac +++ b/configure.ac @@ -1028,7 +1028,6 @@ config/default/Makefile config/standard/Makefile config/mobile/Makefile $po_makefile_in -pkgbuild/PKGBUILD ]) # report diff --git a/pkgbuild/.gitignore b/pkgbuild/.gitignore index 670e123c5..8b1378917 100644 --- a/pkgbuild/.gitignore +++ b/pkgbuild/.gitignore @@ -1 +1 @@ -PKGBUILD + diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD similarity index 69% rename from pkgbuild/PKGBUILD.in rename to pkgbuild/PKGBUILD index 9c32678fc..89d2b28fa 100644 --- a/pkgbuild/PKGBUILD.in +++ b/pkgbuild/PKGBUILD @@ -1,14 +1,15 @@ # Maintainer: Enlightenment Developers > - -pkgname=enlightenment -pkgver=@VERSION@ +pkgname=enlightenment17-git +_pkgname=enlightenment +pkgver=0.18.0.17379.44f8ab0 pkgrel=1 pkgdesc="Enlightenment window manager - GIT development snapshot" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'arm') url="http://www.enlightenment.org" license=('BSD') depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'desktop-file-utils' 'udisks2' 'ttf-font' 'bluez-libs') + [[ ! $(pacman -T "wayland>=1.2.90") ]] && depends+=('wayland>=1.2.90' 'pixman' 'mesa') optdepends=('connman: network module') provides=("enlightenment17=$pkgver" 'notification-daemon') conflicts=("enlightenment17") @@ -17,11 +18,21 @@ backup=('etc/enlightenment/sysactions.conf' options=('!libtool' 'debug') install=enlightenment.install +pkgver() { + cd "../.." + + for i in v_maj v_min v_mic; do + local _$i=$(grep -m 1 $i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") + done + + echo $_v_maj.$_v_min.$_v_mic.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) +} + build() { cd "../.." export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer" [[ -e Makefile ]] && make clean distclean - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --enable-wayland-clients --enable-wayland-egl make }