CVS commit: pkgsrc/www/firefox

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Jan 27 01:36:21 UTC 2017

Modified Files:
        pkgsrc/www/firefox: distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-toolkit_library_moz.build

Log Message:
bump minimum nss version required, so make update works.
restore oss build by linking ossaudio (follow same format as alsa).


To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.85 -r1.86 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.267 pkgsrc/www/firefox/distinfo:1.268
--- pkgsrc/www/firefox/distinfo:1.267   Wed Jan 25 13:24:51 2017
+++ pkgsrc/www/firefox/distinfo Fri Jan 27 01:36:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.267 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: distinfo,v 1.268 2017/01/27 01:36:21 maya Exp $
 
 SHA1 (firefox-51.0.source.tar.xz) = e7219a81b16d34d92872b4604051ce5ddb818126
 RMD160 (firefox-51.0.source.tar.xz) = e6552e5cbc71edc3028dc11271822a598e243ce6
@@ -121,7 +121,7 @@ SHA1 (patch-toolkit_components_protobuf_
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = bd4388323851fcb7b10392d6a27f9bc56633a52e
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_library_libxul.mk) = 98d79e7ae52d4b54111512a98a03810e2bbe454d
-SHA1 (patch-toolkit_library_moz.build) = 14bfa40d02f760fb738266c4d63e010e34a28f90
+SHA1 (patch-toolkit_library_moz.build) = b807002797d8ea803be9446ebd179cf17b16f3ed
 SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 29ae1476560623bf1871c927d3728761112529e9
 SHA1 (patch-toolkit_moz.configure) = 851a9ed80072de0215863cf81cdbf674bf31271d
 SHA1 (patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = eacc4f45f724eb42869a1dba015e127e049fdec4

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.85 pkgsrc/www/firefox/mozilla-common.mk:1.86
--- pkgsrc/www/firefox/mozilla-common.mk:1.85   Sun Jan  1 14:44:03 2017
+++ pkgsrc/www/firefox/mozilla-common.mk        Fri Jan 27 01:36:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.85 2017/01/01 14:44:03 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.86 2017/01/27 01:36:21 maya Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -194,7 +194,7 @@ BUILDLINK_API_DEPENDS.libevent+=    libeven
 BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.10.10
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=    nss>=3.23nb1
+BUILDLINK_API_DEPENDS.nss+=    nss>=3.28.1
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.9 pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.10
--- pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.9      Wed Jan 25 13:24:51 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build  Fri Jan 27 01:36:21 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.9 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.10 2017/01/27 01:36:21 maya Exp $
 
 * Support system libraries
+* Restore OSS support
 
---- toolkit/library/moz.build.orig     2017-01-22 14:52:50.338659055 +0000
+--- toolkit/library/moz.build.orig     2017-01-16 16:16:52.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -241,6 +241,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+@@ -234,6 +234,21 @@ if CONFIG['MOZ_SYSTEM_PNG']:
  if CONFIG['MOZ_SYSTEM_HUNSPELL']:
      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
@@ -26,3 +27,13 @@ $NetBSD: patch-toolkit_library_moz.build
  if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
+@@ -246,6 +261,9 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
+ if CONFIG['MOZ_ALSA']:
+     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+ 
++if CONFIG['MOZ_OSS']:
++    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
++
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
+