update firefox and dependencies

4 files changed, 4 insertions, 42 deletions

diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index eaa679d95..33063d67f 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nspr
-PKG_VERSION:=		4.9.6
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		62b1e9d376d503d972f90c3c0031d879
+PKG_VERSION:=		4.10.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f0d254da0b2b870d9a5fa094e879d4b8
 PKG_DESCR:=		Netscape Portable Runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.mozilla.org/projects/nspr/
@@ -15,7 +15,7 @@ PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!cris
 
-WRKSRC=			${WRKDIST}/mozilla/nsprpub
+WRKSRC=			${WRKDIST}/nspr
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
deleted file mode 100644
index 9e925158b..000000000
--- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- nspr-4.9.5.orig/mozilla/nsprpub/config/Makefile.in	2012-11-14 00:17:57.000000000 +0100
-+++ nspr-4.9.5/mozilla/nsprpub/config/Makefile.in	2013-02-27 16:29:38.000000000 +0100
-@@ -113,7 +113,7 @@ endif
- 
- $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
- 	@$(MAKE_OBJDIR)
--	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
-+	$(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
- 
- install:: nspr.m4
- 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure
deleted file mode 100644
index cfaa795ed..000000000
--- a/package/nspr/patches/patch-mozilla_nsprpub_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- nspr-4.9.6.orig/mozilla/nsprpub/configure	2013-03-14 18:34:31.000000000 +0100
-+++ nspr-4.9.6/mozilla/nsprpub/configure	2013-10-21 15:29:36.000000000 +0200
-@@ -2855,7 +2855,7 @@ esac
- if test "$cross_compiling"  = "yes"; then
-     CROSS_COMPILE=1
- else
--    CROSS_COMPILE=
-+    CROSS_COMPILE=1
- fi
- 
- echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c b/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
deleted file mode 100644
index 99ecc22dc..000000000
--- a/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
+++ /dev/null
@@ -1,16 +0,0 @@
-* patch from alpinelinux
-
---- nspr-4.9.6.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2012-09-28 16:33:48.000000000 +0200
-+++ nspr-4.9.6/mozilla/nsprpub/pr/src/misc/prnetdb.c	2013-10-21 18:07:57.000000000 +0200
-@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
- 
--#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
--	|| (defined(LINUX) && defined(_REENTRANT) \
--        && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
--        && !defined(ANDROID))
-+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif