nspr: update to 4.35

This commit is contained in:
Biswapriyo Nath
2022-09-20 20:17:24 +05:30
parent e8f1dc2be4
commit 3690f10e5e
2 changed files with 24 additions and 6 deletions

View File

@@ -0,0 +1,15 @@
--- nspr/pr/src/md/windows/ntio.c
+++ nspr/pr/src/md/windows/ntio.c
@@ -303,9 +303,9 @@
desc = mdOlp->data.mw.desc;
PR_ASSERT(desc != NULL);
mwstatus = rv ? PR_MW_SUCCESS : PR_MW_FAILURE;
- if (InterlockedCompareExchange((PVOID *)&desc->outcome,
- (PVOID)mwstatus, (PVOID)PR_MW_PENDING)
- == (PVOID)PR_MW_PENDING) {
+ if (InterlockedCompareExchange(&desc->outcome,
+ mwstatus, PR_MW_PENDING)
+ == PR_MW_PENDING) {
if (mwstatus == PR_MW_SUCCESS) {
desc->bytesRecv = bytes;
} else {

View File

@@ -4,18 +4,19 @@
_realname=nspr
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.34.1
pkgver=4.35
pkgrel=1
pkgdesc="Netscape Portable Runtime (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
license=(MPL2)
license=('spdx:MPL-2.0')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "zip" "${MINGW_PACKAGE_PREFIX}-autotools")
options=('staticlibs' 'strip' '!emptydirs')
source=(https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_realname}-${pkgver}.tar.gz
https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/moztools-static.zip
0001-fix-integer-casting.patch
nspr-4.10.6-mswsock.patch
nspr-4.10.2_autotools.patch
nspr-4.10.2_mingw.patch
@@ -23,8 +24,9 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_
nspr-4.10.2_x64.patch
nspr-4.34_aarch64.patch
nsinstall.exe.manifest)
sha256sums=('c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f'
sha256sums=('7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f'
'1894bc68a0badd6e6f68f66abc4c6cd8e222791dd194f6b631ce536011ab6707'
'f41e9ef3f2147512ae1e3fb9ea1df634fa089dffa3028b908ac7a08f95e370d1'
'725f8d6da56e44dba7669c498ed66af1b2145640115fd9bae9663c9364d9fde9'
'3108ea02a33dbe8d612b70c44b60826d8beea1bbfa907668dc798f8061fb4ad4'
'4f47fbfce21a5634094d6a0c7fdd29f2bbdcb352074b8c498ba23a9f4f859b29'
@@ -35,6 +37,7 @@ sha256sums=('c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f'
prepare() {
cd ${srcdir}/${_realname}-${pkgver}/nspr
patch -p1 -i ${srcdir}/0001-fix-integer-casting.patch
patch -p1 -i ${srcdir}/nspr-4.10.6-mswsock.patch
patch -p0 -i ${srcdir}/nspr-4.10.2_autotools.patch
patch -p0 -i ${srcdir}/nspr-4.10.2_mingw.patch
@@ -47,8 +50,8 @@ prepare() {
}
build() {
[[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
if [ "$CARCH" = "x86_64" ]; then
_confflags="--enable-64bit"
else
@@ -69,7 +72,7 @@ build() {
}
package() {
cd "${srcdir}"/build-${CARCH}
cd "${srcdir}/build-${MSYSTEM}"
PATH="$PATH:${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install
mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/