summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD17
2 files changed, 5 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e9cb34446d2..c2b0db4a0499 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = pantheon-calculator-git
groups = pantheon-unstable
license = GPL3
makedepends = git
- makedepends = granite
+ makedepends = granite-git
makedepends = intltool
makedepends = meson
makedepends = vala
@@ -22,4 +22,3 @@ pkgbase = pantheon-calculator-git
sha256sums = SKIP
pkgname = pantheon-calculator-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c1addb8c3b93..8939d0d57db9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ license=('GPL3')
groups=('pantheon-unstable')
depends=('glib2' 'glibc' 'gtk3'
'libgranite.so')
-makedepends=('git' 'granite' 'intltool' 'meson' 'vala')
+makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
provides=('pantheon-calculator')
conflicts=('pantheon-calculator')
source=('pantheon-calculator::git+https://github.com/elementary/calculator.git')
@@ -22,27 +22,18 @@ pkgver() {
}
prepare() {
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-
sed 's/extra/io.elementary.calculator.extra/' -i pantheon-calculator/po/extra/meson.build
}
build() {
- cd build
- meson ../pantheon-calculator \
- --buildtype='release' \
- --prefix='/usr'
- ninja
+ arch-meson pantheon-calculator build
+ ninja -C build
}
package() {
- cd build
- DESTDIR="${pkgdir}" ninja install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: