diff options
| -rw-r--r-- | .AURINFO | 27 | ||||
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 54 | ||||
| -rw-r--r-- | cinnamon-session-git.install | 12 |
4 files changed, 41 insertions, 78 deletions
diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index c108ad5c0924..000000000000 --- a/.AURINFO +++ /dev/null @@ -1,27 +0,0 @@ -pkgbase = cinnamon-session-git - pkgdesc = The Cinnamon Session Handler - pkgver = 126.8c1b918 - pkgrel = 1 - url = http://cinnamon.linuxmint.com/ - install = cinnamon-session-git.install - arch = i686 - arch = x86_64 - license = GPL - license = LGPL - makedepends = intltool - makedepends = mesa - makedepends = json-glib - makedepends = xtrans - makedepends = gnome-common - makedepends = git - depends = cinnamon-desktop-git - depends = upower - depends = libcanberra - depends = libsm - provides = cinnamon-session - conflicts = cinnamon-session - source = cinnamon-session::git+https://github.com/linuxmint/cinnamon-session.git - options = !emptydirs - -pkgname = cinnamon-session-git - @@ -1,27 +1,25 @@ pkgbase = cinnamon-session-git pkgdesc = The Cinnamon Session Handler - pkgver = 126.8c1b918 + pkgver = 4.4.1.r1.ga582be4 pkgrel = 1 - url = http://cinnamon.linuxmint.com/ - install = cinnamon-session-git.install + url = https://github.com/linuxmint/cinnamon-session arch = i686 arch = x86_64 license = GPL license = LGPL - makedepends = intltool - makedepends = mesa - makedepends = json-glib - makedepends = xtrans - makedepends = gnome-common makedepends = git - depends = cinnamon-desktop-git - depends = upower - depends = libcanberra + makedepends = meson + makedepends = samurai + makedepends = xtrans + depends = cinnamon-desktop + depends = dbus-glib depends = libsm - provides = cinnamon-session + depends = libcanberra + depends = xapps + optdepends = cinnamon-translations: i18n + provides = cinnamon-session=4.4.1.r1.ga582be4 conflicts = cinnamon-session - options = !emptydirs - source = cinnamon-session::git+https://github.com/linuxmint/cinnamon-session.git + source = git+https://github.com/linuxmint/cinnamon-session.git sha256sums = SKIP pkgname = cinnamon-session-git @@ -1,39 +1,43 @@ -# $Id$ -# Maintainer: Realex -# Based on cinnamon-session PKGBUILD +# Maintainer: Eli Schwartz <eschwartz@archlinux.org> +# Contributor: Alexandre Filgueira <alexfilgueira@antergos.com> +# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -_pkgname=cinnamon-session -pkgname=${_pkgname}-git -pkgver=126.8c1b918 +pkgname=cinnamon-session-git +pkgver=4.4.1.r1.ga582be4 pkgrel=1 pkgdesc="The Cinnamon Session Handler" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=('cinnamon-desktop-git' 'upower' 'libcanberra' 'libsm') -makedepends=('intltool' 'mesa' 'json-glib' 'xtrans' 'gnome-common' 'git') -conflicts=("${_pkgname}") -provides=("${_pkgname}") -options=('!emptydirs') -install=${pkgname}.install -url="http://cinnamon.linuxmint.com/" -source=(${_pkgname}::git+https://github.com/linuxmint/cinnamon-session.git) +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/${pkgname%-git}" +license=('GPL' 'LGPL') +depends=('cinnamon-desktop' 'dbus-glib' 'libsm' 'libcanberra' 'xapps') +optdepends=('cinnamon-translations: i18n') +makedepends=('git' 'meson' 'samurai' 'xtrans') +provides=("${pkgname%-git}=${pkgver}") +conflicts=("${pkgname%-git}") +source=("git+${url}.git") sha256sums=('SKIP') pkgver() { - cd $_pkgname - echo $(git rev-list --count master).$(git rev-parse --short master) + cd "${srcdir}"/${pkgname%-git} + + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd $_pkgname + mkdir -p "${srcdir}"/${pkgname%-git}/build + cd "${srcdir}"/${pkgname%-git}/build - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/cinnamon-session \ - --sbindir=/usr/bin --disable-schemas-compile --enable-systemd - make + meson --prefix=/usr \ + --libexecdir=lib/${pkgname%-git} \ + --buildtype=plain \ + -Dgconf=false \ + -Ddocbook=false \ + .. + samu } package() { - cd $_pkgname - make DESTDIR="$pkgdir" install + cd "${srcdir}"/${pkgname%-git}/build + + DESTDIR="${pkgdir}" samu install } diff --git a/cinnamon-session-git.install b/cinnamon-session-git.install deleted file mode 100644 index f7e8c46ac846..000000000000 --- a/cinnamon-session-git.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} |