summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon>2015-08-19 11:37:04 +0000
committerryoon <ryoon>2015-08-19 11:37:04 +0000
commit2bcd537e0da3108e5ea0abb75cb5d1db0b2faf58 (patch)
tree088f4ff4a69377b66cca74950efadaa256684073
parent933669c68e4b056716ac34d544abbfc30cce29ff (diff)
downloadpkgsrc-2bcd537e0da3108e5ea0abb75cb5d1db0b2faf58.tar.gz
Update to 40.0.2
* Disable OSS support explicitly under NetBSD. Changelog: New Enabled API allowing Windows 10 users to open settings dialog (1193196) Fixed mozalloc.lib was missing from the xulrunner package (1168291) Fixed Fix a startup crash with some combination of hardware and drivers (1160295)
-rw-r--r--www/firefox/Makefile5
-rw-r--r--www/firefox/distinfo10
-rw-r--r--www/firefox/patches/patch-aa6
3 files changed, 10 insertions, 11 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index b33e1e78631..3fad88321ab 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.222 2015/08/12 05:41:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.223 2015/08/19 11:37:04 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 40.0
-MOZ_BRANCH_MINOR=
+MOZ_BRANCH_MINOR= .2
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index b93a1221001..c95137f86b5 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.211 2015/08/12 05:41:30 ryoon Exp $
+$NetBSD: distinfo,v 1.212 2015/08/19 11:37:04 ryoon Exp $
-SHA1 (firefox-40.0.source.tar.bz2) = 48483e5738182f8567e2b6d2e29bd6bc1812d3eb
-RMD160 (firefox-40.0.source.tar.bz2) = 046cd9d0ce0952238b60bb7351e2009a101a74d9
-Size (firefox-40.0.source.tar.bz2) = 178288925 bytes
-SHA1 (patch-aa) = d460082b7bfa0d96db95ddb904208019195e3b55
+SHA1 (firefox-40.0.2.source.tar.bz2) = b5d79fa3684284bfeb7277e99c756b8688e8121d
+RMD160 (firefox-40.0.2.source.tar.bz2) = ad8dfd2fa089ccdd0e0346bbf5a37f1af2b17830
+Size (firefox-40.0.2.source.tar.bz2) = 178279170 bytes
+SHA1 (patch-aa) = 4cd96ed9fc9eb9b36077a0382c7c5c3f37f435e5
SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 15e9529af62..19fa72f19ce 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.38 2015/07/03 10:25:40 ryoon Exp $
+$NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
* The profiler does not support Darwin/PPC so don't try to enable it
on that platform.
@@ -273,7 +273,7 @@ $NetBSD: patch-aa,v 1.38 2015/07/03 10:25:40 ryoon Exp $
+
+dnl If using Linux, Solaris or BSDs, ensure that OSS is available
+case "$OS_TARGET" in
-+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
++Linux|SunOS|DragonFly|FreeBSD|GNU/kFreeBSD)
+ MOZ_OSS=1
+ ;;
+esac
@@ -296,7 +296,7 @@ $NetBSD: patch-aa,v 1.38 2015/07/03 10:25:40 ryoon Exp $
+ dnl Prefer 4Front implementation
+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
+ if test "$OSSPREFIX" != "yes"; then
-+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
++ oss_conf=${OSSPREFIX}/etc/oss.conf
+ if test -f "$oss_conf"; then
+ . "$oss_conf"
+ else