commit: 0e62c9e0029c4a4de2b8e3c1ba75312854340fea
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 02:14:09 2016 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 02:14:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0e62c9e0
Update to beta6, include upstream fix for non skia builds
www-client/firefox/Manifest | 2 +-
.../firefox/files/firefox-no-skia-fixup.patch | 30 ++++++++++++++++++++++
...44.0_beta4.ebuild => firefox-44.0_beta6.ebuild} | 3 ++-
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d8086bf..fdb285c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -80,4 +80,4 @@ DIST firefox-43.0-zh-CN.xpi 493639 SHA256
73c74a35f7862f6e583d2fd9edb6fcd3e565c5
DIST firefox-43.0-zh-TW.xpi 485317 SHA256
488fb84380b3729e2c78c2bb5c9d4046988f4c457727ac19c9458f92f1fe72fb SHA512
e5a32805e3e68b54b3ebe19f5b1dc9a606df232cdc7df301a57d6ba39ab6d69347c27480c2162e30cbdcf1601364c47f3811398751ab4f63f94763772212bbbd
WHIRLPOOL
2273baf3e84b7f390a9c121a125902dcf1d625ebf4b96451f78642f16dd2e62b5abf4cda70a66daaec25d68e15e5bc1cd0cb460cde26f18c17008febf6198396
DIST firefox-43.0.source.tar.xz 175414296 SHA256
a5b16741dcce9344ca71e39e0efb0e7e1336ca5160cb9b6b12f8985f402d8fea SHA512
3ca37428d1b02ba2609ec526e86ab96563b403a03efde8439cbb4acdb282b5970ccb6a14266483c839389d59e07f6b0297314890ee04a669ba2d4b10bc4cb738
WHIRLPOOL
14d8d90452bf6d0e3965f0c8050d0dd4771f1a00a6cc68f6ae9e26334e5a2c5cad9fae92d51f0f677b07aea3120e75686655cbd5c6bcf7f0b5f84d9a1ca4553f
DIST firefox-44.0-patches-0.3.tar.xz 13724 SHA256
f10d7b8009f720268ffd8ce4354a91ad8604b8eb67cf85fa97250915ac1de639 SHA512
b4d93a506b2b1cc264e6407ec509b6fc6fa7543e99e90edb2ef1049ed087d50a1b36331c8dceb978f15de59483c737bac4f16753634418852a7beadff3834fa6
WHIRLPOOL
8a95ecdba91ace71ca250313f597eff87f845e9c33944ab7325690361b2eff449a346a90afd91d81bcdd39d1c541a0a67603f43be3c0b8828da1a81935c98aa6
-DIST firefox-44.0b4.source.tar.xz 182407048 SHA256
6b5b2ebcb94618747281a24fc3c6504b436bc3413283b77935484730bc21b9c5 SHA512
c9def31db89fc40295303a883b8c69bc62b796ed3604192e8945288b3edc1e49f93bea07f7c602992ad0a956cc3cf59e55ea5f3cb54b4faada0bbb7df0487e28
WHIRLPOOL
3f75dc7e87d6aa92a256b7acf1ef4e4326db7cf87c9f00db0765e65fb4e7bc19cd9b87bcefc291aed3b61796500506c4c005f00e1a248f3f52cd124dfb499913
+DIST firefox-44.0b6.source.tar.xz 182438184 SHA256
2e8dd8c4f191631142e624ba110daaeb451dfeeaa02554da5a7ac852f88af54e SHA512
2506889d2065b3953e6b3bf3edb0c02614c4e1b1419bb1fb1984c44e104cbc13765ce5f2f36f9a69c5030274eae90c90dbcb1f5b9a6615175982cafd698b0fdf
WHIRLPOOL
8701c6d57c34769dc04eb9ab6db03dc77458ea35b19222ef36fa0dba08354f6a2b51622506f969ee3dc08ada9ee0650a6576db554d4e87fbabf8f25a1667d900
diff --git a/www-client/firefox/files/firefox-no-skia-fixup.patch
b/www-client/firefox/files/firefox-no-skia-fixup.patch
new file mode 100644
index 0000000..4bcb608
--- /dev/null
+++ b/www-client/firefox/files/firefox-no-skia-fixup.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Steve Singer <st...@ssinger.info>
+# Date 1451504814 18000
+# Wed Dec 30 14:46:54 2015 -0500
+# Node ID 990f442c885d2b906ac3e18ee72f34478788c6fa
+# Parent c690c50b2b543b420803e8192d6e08e06b20e0a3
+Bug 1235859 - Add FrameSize to non-skia downscaler.
+
+diff --git a/image/Downscaler.h b/image/Downscaler.h
+--- a/image/Downscaler.h
++++ b/image/Downscaler.h
+@@ -166,16 +166,17 @@ public:
+
+ bool IsFrameComplete() const { return false; }
+ uint8_t* RowBuffer() { return nullptr; }
+ void ClearRow(uint32_t = 0) { }
+ void CommitRow() { }
+ bool HasInvalidation() const { return false; }
+ DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
+ void ResetForNextProgressivePass() { }
++ const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
+ };
+
+ #endif // MOZ_ENABLE_SKIA
+
+
+
+ } // namespace image
+ } // namespace mozilla
+
diff --git a/www-client/firefox/firefox-44.0_beta4.ebuild
b/www-client/firefox/firefox-44.0_beta6.ebuild
similarity index 99%
rename from www-client/firefox/firefox-44.0_beta4.ebuild
rename to www-client/firefox/firefox-44.0_beta6.ebuild
index 8549e8e..034934d 100644
--- a/www-client/firefox/firefox-44.0_beta4.ebuild
+++ b/www-client/firefox/firefox-44.0_beta6.ebuild
@@ -134,7 +134,8 @@ src_prepare() {
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
- epatch "${FILESDIR}"/${PN}-44-qt-widget-fix.patch
+ epatch "${FILESDIR}"/${PN}-44-qt-widget-fix.patch \
+ "${FILESDIR}"/${PN}-no-skia-fixup.patch
# Allow user to apply any additional patches without modifing ebuild
epatch_user
