summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD31
2 files changed, 9 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ae35cfdf925..651d1f862edc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
# Generated by mksrcinfo v8
-# Mon May 1 15:08:22 UTC 2017
+# Sat Jul 21 14:43:30 UTC 2018
pkgbase = pantheon-calendar-git
pkgdesc = The Pantheon Calendar
- pkgver = r1398.528cd23
+ pkgver = r1772.dcb72b85
pkgrel = 1
url = https://github.com/elementary/calendar
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
makedepends = intltool
+ makedepends = meson
makedepends = vala
depends = cairo
depends = clutter
@@ -31,9 +30,7 @@ pkgbase = pantheon-calendar-git
depends = libsoup
depends = libgranite.so
provides = pantheon-calendar
- conflicts = maya-calendar
conflicts = pantheon-calendar
- replaces = maya-calendar-bzr
source = pantheon-calendar::git+https://github.com/elementary/calendar.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3148f2700980..b02ce56f8292 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=pantheon-calendar-git
-pkgver=r1398.528cd23
+pkgver=r1772.dcb72b85
pkgrel=1
pkgdesc='The Pantheon Calendar'
arch=('x86_64')
@@ -12,10 +12,9 @@ depends=('cairo' 'clutter' 'clutter-gtk' 'evolution-data-server' 'folks'
'gdk-pixbuf2' 'geocode-glib' 'glib2' 'glibc' 'gtk3' 'libchamplain'
'libgee' 'libical' 'libnotify' 'libsoup'
'libgranite.so')
-makedepends=('cmake' 'git' 'granite-git' 'intltool' 'vala')
+makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
provides=('pantheon-calendar')
-conflicts=('maya-calendar' 'pantheon-calendar')
-replaces=('maya-calendar-bzr')
+conflicts=('pantheon-calendar')
source=('pantheon-calendar::git+https://github.com/elementary/calendar.git')
sha256sums=('SKIP')
@@ -25,31 +24,13 @@ pkgver() {
echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
-prepare() {
- cd pantheon-calendar
-
- sed 's|${CMAKE_INSTALL_FULL_LIBDIR}|${CMAKE_INSTALL_PREFIX}/lib|g' -i $(grep -rl CMAKE_INSTALL_FULL_LIBDIR)
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-}
-
build() {
- cd pantheon-calendar/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DGSETTINGS_COMPILE='FALSE'
- make
+ arch-meson pantheon-calendar build
+ ninja -C build
}
package() {
- cd pantheon-calendar/build
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: