summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-03-27 11:37:27 +0200
committerMaxime Gauduin2018-03-27 11:37:27 +0200
commit7fd24d914850342e5d4caf48ddce826cb636f827 (patch)
treef95a1c3496b98fdde0041424421cc72a818f1b26
parent98b97249d746739aef703444f96b53b7386c6d0e (diff)
downloadaur-7fd24d914850342e5d4caf48ddce826cb636f827.tar.gz
Switch to meson
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD20
2 files changed, 11 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 264cceedfc1b..82f71e45cb80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
# Generated by mksrcinfo v8
-# Mon May 1 13:48:06 UTC 2017
+# Tue Mar 27 09:37:21 UTC 2018
pkgbase = pantheon-terminal-git
pkgdesc = The Pantheon Terminal Emulator
- pkgver = r1373.d718aa1
+ pkgver = r1638.25f359a
pkgrel = 1
url = https://github.com/elementary/terminal
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
+ makedepends = appstream
makedepends = git
makedepends = granite-git
makedepends = intltool
+ makedepends = meson
makedepends = vala
depends = desktop-file-utils
depends = glib2
@@ -24,7 +24,6 @@ pkgbase = pantheon-terminal-git
depends = libgranite.so
provides = pantheon-terminal
conflicts = pantheon-terminal
- replaces = pantheon-terminal-bzr
source = pantheon-terminal::git+https://github.com/elementary/terminal.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9b677b8bf59a..f2d9ee1a8e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=pantheon-terminal-git
-pkgver=r1373.d718aa1
+pkgver=r1638.25f359a
pkgrel=1
pkgdesc='The Pantheon Terminal Emulator'
arch=('x86_64')
@@ -10,10 +10,9 @@ license=('GPL3')
groups=('pantheon-unstable')
depends=('desktop-file-utils' 'glib2' 'glibc' 'gtk3' 'libnotify' 'pango' 'vte3'
'libgranite.so')
-makedepends=('cmake' 'git' 'granite-git' 'intltool' 'vala')
+makedepends=('appstream' 'git' 'granite-git' 'intltool' 'meson' 'vala')
provides=('pantheon-terminal')
conflicts=('pantheon-terminal')
-replaces=('pantheon-terminal-bzr')
source=('pantheon-terminal::git+https://github.com/elementary/terminal.git')
sha256sums=('SKIP')
@@ -24,8 +23,6 @@ pkgver() {
}
prepare() {
- cd pantheon-terminal
-
if [[ -d build ]]; then
rm -rf build
fi
@@ -33,19 +30,16 @@ prepare() {
}
build() {
- cd pantheon-terminal/build
+ cd build
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DGSETTINGS_COMPILE='FALSE'
- make
+ arch-meson ../pantheon-terminal
+ ninja
}
package() {
- cd pantheon-terminal/build
+ cd build
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
}
# vim: ts=2 sw=2 et: