diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
commit | e344179e4710fcd9e8b27f21ad966399c6676062 (patch) | |
tree | 25470098899348b52b879360dae665e7d4b833ee /mail/thunderbird/files/patch-bug1321877 | |
parent | - missed a '+" (diff) |
mail/thunderbird: drop patches in preparation for update
$ svn commit
Sending Mk/Uses/gecko.mk
Sending mail/thunderbird/Makefile
Sending mail/thunderbird/distinfo
Sending mail/thunderbird/files/patch-addon-search
Replacing mail/thunderbird/files/patch-bug1021761
Adding mail/thunderbird/files/patch-bug1144632
Deleting mail/thunderbird/files/patch-bug1186967
[...]
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/mail/thunderbird/files/patch-bug702179"
== Additional errors may compound and may not be accurate ==
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys"
[...]
Pointy hat to: portmgr (multi-steps are error prone)
Diffstat (limited to 'mail/thunderbird/files/patch-bug1321877')
-rw-r--r-- | mail/thunderbird/files/patch-bug1321877 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/mail/thunderbird/files/patch-bug1321877 b/mail/thunderbird/files/patch-bug1321877 deleted file mode 100644 index f7f79285a328..000000000000 --- a/mail/thunderbird/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 ---- mozilla/image/Downscaler.h -+++ mozilla/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 |