Extra semicolon at the end of SkMatrix::I() declaration breaks build on OpenBSD

RESOLVED FIXED in mozilla15

Status

()

Core
Graphics
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: gaston, Assigned: gaston)

Tracking

Trunk
mozilla15
Other
OpenBSD
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments)

(Assignee)

Description

5 years ago
Patch in a few, see build failure at http://buildbot.rhaalovely.net/builders/mozilla-central-amd64/builds/407/steps/build/logs/stdio

build/gfx/skia/src/core/SkMatrix.cpp:1723: error: extra ';'
(Assignee)

Updated

5 years ago
Depends on: 755869
(Assignee)

Comment 1

5 years ago
Created attachment 628252 [details] [diff] [review]
remove extra semicolon

Patch i'm currently testing. Note that's a fallout from the main skia update.
Assignee: nobody → landry
Attachment #628252 - Flags: review?(gwright)
(Assignee)

Comment 2

5 years ago
To be more precise the patch effectively reverts http://hg.mozilla.org/mozilla-central/diff/5fb409f61b93/gfx/skia/src/core/SkMatrix.cpp from the update
(Assignee)

Comment 3

5 years ago
And it fixes the build here, fwiw.
Status: NEW → ASSIGNED
Comment on attachment 628252 [details] [diff] [review]
remove extra semicolon

Review of attachment 628252 [details] [diff] [review]:
-----------------------------------------------------------------

I'll take it. Can you upstream the patch? (Along with fix-comma-end-enum-list.patch, preferably.)

::: gfx/skia/update.sh
@@ +115,5 @@
>  # Bug 731384 - Fix compile errors on older versions of clang
>  patch -p3 < SkPostConfig.patch
>  # Bug 751814 - Various Skia fixes for ARM without EDSP and ARMv6+
>  patch -p3 < arm-fixes.patch
> +# Bug 759671 - Fix extra simicolon at end of SkMatrix::I() declaration

semicolon
Attachment #628252 - Flags: review?(gwright) → review+
(Assignee)

Updated

5 years ago
Keywords: checkin-needed
(Assignee)

Comment 5

5 years ago
Argh. I've realized that this was already fixed by fix-comma-end-enum-list.patch (see bug 722011, comment 1) so all that's needed is to reapply that chunk which was lost in https://hg.mozilla.org/mozilla-central/rev/04f6554beaa3, there's no need for a newer patch (or the corresponding chunk should be removed from.fix-comma-end-enum-list.patch)
Keywords: checkin-needed
(Assignee)

Comment 6

5 years ago
Created attachment 628260 [details] [diff] [review]
Onl apply missing chunk from 722011
Attachment #628260 - Flags: review?(Ms2ger)
(Assignee)

Updated

5 years ago
Attachment #628260 - Attachment is patch: true
Comment on attachment 628260 [details] [diff] [review]
Onl apply missing chunk from 722011

Review of attachment 628260 [details] [diff] [review]:
-----------------------------------------------------------------

Er, yes, I checked the other patch and missed the fact that they were actually fixing the same semicolon >.>
Attachment #628260 - Flags: review?(Ms2ger) → review+

Updated

5 years ago
Keywords: checkin-needed
(Assignee)

Updated

5 years ago
Attachment #628260 - Flags: checkin?(dzbarsky)
Keywords: checkin-needed
Comment on attachment 628260 [details] [diff] [review]
Onl apply missing chunk from 722011

https://hg.mozilla.org/integration/mozilla-inbound/rev/ebafa3d97c19
Attachment #628260 - Flags: checkin?(dzbarsky) → checkin+
https://hg.mozilla.org/mozilla-central/rev/ebafa3d97c19
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla15
You need to log in before you can comment on or make changes to this bug.