fix build

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 77cd8a0fa770..88864fa5ac91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = cjs-git
 	pkgdesc = Javascript Bindings for Cinnamon
-	pkgver = 4.4.0.r0.gfe3b1ec4
-	pkgrel = 2
+	pkgver = 5.2.0.r2.g66962c83
+	pkgrel = 1
 	url = https://github.com/linuxmint/cjs
 	arch = i686
 	arch = x86_64
 	license = GPL
 	checkdepends = xorg-server-xvfb
 	makedepends = git
-	makedepends = autoconf-archive
+	makedepends = meson
+	makedepends = samurai
 	makedepends = gobject-introspection
 	depends = dbus-glib
 	depends = gtk3
 	depends = gobject-introspection-runtime
-	depends = js52
+	depends = js78
 	provides = cjs
 	conflicts = cjs
 	source = git+https://github.com/linuxmint/cjs.git
 	sha512sums = SKIP
 
 pkgname = cjs-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 978621ef472d..23ec2a0fece4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cjs-git
-pkgver=4.4.0.r0.gfe3b1ec4
-pkgrel=2
+pkgver=5.2.0.r2.g66962c83
+pkgrel=1
 pkgdesc="Javascript Bindings for Cinnamon"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/${pkgname%-git}"
 license=('GPL')
-depends=('dbus-glib' 'gtk3' 'gobject-introspection-runtime' 'js52')
-makedepends=('git' 'autoconf-archive' 'gobject-introspection')
+depends=('dbus-glib' 'gtk3' 'gobject-introspection-runtime' 'js78')
+makedepends=('git' 'meson' 'samurai' 'gobject-introspection')
 checkdepends=('xorg-server-xvfb')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -18,40 +18,33 @@ source=("git+${url}.git")
 sha512sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}"/${pkgname%-git}
+    cd "${srcdir}/${pkgname%-git}"
 
     git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-    cd "${srcdir}"/${pkgname%-git}
-
-    autoreconf -fi
-}
-
 build() {
-    cd "${srcdir}"/${pkgname%-git}
-
-    ./configure --prefix=/usr \
-                --libexecdir=/usr/lib \
-                --disable-static \
-                --disable-Werror
+    mkdir -p "${srcdir}/${pkgname%-git}/builddir"
+    cd "${srcdir}/${pkgname%-git}/builddir"
 
-    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    meson --prefix=/usr \
+          --libexecdir=/usr/lib \
+          --buildtype=plain \
+          -Dinstalled_tests=false \
+          ..
 
-    make
+    samu
 }
 
 check() {
-    cd "${srcdir}"/${pkgname%-git}
+    cd "${srcdir}/${pkgname%-git}/builddir"
 
     # Needs a display
-    xvfb-run make -k check || :
+    xvfb-run meson test --print-errorlogs
 }
 
 package() {
-    cd "${srcdir}"/${pkgname%-git}
+    cd "${srcdir}/${pkgname%-git}/builddir"
 
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" samu install
 }