[arch-commits] Commit in js/trunk (PKGBUILD js185-destdir.patch)

[Jan Steffens]

    Date: Tuesday, March 26, 2013 @ 13:15:35
  Author: heftig
Revision: 180814

17.0.0; but nothing supports it yet

Modified:
  js/trunk/PKGBUILD
Deleted:
  js/trunk/js185-destdir.patch

---------------------+
 PKGBUILD            |   39 ++++++++++++++-------------------------
 js185-destdir.patch |   15 ---------------
 2 files changed, 14 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-26 12:05:23 UTC (rev 180813)
+++ PKGBUILD	2013-03-26 12:15:35 UTC (rev 180814)
@@ -1,39 +1,28 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
+
 pkgname=js
-pkgver=1.8.5
-pkgrel=3
+pkgver=17.0.0
+pkgrel=1
 pkgdesc="JavaScript interpreter and libraries"
 arch=(i686 x86_64)
-url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
-license=('GPL2')
-depends=('nspr' 'gcc-libs')
-makedepends=('python2' 'zip')
-replaces=('spidermonkey')
-conflicts=('spidermonkey')
-source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-        js185-destdir.patch)
-md5sums=('a4574365938222adca0a6bd33329cb32'
-         '364834a8391888642c53d78c3a949d94')
+url="https://developer.mozilla.org/En/SpiderMonkey/17"
+license=(MPL)
+depends=(nspr gcc-libs libffi readline)
+makedepends=(python2 zip)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz)
+md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 build() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
-
-  patch -Np0 -i $srcdir/js185-destdir.patch
-
-  ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe
-
+  cd mozjs$pkgver/js/src
+  ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
+     --enable-readline --enable-threadsafe
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
+  cd mozjs$pkgver/js/src
   make DESTDIR="$pkgdir" install
-
-  install -m 0755 shell/js ${pkgdir}/usr/bin
-
-  #cleanup
-  rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
+  rm -f "$pkgdir"/usr/lib/*.a
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: js185-destdir.patch
===================================================================
--- js185-destdir.patch	2013-03-26 12:05:23 UTC (rev 180813)
+++ js185-destdir.patch	2013-03-26 12:15:35 UTC (rev 180814)
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
-+++ Makefile.in	2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))