diff --git a/mingw-w64-nspr/PKGBUILD b/mingw-w64-nspr/PKGBUILD index c87477a86f..a7531d9087 100644 --- a/mingw-w64-nspr/PKGBUILD +++ b/mingw-w64-nspr/PKGBUILD @@ -4,7 +4,7 @@ _realname=nspr pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.17 +pkgver=4.19 pkgrel=1 pkgdesc="Netscape Portable Runtime (mingw-w64)" arch=('any') @@ -21,10 +21,10 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_ nspr-4.10.2_staticbuild.patch nspr-4.10.2_x64.patch manifest) -sha256sums=('590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095' +sha256sums=('2ed95917fa2277910d1d1cf36030607dccc0ba522bba08e2af13c113dcd8f729' '1894bc68a0badd6e6f68f66abc4c6cd8e222791dd194f6b631ce536011ab6707' '725f8d6da56e44dba7669c498ed66af1b2145640115fd9bae9663c9364d9fde9' - 'afaaadadaf7786c4e097e4f9575ad161e4872aa124fe4084713a8cc8712560a3' + 'e3358ed82a289b76b23ceb95308a517145e8c915c0056af58ad1193db870269a' '4f47fbfce21a5634094d6a0c7fdd29f2bbdcb352074b8c498ba23a9f4f859b29' 'bdb7138b12b7fbc32e906347e0dc963342316032ac3db8586683e54e40126e26' '599ab9edb21568c02c4e6e96b366e51c042a9e789b72b9e7d9b7acc283757ab4' diff --git a/mingw-w64-nspr/nspr-4.10.2_autotools.patch b/mingw-w64-nspr/nspr-4.10.2_autotools.patch index 26099c740e..e080a00a36 100644 --- a/mingw-w64-nspr/nspr-4.10.2_autotools.patch +++ b/mingw-w64-nspr/nspr-4.10.2_autotools.patch @@ -50,7 +50,7 @@ OBJ_SUFFIX CPU_ARCH PR_MD_ARCH_DIR -@@ -3058,6 +3058,7 @@ +@@ -5615,6 +5615,7 @@ OBJ_SUFFIX=o LIB_SUFFIX=a @@ -58,7 +58,7 @@ DLL_SUFFIX=so ASM_SUFFIX=s MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -@@ -4529,6 +4530,7 @@ +@@ -7112,6 +7112,7 @@ CC="$CC -mwindows" CXX="$CXX -mwindows" DLL_SUFFIX=dll @@ -66,7 +66,7 @@ MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' RC=$WINDRES # Use temp file for windres (bug 213281) -@@ -4545,6 +4547,7 @@ +@@ -7127,6 +7127,7 @@ GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' OBJ_SUFFIX=obj LIB_SUFFIX=lib @@ -74,7 +74,7 @@ DLL_SUFFIX=dll # Determine compiler version -@@ -4660,11 +4663,11 @@ +@@ -7246,11 +7246,11 @@ if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" @@ -90,7 +90,7 @@ fi fi # GNU_CC -@@ -4774,6 +4777,7 @@ +@@ -7736,6 +7736,7 @@ OBJ_SUFFIX=obj LIB_SUFFIX=lib @@ -98,16 +98,8 @@ DLL_SUFFIX=dll MKSHLIB='$(LD) -DLL $(DSO_LDOPTS) -OUT:$@' -@@ -5356,6 +5360,7 @@ - - USE_PTHREADS=1 - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB= - DSO_LDOPTS= -@@ -5440,6 +5445,7 @@ - EOF +@@ -7801,6 +7801,7 @@ + $as_echo "#define TCPV40HDRS 1" >>confdefs.h LIB_SUFFIX=lib + IMPORT_LIB_SUFFIX=lib @@ -116,7 +108,7 @@ PR_MD_ARCH_DIR=os2 --- configure.in Tue Nov 12 04:54:52 2013 +++ configure.in Tue Nov 26 11:22:37 2013 -@@ -831,6 +831,7 @@ +@@ -845,6 +845,7 @@ dnl ======================================================== OBJ_SUFFIX=o LIB_SUFFIX=a @@ -124,7 +116,7 @@ DLL_SUFFIX=so ASM_SUFFIX=s MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -@@ -1876,6 +1877,7 @@ +@@ -1912,6 +1913,7 @@ CC="$CC -mwindows" CXX="$CXX -mwindows" DLL_SUFFIX=dll @@ -132,7 +124,7 @@ MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' RC=$WINDRES # Use temp file for windres (bug 213281) -@@ -1892,6 +1894,7 @@ +@@ -1926,6 +1928,7 @@ GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' OBJ_SUFFIX=obj LIB_SUFFIX=lib @@ -140,7 +132,7 @@ DLL_SUFFIX=dll # Determine compiler version -@@ -2000,11 +2003,11 @@ +@@ -1945,11 +1948,11 @@ if test "$OS_TARGET" = "WINNT"; then CFLAGS="$CFLAGS -GT" @@ -156,15 +148,7 @@ fi fi # GNU_CC -@@ -2075,6 +2078,7 @@ - - OBJ_SUFFIX=obj - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB='$(LD) -DLL $(DSO_LDOPTS) -OUT:$@' - -@@ -2431,6 +2435,7 @@ +@@ -2455,6 +2458,7 @@ AC_DEFINE(HAVE_SOCKLEN_T) USE_PTHREADS=1 LIB_SUFFIX=lib @@ -172,7 +156,7 @@ DLL_SUFFIX=dll MKSHLIB= DSO_LDOPTS= -@@ -2485,6 +2490,7 @@ +@@ -2509,6 +2513,7 @@ AC_DEFINE(BSD_SELECT) AC_DEFINE(TCPV40HDRS) LIB_SUFFIX=lib @@ -180,7 +164,7 @@ DLL_SUFFIX=dll RC=rc.exe PR_MD_ARCH_DIR=os2 -@@ -3145,6 +3151,7 @@ +@@ -3083,6 +3087,7 @@ AC_SUBST(OBJ_SUFFIX) AC_SUBST(LIB_SUFFIX)