[arch-commits] Commit in spidermonkey/repos (3 files)

[Eric Bélanger]

    Date: Friday, July 24, 2009 @ 00:23:10
  Author: eric
Revision: 47560

Merged revisions 47555 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/spidermonkey/trunk

........
  r47555 | eric | 2009-07-24 00:03:05 -0400 (Fri, 24 Jul 2009) | 2 lines
  
  upgpkg: spidermonkey 1.7.0-2
      Added missing include file (close FS#15626), removed force option
........

Added:
  spidermonkey/repos/extra-i686/spidermonkey-Makefile.patch
    (from rev 47555, spidermonkey/trunk/spidermonkey-Makefile.patch)
Modified:
  spidermonkey/repos/extra-i686/	(properties)
  spidermonkey/repos/extra-i686/PKGBUILD

-----------------------------+
 PKGBUILD                    |   23 +++++++++++------------
 spidermonkey-Makefile.patch |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 12 deletions(-)


Property changes on: spidermonkey/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /spidermonkey/trunk:1-2199
   + /spidermonkey/trunk:1-47559

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-24 04:17:20 UTC (rev 47559)
+++ extra-i686/PKGBUILD	2009-07-24 04:23:10 UTC (rev 47560)
@@ -3,27 +3,26 @@
 
 pkgname=spidermonkey
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla's C implementation of JavaScript."
 arch=("i686" "x86_64")
 url="http://www.mozilla.org/js/spidermonkey/"
 license=('MPL' 'GPL' 'LGPL')
 depends=('nspr')
-options=('!makeflags' 'force')
+options=('!makeflags')
 source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \
-	"spidermonkey-1.7-threadsafe.patch")
-md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f')
+	"spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch")
+md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f'\
+         '161d4c0f2c604d15cba29dab60b1f7a7')
 
-build()
-{
-  cd $startdir/src/js/src
+build() {
+  cd "$srcdir/js/src"
+  patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1
+  sed -i 's|include|include/js|' rules.mk || return 1
   # fix for the lib location
   [ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1)
   # patch Makefile for threadsafe support with native nspr
-  patch -p2 -i $startdir/src/spidermonkey-1.7-threadsafe.patch || return 1
+  patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1
   # build - threadsafe
-  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST=$startdir/pkg/usr all export || return 1
-  # install
-  mkdir -p $startdir/pkg/usr/include/js
-  mv $startdir/pkg/usr/include/*.h $startdir/pkg/usr/include/js/
+  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1
 }

Copied: spidermonkey/repos/extra-i686/spidermonkey-Makefile.patch (from rev 47555, spidermonkey/trunk/spidermonkey-Makefile.patch)
===================================================================
--- extra-i686/spidermonkey-Makefile.patch	                        (rev 0)
+++ extra-i686/spidermonkey-Makefile.patch	2009-07-24 04:23:10 UTC (rev 47560)
@@ -0,0 +1,22 @@
+*** Makefile.ref.orig	2009-02-16 09:56:29.000000000 -0600
+--- Makefile.ref	2009-02-16 09:58:59.000000000 -0600
+***************
+*** 169,184 ****
+--- 169,185 ----
+  	jstypes.h	\
+  	jsprvtd.h	\
+  	jspubtd.h	\
+  	jsregexp.h	\
+  	jsscan.h	\
+  	jsscope.h	\
+  	jsscript.h	\
+  	jsstr.h		\
++ 	jsutil.h        \
+  	jsxdrapi.h	\
+  	jsxml.h		\
+  	$(NULL)
+  
+  API_HFILES =		\
+  	jsapi.h		\
+  	jsdbgapi.h	\
+  	$(NULL)