Fix build

4 files changed, 51 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06f03ddb1309..39d15c3dfa80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spidermonkey
 	pkgdesc = Mozilla's JavaScript engine
 	pkgver = 45.0.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://developer.mozilla.org/en/SpiderMonkey
 	arch = i686
 	arch = x86_64
@@ -10,8 +10,12 @@ pkgbase = spidermonkey
 	conflicts = spidermonkey-git
 	source = https://ftp.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2
 	source = patch_js_src_configure.diff
+	source = patch_js_src_Makefile.in.diff
+	source = patch_js_src_moz.build.diff
 	sha256sums = 570530b1e551bf4a459d7cae875f33f99d5ef0c29ccc7742a1b6f588e5eadbee
 	sha256sums = 4a3688e7232a9fef0d5c48edc7b28c918e878415af49572008eefc9aa709cdd7
+	sha256sums = 3b68b66cfe30fce81aa37e2ed21ffad517b88437b5cd1b18243b05fd1ab8d5db
+	sha256sums = 76ba065716684f35d79af6bbd81b746ee6a6f60824b4f45bff87ed67d9fc3bda
 
 pkgname = spidermonkey
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e3426cc7b75..82bbd86068c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Nikolay Korotkiy <sikmir at gmail dot com>
 pkgname=spidermonkey
 pkgver=45.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Mozilla's JavaScript engine"
 arch=('i686' 'x86_64')
 url="http://developer.mozilla.org/en/SpiderMonkey"
@@ -11,13 +11,19 @@ license=('MPL2')
 provides=("${pkgname}=${pkgver}")
 conflicts=(${pkgname}-git)
 source=("https://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/mozjs-$pkgver.tar.bz2"
-        "patch_js_src_configure.diff")
+        "patch_js_src_configure.diff"
+        "patch_js_src_Makefile.in.diff"
+        "patch_js_src_moz.build.diff")
 sha256sums=('570530b1e551bf4a459d7cae875f33f99d5ef0c29ccc7742a1b6f588e5eadbee'
-            '4a3688e7232a9fef0d5c48edc7b28c918e878415af49572008eefc9aa709cdd7')
+            '4a3688e7232a9fef0d5c48edc7b28c918e878415af49572008eefc9aa709cdd7'
+            '3b68b66cfe30fce81aa37e2ed21ffad517b88437b5cd1b18243b05fd1ab8d5db'
+            '76ba065716684f35d79af6bbd81b746ee6a6f60824b4f45bff87ed67d9fc3bda')
 
 prepare() {
 	cd mozjs-$pkgver
 	patch -Np1 < ../patch_js_src_configure.diff
+	patch -Np1 < ../patch_js_src_Makefile.in.diff
+	patch -Np1 < ../patch_js_src_moz.build.diff
 }
 
 build() {
@@ -28,6 +34,7 @@ build() {
 	../configure \
 	    --with-system-nspr \
 	    --with-system-icu \
+	    --with-system-zlib \
 	    --enable-release \
 	    --disable-tests \
 	    --prefix=/usr
diff --git a/patch_js_src_Makefile.in.diff b/patch_js_src_Makefile.in.diff
new file mode 100644
index 000000000000..4fd2df7b2fda
--- /dev/null
+++ b/patch_js_src_Makefile.in.diff
@@ -0,0 +1,19 @@
+diff -Naur mozjs-45.0.2-orig/js/src/Makefile.in mozjs-45.0.2/js/src/Makefile.in
+--- mozjs-45.0.2-orig/js/src/Makefile.in	2017-11-14 02:27:34.021241107 +0300
++++ mozjs-45.0.2/js/src/Makefile.in	2017-11-14 02:29:07.255550711 +0300
+@@ -175,10 +175,13 @@
+ SCRIPTS = $(JS_CONFIG_NAME)
+ SDK_BINARY = $(JS_CONFIG_NAME)
+ 
+-$(LIBRARY_NAME).pc: js.pc
++$(JS_CONFIG_NAME).pc: js.pc
+ 	cp $^ $@
+ 
+-install:: $(LIBRARY_NAME).pc
++$(JS_LIBRARY_NAME).pc: js.pc
++	cp $^ $@
++
++install:: $(JS_CONFIG_NAME).pc
+ 	$(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: js-config.h
diff --git a/patch_js_src_moz.build.diff b/patch_js_src_moz.build.diff
new file mode 100644
index 000000000000..ec813c921414
--- /dev/null
+++ b/patch_js_src_moz.build.diff
@@ -0,0 +1,17 @@
+diff -Naur mozjs-45.0.2-orig/js/src/moz.build mozjs-45.0.2/js/src/moz.build
+--- mozjs-45.0.2-orig/js/src/moz.build	2017-11-15 19:53:21.810535115 +0300
++++ mozjs-45.0.2/js/src/moz.build	2017-11-15 19:50:45.435537988 +0300
+@@ -66,7 +66,12 @@
+     'js.pc',
+ ]
+ 
+-if not CONFIG['JS_STANDALONE']:
++if CONFIG['JS_STANDALONE']:
++    DEFINES['IMPL_MFBT'] = True
++    USE_LIBS += [
++        'mfbt',
++    ]
++else:
+     CONFIGURE_SUBST_FILES += [
+         '../../config/autoconf-js.mk',
+         '../../config/emptyvars-js.mk',