summaryrefslogtreecommitdiff
path: root/www/firefox-esr/files/patch-bug1321877
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-06-20 00:19:29 +0000
commit1ffba2ac4cb0152f6bea9c944279dd0c9b399151 (patch)
tree06db800746c0920701662665f78f38b492d43fbf /www/firefox-esr/files/patch-bug1321877
parentwww/firefox-esr: update to 52.9.0 (diff)
www/firefox-esr: remove in preparation for update
$ svn ci Sending Mk/Uses/gecko.mk Replacing www/firefox-esr Sending www/firefox-esr/Makefile Deleting www/firefox-esr/Makefile.options Sending www/firefox-esr/distinfo Deleting www/firefox-esr/files/patch-bug1435212 Sending www/firefox-esr/files/patch-z-bug1436911 Deleting www/firefox-esr/files/pkg-deinstall.in Deleting www/firefox-esr/files/pkg-install.in Replacing www/firefox-esr-i18n Sending www/firefox-esr-i18n/Makefile Sending www/firefox-esr-i18n/distinfo Transmitting file data ......done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" == Additional errors may compound and may not be accurate == Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr" Do not replace a file. This can lose history. Path: "/head/www/firefox-esr-i18n" == Pre-commit problem count: 12 svn: E165001: Your commit message was left in a temporary file: svn: E165001: '/path/to/head/svn-commit.tmp'
Diffstat (limited to 'www/firefox-esr/files/patch-bug1321877')
-rw-r--r--www/firefox-esr/files/patch-bug132187742
1 files changed, 0 insertions, 42 deletions
diff --git a/www/firefox-esr/files/patch-bug1321877 b/www/firefox-esr/files/patch-bug1321877
deleted file mode 100644
index 50b1b175dd3d..000000000000
--- a/www/firefox-esr/files/patch-bug1321877
+++ /dev/null
@@ -1,42 +0,0 @@
-commit a13d95795217
-Author: <tharvik@gmail.com>
-Date: Thu Dec 8 18:20:12 2016 -0600
-
- Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel
----
- image/Downscaler.h | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git image/Downscaler.h image/Downscaler.h
-index 21179a38f200..0bdef0eaa646 100644
---- image/Downscaler.h
-+++ image/Downscaler.h
-@@ -154,14 +154,14 @@ private:
- class Downscaler
- {
- public:
-- explicit Downscaler(const nsIntSize&)
-+ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0)
- {
- MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
- }
-
-- const nsIntSize& OriginalSize() const { return nsIntSize(); }
-- const nsIntSize& TargetSize() const { return nsIntSize(); }
-- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
-+ const nsIntSize& OriginalSize() const { return mSize; }
-+ const nsIntSize& TargetSize() const { return mSize; }
-+ const gfxSize& Scale() const { return mScale; }
-
- nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false)
- {
-@@ -177,6 +177,9 @@ public:
- DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
- void ResetForNextProgressivePass() { }
- const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
-+private:
-+ nsIntSize mSize;
-+ gfxSize mScale;
- };
-
- #endif // MOZ_ENABLE_SKIA