diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2017-02-28 04:32:28 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2017-02-28 04:32:28 +0000 |
commit | b139b27679e877bf15bf3c479c509083873b2cd5 (patch) | |
tree | 609ef5a97fb0ae2966c62b228dd41191cb69dda8 /www/firefox/files/patch-bug1320991 | |
parent | multimedia/plexmediaserver{-plexpass}: Add option for Plex Relay (diff) |
www/firefox: update to 52.0 (rc1)
More candidates are likely to come before the official announcement (aka
the rush hour) scheduled on 2017-03-07. This one intended to pick up upstream
security fixes earlier while looking for downstream regressions.
Changes: https://www.mozilla.org/firefox/52.0/releasenotes/
Security: 96eca031-1313-4daf-9be2-9d6e1c4f1eb5
MFH: 2017Q1 (piling up, requires r431637 + r434531)
Diffstat (limited to 'www/firefox/files/patch-bug1320991')
-rw-r--r-- | www/firefox/files/patch-bug1320991 | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/www/firefox/files/patch-bug1320991 b/www/firefox/files/patch-bug1320991 deleted file mode 100644 index 3c2daff9428f..000000000000 --- a/www/firefox/files/patch-bug1320991 +++ /dev/null @@ -1,55 +0,0 @@ -commit 454e2dbe1b4f -Author: Mike Shal <mshal@mozilla.com> -Date: Tue Dec 20 16:37:18 2016 -0500 - - Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium - - The problem with the modules/libmar/tests/moz.build file when building - --with-system-nspr and --with-system-nss is that the nss libraries don't - exist in the tree, so they fail when trying to copy into the test - directory. - - However, it turns out that the libraries copied into the test directory - aren't even used when building with an in-tree copy, because the - xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we - use the dist/bin copies anyway for an in-tree build, we can stop copying - them into the test directory and simultaneously fix the --with-system - build. - - The DEFINES can also go away since this directory doesn't actually build - anything. - - MozReview-Commit-ID: Bk2f28wc9ZJ ---- - modules/libmar/tests/moz.build | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build -index ee72571b0c6b..9642553e8aa2 100644 ---- modules/libmar/tests/moz.build -+++ modules/libmar/tests/moz.build -@@ -6,24 +6,7 @@ - - XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] - --DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] -- - if CONFIG['OS_TARGET'] != 'Android': -- nss_files = ['nss3'] -- if not CONFIG['MOZ_FOLD_LIBS']: -- nss_files.extend([ -- 'nssutil3', -- 'plc4', -- 'nspr4', -- 'plds4', -- ]) -- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( -- ['!/dist/bin/%s%s%s' % ( -- CONFIG['DLL_PREFIX'], -- name, -- CONFIG['DLL_SUFFIX'], -- ) for name in nss_files] -- ) - TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ - '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], - ] |