[arch-commits] Commit in js68/trunk (PKGBUILD mozjs68-fix-soname.patch)

[Jan Steffens]

    Date: Thursday, February 13, 2020 @ 16:42:35
  Author: heftig
Revision: 375544

68.5.0-1: drop soname patch from js*

Modified:
  js68/trunk/PKGBUILD
Deleted:
  js68/trunk/mozjs68-fix-soname.patch

--------------------------+
 PKGBUILD                 |   16 ++++++----------
 mozjs68-fix-soname.patch |   25 -------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 16:42:33 UTC (rev 375543)
+++ PKGBUILD	2020-02-13 16:42:35 UTC (rev 375544)
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=js68
-pkgver=68.2.0
+pkgver=68.5.0
 pkgrel=1
 pkgdesc="JavaScript interpreter and libraries - Version 68"
 arch=(x86_64)
@@ -8,22 +8,17 @@
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 license=(MPL)
 depends=(gcc-libs readline zlib sh)
-makedepends=(python python2 zip autoconf2.13 rust llvm clang)
+makedepends=(python2 zip autoconf2.13 python rust llvm clang)
 checkdepends=(mercurial git)
 _relver=${pkgver}esr
-source=(https://archive.mozilla.org/pub/firefox/releases/$_relver/source/firefox-$_relver.source.tar.xz{,.asc}
-        mozjs68-fix-soname.patch)
-sha256sums=('85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38'
-            'SKIP'
-            '975b8461982eab8aba891c4fb6dcbf1ac6894d0f1590dbc231fcb2f12447cb9b')
+source=(https://archive.mozilla.org/pub/firefox/releases/$_relver/source/firefox-$_relver.source.tar.xz{,.asc})
+sha256sums=('52e784f98a37624e8b207f1b23289c2c88f66dd923798cae891a586a6d94a6d1'
+            'SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 prepare() {
   cd firefox-$pkgver
   mkdir obj
-
-  # https://salsa.debian.org/gnome-team/mozjs52/tree/debian/master/debian/patches
-  patch -Np1 -i ../mozjs68-fix-soname.patch
 }
 
 build() {
@@ -41,6 +36,7 @@
     --enable-release
     --enable-shared-js
     --enable-tests
+    --enable-unaligned-private-values
     --with-intl-api
     --with-system-zlib
     --without-system-icu

Deleted: mozjs68-fix-soname.patch
===================================================================
--- mozjs68-fix-soname.patch	2020-02-13 16:42:33 UTC (rev 375543)
+++ mozjs68-fix-soname.patch	2020-02-13 16:42:35 UTC (rev 375544)
@@ -1,25 +0,0 @@
-diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
-index 0d5e980e8254..96c70b5432d4 100644
---- i/js/src/build/Makefile.in
-+++ w/js/src/build/Makefile.in
-@@ -79,6 +79,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
-diff --git i/js/src/build/moz.build w/js/src/build/moz.build
-index 9b7ad87afea8..dbe3b6b89996 100644
---- i/js/src/build/moz.build
-+++ w/js/src/build/moz.build
-@@ -25,6 +25,7 @@ if not CONFIG['JS_STANDALONE']:
- if CONFIG['JS_SHARED_LIBRARY']:
-     GeckoSharedLibrary('js', linkage=None)
-     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
- 
-     # Ensure symbol versions of shared library on Linux do not conflict
-     # with those in libxul.