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

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Landry Breuil (:gaston)]

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 ';'

Comment 1

[Landry Breuil (:gaston)]

Attachment: remove extra semicolon

Patch i'm currently testing. Note that's a fallout from the main skia update.

Comment 2

[Landry Breuil (:gaston)]

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

Comment 3

[Landry Breuil (:gaston)]

And it fixes the build here, fwiw.

Comment 4

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

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

Comment 5

[Landry Breuil (:gaston)]

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)

Comment 6

[Landry Breuil (:gaston)]

Attachment: Onl apply missing chunk from 722011

Comment 7

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

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 >.>

Comment 8

[David Zbarsky (:dzbarsky)]

Comment on attachment 628260 [details] [diff] [review]
Onl apply missing chunk from 722011

https://hg.mozilla.org/integration/mozilla-inbound/rev/ebafa3d97c19

Comment 9

[(no longer active)]

https://hg.mozilla.org/mozilla-central/rev/ebafa3d97c19