summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Choina2017-08-24 17:52:54 -0400
committerSolomon Choina2017-08-24 17:52:54 -0400
commitdb01a74f6cbe07b5b448bfd1c3f6c60d764075d2 (patch)
tree85a22e6d4afd1d8f34218eb2003cc4389ea62d6c
parent26798c4e94824af3306d152df04d0c187780c549 (diff)
downloadaur-db01a74f6cbe07b5b448bfd1c3f6c60d764075d2.tar.gz
changing to meson
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD36
2 files changed, 25 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 058baa80e6c..48a571d0382 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
# Generated by mksrcinfo v8
-# Tue Aug 22 11:34:17 UTC 2017
+# Thu Aug 24 21:52:45 UTC 2017
pkgbase = entrance-git
pkgdesc = Enlightenment Display Manager
- pkgver = 0.0.99.r347.228bf6d
- pkgrel = 1
+ pkgver = 0.0.99.r362.66f9fd3
+ pkgrel = 2
url = http://www.enlightenment.org/
arch = i686
arch = x86_64
license = GPL3
makedepends = git
- depends = efl
+ depends = efl-git
depends = xorg-xauth
depends = sudo
optdepends = ekbd-git: For virtual keyboard
- provides = entrance=0.0.99.r347.228bf6d
+ provides = entrance=0.0.99.r362.66f9fd3
conflicts = entrance
backup = etc/entrance/entrance.conf
source = git://github.com/Obsidian-StudiosInc/entrance
diff --git a/PKGBUILD b/PKGBUILD
index 26d99780931..3cef687cd78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@
_pkgname=entrance
pkgname=$_pkgname-git
-pkgver=0.0.99.r347.228bf6d
-pkgrel=1
+pkgver=0.0.99.r362.66f9fd3
+pkgrel=2
pkgdesc="Enlightenment Display Manager"
url="http://www.enlightenment.org/"
license=('GPL3')
arch=('i686' 'x86_64')
-depends=('efl' 'xorg-xauth' 'sudo')
+depends=('efl-git' 'xorg-xauth' 'sudo')
optdepends=('ekbd-git: For virtual keyboard')
makedepends=('git')
provides=("$_pkgname=$pkgver")
@@ -34,30 +34,34 @@ prepare() {
-e '/"reboot"/ s|:.*|: "/usr/bin/systemctl reboot";|' \
-e '/"suspend"/ s|:.*|: "/usr/bin/systemctl suspend";|' \
-i "$srcdir/$_pkgname/data/entrance.conf.in"
+ rm -rf build
+ mkdir "$srcdir/build"
+ cd "$srcdir/$_pkgname"
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd "$srcdir/$_pkgname"
-
- export CFLAGS="$CFLAGS -fvisibility=hidden"
+ cd "$srcdir/build"
- ./autogen.sh \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --disable-consolekit
-
- make
+ meson ../$_pkgname \
+ --prefix="/usr" \
+ --sbindir="/usr/bin" \
+ --bindir="/usr/bin" \
+ --datadir="/usr/share" \
+ --sysconfdir="/etc" \
+ -Dconsolekit=false
+ ninja
}
package() {
- cd "$srcdir/$_pkgname"
+ cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
+cd "$srcdir/$_pkgname"
# install correct PAM file
install -Dm644 "data/entrance.arch" "$pkgdir/etc/pam.d/entrance"
-
+ install -Dm644 "data/entrance.conf.in" "$pkgdir/etc/entrance/entrance.conf"
# install text files
install -d "$pkgdir/usr/share/doc/$_pkgname/"
install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname/" AUTHORS ChangeLog NEWS README