main/nspr: upgrade to 4.10

4 files changed, 5 insertions, 108 deletions

diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index 34087da00..1b5a9f43d 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nspr
-pkgver=4.9.6
+pkgver=4.10
 pkgrel=0
 pkgdesc="Netscape Portable Runtime"
 url="http://www.mozilla.org/projects/nspr/"
@@ -10,9 +10,6 @@ depends=
 makedepends="autoconf automake sed"
 subpackages="$pkgname-dev"
 source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz
-	nspr-4.7.0-prtime.patch
-	nspr-4.8-config.patch
-	nspr-bb-shell.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -27,10 +24,6 @@ prepare() {
 			;;
 		esac
 	done
-	# respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		mozilla/nsprpub/config/rules.mk
-	cd mozilla/nsprpub && rm -f aclocal.m4 && aclocal && autoconf
 }
 
 build() {
@@ -39,7 +32,7 @@ build() {
 		conf="--enable-64bit"
 	fi
 	cd "$_builddir"/build
-	../mozilla/nsprpub/configure \
+	../nspr/configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -52,7 +45,6 @@ build() {
 
 package() {
 	local file= 
-	replaces="nspr-dev"
 
 	cd "$_builddir"/build
 	make DESTDIR="$pkgdir" install || return 1
@@ -69,15 +61,6 @@ package() {
 		"$pkgdir"/usr/include/nspr/md
 }
 
-md5sums="62b1e9d376d503d972f90c3c0031d879  nspr-4.9.6.tar.gz
-c48e1f47799c1cff7e3bf46dc0e653f1  nspr-4.7.0-prtime.patch
-c790c638a7c9fd1d731272f464f065c6  nspr-4.8-config.patch
-6574eabdfbfcd246e0dfaf1aa8b0e695  nspr-bb-shell.patch"
-sha256sums="7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9  nspr-4.9.6.tar.gz
-6eac39e0f7bac2eaf38ce918547345e02c61c1236b8db186f495072a6c014709  nspr-4.7.0-prtime.patch
-18c730e1e02d23b64f10f72b18b6887ead49b7d032afd44a86902ce0680cbd60  nspr-4.8-config.patch
-067642b22a49e2feb15a9bab7cf4634df1873218f378affb4f6798e3664f3a31  nspr-bb-shell.patch"
-sha512sums="635abfbf982d073803a76dc413097b7ac38d415c395e4a018d024f4620903e494b08f6e659ce0dfab06dc73eb7979c92824701bb613f8519b151e686811d3300  nspr-4.9.6.tar.gz
-f66eeadfef56a63214c069b71da11d425644ca1db13ac803cf07c76cb68f47ec0f919d342a5c5f8d1d6c29d0438390b29885f4d0936fbbef1904e3c60e45f6a1  nspr-4.7.0-prtime.patch
-0e34d2729cb9cc2b4d977f59f4b2676be9f71a644eae429da85b416446c3665ffb6ca34fd6e9229ac9c923287a9147e3440f88e2998bc88a1f9d3f41b4e7e779  nspr-4.8-config.patch
-cdf5f4eec6ed0a103d6cd328fcadb65dc37291e31bacccf30875259a0b22cfc04d7fbcab90a4602cc3b9b37a401016eb64f8b7a3e747430fe98843a5ec722e0a  nspr-bb-shell.patch"
+md5sums="f5466def95726b3c900d8a0227bdd034  nspr-4.10.tar.gz"
+sha256sums="0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16  nspr-4.10.tar.gz"
+sha512sums="80d511e3bdce9a1efc577acc1671f507bef3d6ca933705f67a7aba567ff7b981e9cde70c2da6fbde82852938b779baa0058c82f937d4ac3e672f6d8e7bdefe8b  nspr-4.10.tar.gz"
diff --git a/main/nspr/nspr-4.7.0-prtime.patch b/main/nspr/nspr-4.7.0-prtime.patch
deleted file mode 100644
index 74d5534d5..000000000
--- a/main/nspr/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/mozilla/nsprpub/pr/src/misc/prtime.c.orig	2007-09-14 19:41:08.000000000 +0200
-+++ b/mozilla/nsprpub/pr/src/misc/prtime.c	2007-09-14 19:42:17.000000000 +0200
-@@ -1536,7 +1536,7 @@
-                 case TT_EET: zone_offset =  2 * 60; break;
-                 case TT_JST: zone_offset =  9 * 60; break;
-                 default:
--                  PR_ASSERT (0);
-+                  return PR_FAILURE;
-                   break;
-                 }
-         }
-@@ -1578,11 +1578,12 @@
-           struct tm localTime;
-           time_t secs;
- 
--          PR_ASSERT(result->tm_month > -1 &&
-+          if (!(result->tm_month > -1 &&
-                     result->tm_mday > 0 &&
-                     result->tm_hour > -1 &&
-                     result->tm_min > -1 &&
--                    result->tm_sec > -1);
-+                    result->tm_sec > -1))
-+		    return PR_FAILURE;
- 
-             /*
-              * To obtain time_t from a tm structure representing the local
diff --git a/main/nspr/nspr-4.8-config.patch b/main/nspr/nspr-4.8-config.patch
deleted file mode 100644
index 4db2517e4..000000000
--- a/main/nspr/nspr-4.8-config.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/mozilla/nsprpub/lib/libc/src/Makefile.in.orig	2005-06-01 14:28:26.000000000 +0000
-+++ b/mozilla/nsprpub/lib/libc/src/Makefile.in	2006-01-15 02:50:39.000000000 +0000
-@@ -112,6 +112,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
- 
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- a/mozilla/nsprpub/lib/ds/Makefile.in.orig	2005-06-01 14:28:25.000000000 +0000
-+++ b/mozilla/nsprpub/lib/ds/Makefile.in	2006-01-15 02:52:30.000000000 +0000
-@@ -102,6 +102,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
- 
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- a/mozilla/nsprpub/pr/src/Makefile.in.orig	2005-06-01 14:28:27.000000000 +0000
-+++ b/mozilla/nsprpub/pr/src/Makefile.in	2006-01-15 03:29:36.000000000 +0000
-@@ -168,6 +168,7 @@
- else
- OS_LIBS		= -ldl
- endif
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
- endif
- 
- ifeq ($(OS_ARCH),HP-UX)
---- a/mozilla/nsprpub/config/nspr-config.in.orig	2005-05-11 00:53:41.000000000 +0000
-+++ b/mozilla/nsprpub/config/nspr-config.in	2006-01-15 06:37:58.000000000 +0000
-@@ -122,7 +122,7 @@
- fi
- 
- if test "$echo_libs" = "yes"; then
--      libdirs=-L$libdir
-+      libdirs="-Wl,-R$libdir -L$libdir"
-       if test -n "$lib_plds"; then
- 	libdirs="$libdirs -lplds${major_version}"
-       fi
diff --git a/main/nspr/nspr-bb-shell.patch b/main/nspr/nspr-bb-shell.patch
deleted file mode 100644
index a336c2a56..000000000
--- a/main/nspr/nspr-bb-shell.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
-index 25dcca1..b508762 100644
---- a/mozilla/nsprpub/configure.in
-+++ b/mozilla/nsprpub/configure.in
-@@ -511,7 +511,7 @@ if test "$target" != "$host"; then
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC