diff --git a/.gitignore b/.gitignore index f3ade6a..bb1dfc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /firefox-52.3.0esr.source.tar.xz +/firefox-52.4.0esr.source.tar.xz diff --git a/mozjs52.spec b/mozjs52.spec index 2afa71e..117f553 100644 --- a/mozjs52.spec +++ b/mozjs52.spec @@ -6,7 +6,7 @@ %endif Name: mozjs%{major} -Version: 52.3.0 +Version: 52.4.0 Release: 1%{?dist} Summary: SpiderMonkey JavaScript library @@ -20,7 +20,6 @@ Patch0002: copy-headers.patch # Patches from https://github.com/ptomato/mozjs / Debian mozjs52_52.3.1-4.debian.tar.xz Patch0101: disable-mozglue.patch -Patch0102: remove-nspr-dependency.patch Patch0103: tests-skip-on-all-64-bit-archs.patch Patch0104: include-configure-script.patch @@ -64,7 +63,6 @@ pushd ../.. %patch0002 -p1 %patch0101 -p1 -%patch0102 -p1 %patch0103 -p1 %patch0104 -p1 @@ -167,5 +165,8 @@ jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic %{_includedir}/mozjs-%{major}/ %changelog +* Thu Sep 28 2017 Kalev Lember - 52.4.0-1 +- Update to 52.4.0 + * Wed Sep 20 2017 Kalev Lember - 52.3.0-1 - Initial Fedora packaging, based on earlier mozjs45 work diff --git a/remove-nspr-dependency.patch b/remove-nspr-dependency.patch deleted file mode 100644 index 5b1dd47..0000000 --- a/remove-nspr-dependency.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4c5d336b44bc6122a6721905e77849ebd57eca78 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Wed, 5 Jul 2017 22:53:30 -0700 -Subject: [PATCH] build: Remove unnecessary NSPR dependency - -When SpiderMonkey is configured with --enable-posix-nspr-emulation, then -the dependency on NSPR can be removed from the pkg-config file. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1379539 ---- - build/autoconf/nspr-build.m4 | 11 ++++++----- - js/src/js.pc.in | 2 +- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/build/autoconf/nspr-build.m4 b/build/autoconf/nspr-build.m4 -index fe6dab72..b733579c 100644 ---- a/build/autoconf/nspr-build.m4 -+++ b/build/autoconf/nspr-build.m4 -@@ -177,11 +177,8 @@ AC_SUBST_LIST(NSPR_CFLAGS) - AC_SUBST(NSPR_INCLUDE_DIR) - AC_SUBST(NSPR_LIB_DIR) - --NSPR_PKGCONF_CHECK="nspr" -+PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr" - if test -n "$MOZ_SYSTEM_NSPR"; then -- # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc -- NSPR_PKGCONF_CHECK="nspr >= $NSPR_MINVER" -- - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $NSPR_CFLAGS" - AC_TRY_COMPILE([#include "prlog.h"], -@@ -191,8 +188,12 @@ if test -n "$MOZ_SYSTEM_NSPR"; then - , - AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT])) - CFLAGS=$_SAVE_CFLAGS -+ # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc -+ PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER" -+elif test -n "$JS_POSIX_NSPR"; then -+ PKGCONF_REQUIRES_PRIVATE= - fi --AC_SUBST(NSPR_PKGCONF_CHECK) -+AC_SUBST([PKGCONF_REQUIRES_PRIVATE]) - - fi # _IS_OUTER_CONFIGURE - -diff --git a/js/src/js.pc.in b/js/src/js.pc.in -index 1efea334..2eae393a 100644 ---- a/js/src/js.pc.in -+++ b/js/src/js.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: SpiderMonkey @MOZILLA_VERSION@ - Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ --Requires.private: @NSPR_PKGCONF_CHECK@ -+@PKGCONF_REQUIRES_PRIVATE@ - Libs: -L${libdir} -l@JS_LIBRARY_NAME@ - Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ - diff --git a/sources b/sources index ec1f3a5..3e50271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (firefox-52.3.0esr.source.tar.xz) = 36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9 +SHA512 (firefox-52.4.0esr.source.tar.xz) = be3be7f9dbf4bd0344d5d76f26d1a5090bb012154d25833d5cd58e5e707c080515b42ed751e1f7e58b15b96939d7da634cafb6e8aa9bb1627ff420836b802183