From 469eca1ab7cad6cd362185d49dee21a73b36f2e1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 12 Jul 2011 18:54:18 +0200 Subject: [PATCH] gjs: use js rather than xulrunner. --- srcpkgs/gjs/gjs-devel.template | 14 ++++---------- srcpkgs/gjs/template | 17 +++++++++++------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/srcpkgs/gjs/gjs-devel.template b/srcpkgs/gjs/gjs-devel.template index c6aac05c34..1fd622b112 100644 --- a/srcpkgs/gjs/gjs-devel.template +++ b/srcpkgs/gjs/gjs-devel.template @@ -5,24 +5,18 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 +revision=2 -Add_dependency run pkg-config -Add_dependency run intltool -Add_dependency run glib-devel Add_dependency run libffi-devel Add_dependency run libgirepository-devel -Add_dependency run dbus-devel Add_dependency run dbus-glib-devel Add_dependency run cairo-devel Add_dependency run readline-devel -Add_dependency run nspr-devel -Add_dependency run xulrunner-devel +Add_dependency run js-devel Add_dependency run gjs do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index b8345ba7fd..2623204071 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,7 +1,8 @@ # Template file for 'gjs' pkgname=gjs version=0.7.14 -revision=1 +revision=2 +patch_args="-Np1" distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--localstatedir=/var" @@ -26,16 +27,20 @@ Add_dependency run dbus-glib Add_dependency run cairo Add_dependency run readline Add_dependency run nspr -Add_dependency run xulrunner +Add_dependency run js +Add_dependency build automake Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build glib-devel Add_dependency build libffi-devel Add_dependency build libgirepository-devel -Add_dependency build dbus-devel Add_dependency build dbus-glib-devel Add_dependency build cairo-devel Add_dependency build readline-devel -Add_dependency build nspr-devel -Add_dependency build xulrunner-devel +Add_dependency build js-devel +Add_dependency build gobject-introspection + +pre_configure() +{ + autoreconf -fi +}