upgpkg: cjs-git 4.0.0.r2.gea081f32-1

rebase on top of community PKGBUILD

3 files changed, 49 insertions, 56 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index e47300beb26c..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgbase = cjs-git
-	pkgdesc = Javascript Bindings for Cinnamon
-	pkgver = 1276.7bb3d1b
-	pkgrel = 1
-	url = https://github.com/linuxmint/cjs
-	arch = i686
-	arch = x86_64
-	license = GPL
-	makedepends = gnome-common
-	depends = cairo
-	depends = gobject-introspection
-	depends = js185
-	depends = dbus-glib
-	provides = cjs
-	conflicts = cjs
-	source = cjs::git+https://github.com/linuxmint/cjs.git
-	options = !libtool
-
-pkgname = cjs-git
-
diff --git a/.SRCINFO b/.SRCINFO
index a44964a4bfe4..44e21ab24868 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = cjs-git
 	pkgdesc = Javascript Bindings for Cinnamon
-	pkgver = 1276.7bb3d1b
+	pkgver = 4.0.0.r2.gea081f32
 	pkgrel = 1
 	url = https://github.com/linuxmint/cjs
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = gnome-common
-	depends = cairo
-	depends = gobject-introspection
-	depends = js185
+	checkdepends = xorg-server-xvfb
+	makedepends = git
+	makedepends = autoconf-archive
+	makedepends = gobject-introspection
 	depends = dbus-glib
-	provides = cjs
-	conflicts = cjs
-	options = !libtool
-	source = cjs::git+https://github.com/linuxmint/cjs.git
-	sha256sums = SKIP
+	depends = gtk3
+	depends = gobject-introspection-runtime
+	depends = js52
+	source = git+https://github.com/linuxmint/cjs.git
+	sha512sums = SKIP
 
 pkgname = cjs-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 746032232cdb..929e3dd5ee8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,54 @@
-# $Id$
-# Maintainer: Realex
-# Based on cjs PKGBUILD
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira@cinnarch.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 
-_pkgname=cjs
-pkgname=${_pkgname}-git
-pkgver=1276.7bb3d1b
+pkgname=cjs-git
+pkgver=4.0.0.r2.gea081f32
 pkgrel=1
 pkgdesc="Javascript Bindings for Cinnamon"
-arch=(i686 x86_64)
-url="https://github.com/linuxmint/cjs"
-license=(GPL)
-depends=('cairo' 'gobject-introspection' 'js185' 'dbus-glib')
-makedepends=('gnome-common')
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
-options=('!libtool')
-source=(${_pkgname}::git+https://github.com/linuxmint/cjs.git)
-sha256sums=(SKIP)
+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')
+checkdepends=('xorg-server-xvfb')
+source=("git+${url}.git")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd ${srcdir}/${_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'
+}
+
+prepare() {
+    cd "${srcdir}"/${pkgname%-git}
+
+    autoreconf -fi
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}
-  ./autogen.sh --prefix=/usr --disable-static --libexecdir=/usr/lib
-  make
+    cd "${srcdir}"/${pkgname%-git}
+
+    ./configure --prefix=/usr \
+                --libexecdir=/usr/lib \
+                --disable-static
+
+    #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
 }
 
 check() {
-  cd ${srcdir}/${_pkgname}
-  # Needs a display
-  make -k check || :
+    cd "${srcdir}"/${pkgname%-git}
+
+    # Needs a display
+    xvfb-run make -k check || :
 }
 
 package() {
-  cd ${srcdir}/${_pkgname}
-  make DESTDIR="$pkgdir" install
+    cd "${srcdir}"/${pkgname%-git}
+
+    make DESTDIR="${pkgdir}" install
 }