summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman)2017-07-19 12:18:37 +0900
committerCarsten Haitzler (Rasterman)2017-09-03 10:23:11 +0900
commit68b87ca7cefd53204672960fe6fdc4a2892dbd11 (patch)
treed1687ece8c118365653999f4275df2ed6b31d249
parent53947cb603783dc5293bf3c8fbc06ba63f694f21 (diff)
downloadaur-68b87ca7cefd53204672960fe6fdc4a2892dbd11.tar.gz
update e pkgbuild to current upstream and have wayland work fully
also move to meson as build system (much faster and maintained in git - autofoo is likely to go soon).
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD28
2 files changed, 15 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 713f88ef4d3..656a460c963 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = enlightenment-git
pkgdesc = Enlightenment window manager - Development version
- pkgver = 0.21.99.22859.g55e13da65
+ pkgver = 0.21.99.23005.gcc5eec5cc
pkgrel = 1
url = http://www.enlightenment.org
arch = i686
@@ -9,11 +9,10 @@ pkgbase = enlightenment-git
makedepends = git
depends = efl-git
depends = xcb-util-keysyms
- depends = shared-mime-info
- depends = desktop-file-utils
depends = udisks2
- depends = ttf-font
+ depends = wayland
depends = xorg-server-xwayland
+ depends = bluez-libs
optdepends = acpid: power events on laptop lid close
optdepends = bc: calculator in everything module
optdepends = bluez4: bluetooth module
@@ -21,7 +20,7 @@ pkgbase = enlightenment-git
optdepends = gdb: create backtraces on crash
optdepends = geoclue2: geolocation module
optdepends = packagekit: packagekit module
- provides = enlightenment=0.21.99.22859.g55e13da65
+ provides = enlightenment=0.21.99.23005.gcc5eec5cc
provides = notification-daemon
conflicts = enlightenment
options = debug
diff --git a/PKGBUILD b/PKGBUILD
index 2468f33d686..1a3f5a7487f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,14 @@
_pkgname=enlightenment
pkgname=$_pkgname-git
-pkgver=0.21.99.21577.g6548fae
+pkgver=0.21.99.23005.gcc5eec5cc
pkgrel=1
pkgdesc="Enlightenment window manager - Development version"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
license=('BSD')
-depends=('efl-git' 'xcb-util-keysyms' 'shared-mime-info'
- 'desktop-file-utils' 'udisks2' 'ttf-font'
- 'xorg-server-xwayland')
+depends=('efl-git' 'xcb-util-keysyms' 'udisks2' 'wayland'
+ 'xorg-server-xwayland')
[[ ! $(pacman -T bluez-libs) ]] && depends+=('bluez-libs') #l2ping support in enlightenment_sys is detected at build time
makedepends=('git')
optdepends=('acpid: power events on laptop lid close'
@@ -34,11 +33,7 @@ sha256sums=('SKIP')
pkgver() {
cd $_pkgname
- for _i in v_maj v_min v_mic; do
- local v_ver=${v_ver#.}.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
- done
-
- v_ver=$(awk -F , -v v_ver=$v_ver '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
+ local v_ver=$(grep version meson.build | head -1 | sed s/version//g | tr ":'," " " | awk '{print $1}')
printf "%s.%s.g%s" "$v_ver" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
@@ -48,20 +43,19 @@ build() {
export CFLAGS="$CFLAGS -fvisibility=hidden"
- ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-wayland \
- --enable-xwayland
+ rm -rf build
+ meson --prefix=/usr \
+ -Dwayland=true \
+ . build
- make
+ ninja -C build
}
package() {
cd $_pkgname
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C build install
- install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname/" ChangeLog NEWS README
+ install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname/" README
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" AUTHORS COPYING
}