[arch-commits] Commit in emscripten/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Thursday, July 23, 2020 @ 22:48:42
  Author: svenstaro
Revision: 665122

upgpkg: emscripten 1.39.20-1

Modified:
  emscripten/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-23 22:31:07 UTC (rev 665121)
+++ PKGBUILD	2020-07-23 22:48:42 UTC (rev 665122)
@@ -4,9 +4,16 @@
 # Contributor: Vlad Kolotvin <vlad.kolotvin at gmail.com>
 
 pkgname=emscripten
-_llvm_commit=3d8149c2a1228609fd7d7c91a04681304a2f0ca9
-pkgver=1.39.18
-pkgrel=3
+# To figure out the llvm commit that upstream used for this emscripten release, go to
+# https://github.com/emscripten-core/emsdk/blob/master/emscripten-releases-tags.txt
+# and note the SHA provided there.
+# Then, get commit SHAs from here:
+# https://chromium.googlesource.com/emscripten-releases/+/e7e39da9c81faecd9ecf44065cee864d76e4e34d/DEPS
+# Replace that pre-filled SHA with the one from the release. Then search for the "llvm_project_revision"
+# variable. It has the llvm commit to use here.
+_llvm_commit=55fa315b0352b63454206600d6803fafacb42d5e
+pkgver=1.39.20
+pkgrel=1
 pkgdesc="LLVM-based project that compiles C and C++ into highly-optimizable JavaScript for the web"
 arch=('x86_64')
 url="http://emscripten.org"
@@ -17,23 +24,21 @@
             'ruby: for using websockify addon'
             'cmake: for emcc --show-ports')
 install=emscripten.install
-# Get commit SHAs from here:
-# https://chromium.googlesource.com/emscripten-releases/+/refs/heads/master/DEPS
 source=("git+https://github.com/kripken/emscripten#tag=$pkgver"
         git+https://github.com/llvm/llvm-project.git#commit=$_llvm_commit
         "emscripten.sh"
         emscripten-config
-        libcxxabi-include-libunwind.patch)
+        https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/11713.patch)
 sha512sums=('SKIP'
             'SKIP'
             'a87cf5d4a5ac10a4f84ff02ea577d54b560929dc64457b874cd1cbd88311cf6c4dcfbf3242150f6e556f4ba6efd370a99b9f9065faf494f25d91fc012cd5aa58'
-            '1d60b8942f3487c034b7fadb5ab1aeb603131611331ae1c9e8364180ca3a5fadb11f39a30c7f6167080b5e8ba0b1588a3bf42d8904807201cd8c5d6df0653419'
-            'b124ff6110810e3190bf05deda478c6fef044ff55a435df978fdb7ff7b4f312186add48cb99946b67a2467f7e28855e36606209c3c4dcee2898762ccc2e4c2ed')
+            '4a93ea4291701a509f30541ad534f325b3e4f014a496e030bc19791095640931f18706264fa83a113225c6ee1a2ecd97bdefdc1dd15caaa5799105f7a96e3b7d'
+            'b2e0c162335c40ee84968ab8c5bae5083a96f18dcc6c4d4f50e4a7f312d075ad965f9afb0a9d2ca290068ed1ef5fe2599c681162690c645ca1f36f3af592a05f')
 
 prepare() {
   cd emscripten
 
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/libcxxabi-include-libunwind.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/11713.patch
 }
 
 build() {