[arch-commits] Commit in cinnamon-desktop/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Thursday, April 19, 2018 @ 19:00:27
  Author: eschwartz
Revision: 317062

upgpkg: cinnamon-desktop 3.8.0-1

upstream release

Modified:
  cinnamon-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-19 18:58:51 UTC (rev 317061)
+++ PKGBUILD	2018-04-19 19:00:27 UTC (rev 317062)
@@ -4,7 +4,7 @@
 # Contributor:  Jan de Groot <jan at archlinux.org>
 
 pkgname=cinnamon-desktop
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Library with common API for various Cinnamon modules"
 arch=('x86_64')
@@ -11,10 +11,10 @@
 url="https://github.com/linuxmint/${pkgname}"
 license=('GPL' 'LGPL')
 depends=('accountsservice' 'gtk3' 'libxkbfile' 'libpulse')
-makedepends=('gobject-introspection' 'intltool' 'python')
+makedepends=('meson' 'gobject-introspection' 'intltool')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         "config.patch")
-sha256sums=('76b053eea02c61df22d35ccec6ba83de25246b794cbc024dce636dcb1e74c812'
+sha256sums=('83f31043a758224a2de6dc7015b75461f29bc48091cd1bbb3b99e7e683e73524'
             '45f403e6fe4ec701a0f3d16e990bb36598dd4a58fac5a374f85ccecdf74dd98a')
 
 prepare() {
@@ -21,29 +21,20 @@
     cd "${srcdir}"/${pkgname}-${pkgver}
     # Adjust configuration
     patch -Np1 -i ../config.patch
-
-    NOCONFIGURE=1 autoreconf -fi
 }
 
 build() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
+    mkdir -p "${srcdir}"/${pkgname}-${pkgver}/build
+    cd "${srcdir}"/${pkgname}-${pkgver}/build
 
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var \
-                --libexecdir=/usr/lib/$pkgname \
-                --disable-static
-
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
+    meson --prefix=/usr --buildtype=plain ..
+    ninja
 }
 
 package() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
+    cd "${srcdir}"/${pkgname}-${pkgver}/build
 
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" ninja install
     # rm legacy migration script (cinnamon 2.4) and its package dependency on python
     rm -rf "${pkgdir}"/usr/bin
 }