1123072 - [Flatfish] build broken due to unused variables in GonkGPSGeolocationProvider.cpp

Status: RESOLVED FIXED

(Core :: DOM: Geolocation, defect)

Description

[:gerard-majax]

In file included from Unified_cpp_dom_system_gonk0.cpp:38:0:
../../../../gecko/dom/system/gonk/GonkGPSGeolocationProvider.cpp: In member function 'void GonkGPSGeolocationProvider::StartGPS()':
../../../../gecko/dom/system/gonk/GonkGPSGeolocationProvider.cpp:676:8: error: unused variable 'singleShot' [-Werror=unused-variable]
   bool singleShot = false;
        ^
In file included from Unified_cpp_dom_system_gonk0.cpp:38:0:
../../../../gecko/dom/system/gonk/GonkGPSGeolocationProvider.cpp: At global scope:
../../../../gecko/dom/system/gonk/GonkGPSGeolocationProvider.cpp:60:20: error: 'kNetworkConnStateChangedTopic' defined but not used [-Werror=unused-variable]
 static const char* kNetworkConnStateChangedTopic = "network-connection-state-changed";

Comment 1

[:gerard-majax]

Attachment: Fix build of GonkGPSGeolocationProvider on Flatfish r=kchen

Comment 2

[:gerard-majax]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=bab3ed8cb327

Comment 3

[Carsten Book [:Tomcat]]

this failed to apply:

renamed 1123072 -> Bug-1123072---Fix-build-of-GonkGPSGeolocationProvi.patch
applying Bug-1123072---Fix-build-of-GonkGPSGeolocationProvi.patch
patching file dom/system/gonk/GonkGPSGeolocationProvider.cpp
Hunk #1 FAILED at 51
1 out of 2 hunks FAILED -- saving rejects to file dom/system/gonk/GonkGPSGeolocationProvider.cpp.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh Bug-1123072---Fix-build-of-GonkGPSGeolocationProvi.patch

could you take a look, thanks!

Comment 4

[:gerard-majax]

Attachment: Fix build of GonkGPSGeolocationProvider on Flatfish r=kchen

Comment 5

[:gerard-majax]

Comment on attachment 8551172 [details] [diff] [review]
Fix build of GonkGPSGeolocationProvider on Flatfish r=kchen

Carrying r+, rebased on master

Tomcat, can you retry with this one?

Comment 6

[Carsten Book [:Tomcat]]

Attachment: rej file

Comment 7

[:gerard-majax]

Attachment: bug1123072.patch

This is the diff from the try push.

Comment 8

[:gerard-majax]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=96747f2845d5

Comment 9

[:gerard-majax]

Attachment: Fix build of GonkGPSGeolocationProvider on Flatfish r=kchen

Comment 10

[:gerard-majax]

Comment on attachment 8551203 [details] [diff] [review]
Fix build of GonkGPSGeolocationProvider on Flatfish r=kchen

Carrying r+, rebased on top of bug 878748

Comment 11

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/03ca9d11a981

Comment 12

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/03ca9d11a981