summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-system-openh264
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-02-27 14:42:51 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-02-27 14:42:51 +0000
commitc308de0164ec299c9914722e02f9e6176f6c5b89 (patch)
tree87818ee8a7843c06fbfd36d7cfd6ceb05961d08b /www/firefox/files/patch-system-openh264
parentgraphics/simage: add LICENSE (diff)
- Update Firefox to 36.0
- Update Firefox ESR to 31.5.0 - Update Thunderbird to 31.5.0 - Update libxul to 31.5.0 - Check if NS_NewNativeLocalFile() succeeds before using [1] - Remove DTRACE and GIO descriptions after r377838 and r314893 - bsd.gecko.mk: Prune conditionals for files removed 4 months ago Changes: https://www.mozilla.org/firefox/36.0/releasenotes/ Obtained from: PkgSrc [1] MFH: 2015Q1 X-MFH-With: r377953, r378253, r379485, r378529 Security: https://vuxml.freebsd.org/freebsd/99029172-8253-407d-9d8b-2cfeab9abf81.html
Notes
Notes: svn path=/head/; revision=380090
Diffstat (limited to 'www/firefox/files/patch-system-openh264')
-rw-r--r--www/firefox/files/patch-system-openh26412
1 files changed, 6 insertions, 6 deletions
diff --git a/www/firefox/files/patch-system-openh264 b/www/firefox/files/patch-system-openh264
index 3bbabcebf9f8..5215ddb43475 100644
--- a/www/firefox/files/patch-system-openh264
+++ b/www/firefox/files/patch-system-openh264
@@ -1,9 +1,9 @@
# Revert bug 1045209 to allow using absolute path
-diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp
+diff --git dom/media/gmp/GMPChild.cpp dom/media/gmp/GMPChild.cpp
index 1dde3ac..12c88cf 100644
---- content/media/gmp/GMPChild.cpp
-+++ content/media/gmp/GMPChild.cpp
+--- dom/media/gmp/GMPChild.cpp
++++ dom/media/gmp/GMPChild.cpp
@@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa
}
#endif
@@ -30,10 +30,10 @@ index 1dde3ac..12c88cf 100644
return true;
}
-diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp
+diff --git dom/media/gmp/GMPParent.cpp dom/media/gmp/GMPParent.cpp
index aa60acf..90878ca 100644
---- content/media/gmp/GMPParent.cpp
-+++ content/media/gmp/GMPParent.cpp
+--- dom/media/gmp/GMPParent.cpp
++++ dom/media/gmp/GMPParent.cpp
@@ -90,23 +90,16 @@
mService = aService;
mDirectory = aPluginDir;