summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1452041
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-05-01 00:51:37 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-05-01 00:51:37 +0000
commitfda179862d1da64ec4cd48af7731a48bab9c3938 (patch)
tree529a5e85eed7367e8f5d8cf4e7ed28ffa661c584 /www/firefox/files/patch-bug1452041
parentgames/openbor: update to 5110 (diff)
www/firefox: update to 60.0
- Add U2F support, required by Web Authentication [1] - Drop libv4l support to reduce maintenance Changes: https://www.mozilla.org/firefox/60.0/releasenotes/ PR: 226476 Tested by: tobik, jrm, D. Ebdrup, lwhsu Submitted by: Greg V [1] Security: 5aefc41e-d304-4ec8-8c82-824f84f08244 MFH: 2018Q2 Differential Revision: https://reviews.freebsd.org/D15186
Notes
Notes: svn path=/head/; revision=468751
Diffstat (limited to 'www/firefox/files/patch-bug1452041')
-rw-r--r--www/firefox/files/patch-bug145204128
1 files changed, 0 insertions, 28 deletions
diff --git a/www/firefox/files/patch-bug1452041 b/www/firefox/files/patch-bug1452041
deleted file mode 100644
index 32f0e3d68811..000000000000
--- a/www/firefox/files/patch-bug1452041
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 90944c5323c3
-Author: Martin Stransky <stransky@redhat.com>
-Date: Mon Apr 9 13:36:03 2018 +0200
-
- Bug 1452041 - nsClipboard::HasDataMatchingFlavors(): return immediately when there's no clipboard content, r=jhorak a=jcristau
-
- MozReview-Commit-ID: CTz0tRr3p57
-
- --HG--
- extra : rebase_source : 35453506a58e698d8f0b6e9681fb87da8511eb9c
- extra : source : 4b841d1c7ec0513eb080fb033f54bde12ccb7ddc
----
- widget/gtk/nsClipboard.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git widget/gtk/nsClipboard.cpp widget/gtk/nsClipboard.cpp
-index 36e8d6ad5cee..61d3ef53ca98 100644
---- widget/gtk/nsClipboard.cpp
-+++ widget/gtk/nsClipboard.cpp
-@@ -390,6 +390,8 @@ nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, uint32_t aLength,
-
- int targetNums;
- GdkAtom* targets = mContext->GetTargets(aWhichClipboard, &targetNums);
-+ if (!targets)
-+ return NS_OK;
-
- // Walk through the provided types and try to match it to a
- // provided type.