extra/js to 17.0.0-1

extra/js/PKGBUILD

@@ -1,47 +1,40 @@
-# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $
+# $Id$
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - patch to fix mozilla being retarded about ARM
-
-plugrel=1
+#  - for those of us that build packages correctly, you actually need to unset the new CPPFLAGS
 
 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
-        ihatemozilla.patch)
-md5sums=('a4574365938222adca0a6bd33329cb32'
-         '364834a8391888642c53d78c3a949d94'
-         '9add35f52965e4643b9235307d0d6cc5')
+url="https://developer.mozilla.org/En/SpiderMonkey/17"
+license=(MPL)
+depends=(nspr gcc-libs libffi readline)
+makedepends=(python2 zip)
+options=(!staticlibs)
+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
-  patch -Np3 -i $srcdir/ihatemozilla.patch
-
-  ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe
+  unset CPPFLAGS
 
+  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"
-  make DESTDIR="$pkgdir" install
-
-  install -m 0755 shell/js ${pkgdir}/usr/bin
-
-  #cleanup
-  rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
+check() {
+  cd mozjs$pkgver/js/src
+  make check
 }
+
+package() {
+  cd mozjs$pkgver/js/src
+  make DESTDIR="$pkgdir" install
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
+}
+
+# vim:set ts=2 sw=2 et:

extra/js/ihatemozilla.patch

@@ -1,33 +0,0 @@
-diff -urN js-1.8.5.orig/js/src/configure js-1.8.5/js/src/configure
---- js-1.8.5.orig/js/src/configure	2011-03-31 13:08:36.000000000 -0600
-+++ js-1.8.5/js/src/configure	2011-11-29 18:13:45.000000000 -0700
-@@ -13322,13 +13322,9 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--        cat >> confdefs.h <<\EOF
--#define MOZ_ARM_ARCH 1
--EOF
--
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-+        CFLAGS="$CFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
-+        ASFLAGS="$ASFLAGS"
-       else
-         { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-GNU toolchains" 1>&2; exit 1; }
-       fi
-@@ -13341,9 +13337,9 @@
-   case "$target_cpu" in
-     arm*)
-       if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
-+        CFLAGS="$CFLAGS"
-+        CXXFLAGS="$CXXFLAGS"
-+        ASFLAGS="$ASFLAGS"
-       fi
-       ;;
-   esac

extra/js/js185-destdir.patch

@@ -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))