Github messages for voidlinux
 help / color / mirror / Atom feed
From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mozjs102: update to 102.15.1.
Date: Mon, 05 Feb 2024 12:26:33 +0100	[thread overview]
Message-ID: <20240205112634.07AFE2B7EA@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48322@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages mozjs102
https://github.com/void-linux/void-packages/pull/48322

mozjs102: update to 102.15.1.
Also fix build with python3.12.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR:  **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48322.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mozjs102-48322.patch --]
[-- Type: text/x-diff, Size: 2499 bytes --]

From a409e895761189b4e5a282d6995970f46c589127 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 22 Jan 2024 02:49:41 -0800
Subject: [PATCH] mozjs102: update to 102.15.1.

---
 srcpkgs/mozjs102/patches/armv6l-isb.patch | 2 +-
 srcpkgs/mozjs102/template                 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mozjs102/patches/armv6l-isb.patch b/srcpkgs/mozjs102/patches/armv6l-isb.patch
index c08c776261e35..1a7f3e45ee42a 100644
--- a/srcpkgs/mozjs102/patches/armv6l-isb.patch
+++ b/srcpkgs/mozjs102/patches/armv6l-isb.patch
@@ -13,4 +13,4 @@ diff -rup Architecture-arm.cpp.orig Architecture-arm.cpp
 +#  endif
  #else
    // We assume the icache flushing routines on other platforms take care of this
- #endif
\ No newline at end of file
+ #endif
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 13151396d7563..d1063c3ad056f 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs102'
 pkgname=mozjs102
-version=102.8.0
-revision=3
+version=102.15.1
+revision=1
 build_wrksrc=js/src
 build_style=gnu-configure
 build_helper=rust
@@ -10,7 +10,7 @@ configure_args="--disable-jemalloc --disable-strip --disable-tests \
  --disable-optimize --disable-debug --enable-ctypes --enable-readline \
  --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
  --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
+hostmakedepends="make pkg-config python3.11 python3-setuptools python3-six perl m4
  rust cargo llvm12 clang"
 makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
  zlib-devel rust-std"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://spidermonkey.dev"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=47f8f6243bce8c2ef51adf8c9626bbf643e1c225dcb9ba5653a055ed5e76ca48
+checksum=09194fb765953bc6979a35aa8834118c453b9d6060bf1ec4e134551bad740113
 
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
@@ -40,6 +40,7 @@ pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
 	fi
+	ln -sf "/usr/bin/python3.11" "${XBPS_WRAPPERDIR}/python3"
 	export M4=m4
 	export AWK=awk
 	export AC_MACRODIR=../../build/autoconf

  parent reply	other threads:[~2024-02-05 11:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-22 11:12 [PR PATCH] " oreo639
2024-01-22 11:32 ` [PR PATCH] [Updated] " oreo639
2024-01-22 11:42 ` oreo639
2024-01-23  0:03 ` oreo639
2024-02-05 11:26 ` oreo639 [this message]
2024-02-05 13:16 ` [PR PATCH] [Updated] " oreo639
2024-02-06 10:14 ` oreo639
2024-02-06 10:40 ` [PR PATCH] [Merged]: " oreo639

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240205112634.07AFE2B7EA@inbox.vuxu.org \
    --to=oreo639@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).