[arch-commits] Commit in js52/trunk (4 files)

[Jan Steffens]

    Date: Thursday, February 13, 2020 @ 16:42:30
  Author: heftig
Revision: 375541

52.9.0-4: drop soname patch from js*

Added:
  js52/trunk/mozjs52-disable-wformat.patch
    (from rev 375540, js52/trunk/no-error.diff)
Modified:
  js52/trunk/PKGBUILD
Deleted:
  js52/trunk/mozjs52-fix-soname.patch
  js52/trunk/no-error.diff

-------------------------------+
 PKGBUILD                      |   10 ++++------
 mozjs52-disable-wformat.patch |   12 ++++++++++++
 mozjs52-fix-soname.patch      |   34 ----------------------------------
 no-error.diff                 |   12 ------------
 4 files changed, 16 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 16:42:27 UTC (rev 375540)
+++ PKGBUILD	2020-02-13 16:42:30 UTC (rev 375541)
@@ -2,7 +2,7 @@
 
 pkgname=js52
 pkgver=52.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="JavaScript interpreter and libraries - Version 52"
 arch=(x86_64)
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
@@ -13,12 +13,10 @@
 source=(https://archive.mozilla.org/pub/firefox/releases/$_relver/source/firefox-$_relver.source.tar.xz
         mozjs52-copy-headers.patch
         mozjs52-disable-mozglue.patch
-        mozjs52-fix-soname.patch
-        no-error.diff)
+        mozjs52-disable-wformat.patch)
 sha256sums=('c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6'
             'c5b3a88e4d10ef149aba6fc48d431db54ff266323fa22a5d549028fd794423cc'
             '5a84f02521f37de873991dd360a4c4bfdbdd2fb4a218e11be73f9cbbf02050e8'
-            '728456fd9e66b69d6e0688c75e50091dc56735004ecf5f649212a83fe3087df1'
             '4c5a1662e36c6a5a11db0263bb264d104ff801789d5b6bc6a6104439457afb90')
 
 prepare() {
@@ -26,12 +24,11 @@
   mkdir obj
 
   # https://salsa.debian.org/gnome-team/mozjs52/tree/debian/master/debian/patches
-  patch -Np1 -i ../mozjs52-fix-soname.patch
   patch -Np1 -i ../mozjs52-copy-headers.patch
   patch -Np1 -i ../mozjs52-disable-mozglue.patch
 
   # New errors in test code as of GCC 9
-  patch -Np1 -i ../no-error.diff
+  patch -Np1 -i ../mozjs52-disable-wformat.patch
 }
 
 build() {
@@ -39,6 +36,7 @@
     --prefix=/usr
     --disable-debug
     --disable-debug-symbols
+    --disable-jemalloc
     --disable-strip
     --enable-gold
     --enable-optimize="-O2"

Copied: js52/trunk/mozjs52-disable-wformat.patch (from rev 375540, js52/trunk/no-error.diff)
===================================================================
--- mozjs52-disable-wformat.patch	                        (rev 0)
+++ mozjs52-disable-wformat.patch	2020-02-13 16:42:30 UTC (rev 375541)
@@ -0,0 +1,12 @@
+diff -u -r firefox-52.9.0esr/js/src/jsapi-tests/moz.build firefox-52.9.0esr-noerror/js/src/jsapi-tests/moz.build
+--- firefox-52.9.0esr/js/src/jsapi-tests/moz.build	2017-04-11 02:13:16.000000000 +0000
++++ firefox-52.9.0esr-noerror/js/src/jsapi-tests/moz.build	2019-06-20 20:10:31.092230735 +0000
+@@ -147,7 +147,7 @@
+ OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
+ 
+ if CONFIG['GNU_CXX']:
+-    CXXFLAGS += ['-Wno-shadow', '-Werror=format']
++    CXXFLAGS += ['-Wno-shadow']
+ 
+ # This is intended as a temporary workaround to enable VS2015.
+ if CONFIG['_MSC_VER']:

Deleted: mozjs52-fix-soname.patch
===================================================================
--- mozjs52-fix-soname.patch	2020-02-13 16:42:27 UTC (rev 375540)
+++ mozjs52-fix-soname.patch	2020-02-13 16:42:30 UTC (rev 375541)
@@ -1,34 +0,0 @@
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -418,7 +418,7 @@ endif # AIX
- #
- # Linux: add -Bsymbolic flag for components
- #
--ifeq ($(OS_ARCH),Linux)
-+#ifeq ($(OS_ARCH),Linux)
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
- EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
- EXTRA_DEPS += $(LD_VERSION_SCRIPT)
- endif
--endif
-+#endif
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
- 
- ifdef SYMBOLS_FILE
- ifeq ($(OS_TARGET),WINNT)
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -222,6 +222,8 @@ ifneq (,$(REAL_LIBRARY))
- endif
- ifneq (,$(SHARED_LIBRARY))
- 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif

Deleted: no-error.diff
===================================================================
--- no-error.diff	2020-02-13 16:42:27 UTC (rev 375540)
+++ no-error.diff	2020-02-13 16:42:30 UTC (rev 375541)
@@ -1,12 +0,0 @@
-diff -u -r firefox-52.9.0esr/js/src/jsapi-tests/moz.build firefox-52.9.0esr-noerror/js/src/jsapi-tests/moz.build
---- firefox-52.9.0esr/js/src/jsapi-tests/moz.build	2017-04-11 02:13:16.000000000 +0000
-+++ firefox-52.9.0esr-noerror/js/src/jsapi-tests/moz.build	2019-06-20 20:10:31.092230735 +0000
-@@ -147,7 +147,7 @@
- OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
- 
- if CONFIG['GNU_CXX']:
--    CXXFLAGS += ['-Wno-shadow', '-Werror=format']
-+    CXXFLAGS += ['-Wno-shadow']
- 
- # This is intended as a temporary workaround to enable VS2015.
- if CONFIG['_MSC_VER']: