1367337 - Bustage: clicktoplay-bgtexture.png and videoClickToPlayButton.svg are missing in Modern

Status: RESOLVED FIXED

(SeaMonkey :: Themes, defect)

Description

[Hartmut Figge]

Building SM-Trunk Linux x86_64 fails with

src/suite/themes/modern/jar.mn
processing /home/hafi/moz-work/src/suite/themes/modern/jar.mn
Traceback (most recent call last):
  File "/usr/lib64/python2.7/runpy.py", line 174, in _run_module_as_main
    "__main__", fname, loader, pkg_name)
  File "/usr/lib64/python2.7/runpy.py", line 72, in _run_code
    exec code in run_globals
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/action/jar_maker.py", line 17, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/action/jar_maker.py", line 13, in main
    return mozbuild.jar.main(args)
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/jar.py", line 597, in main
    jm.makeJar(infile, options.d)
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/jar.py", line 333, in makeJar
    self.processJarSection(info, jardir)
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/jar.py", line 388, in processJarSection
    self._processEntryLine(e, outHelper, jf)
  File "/home/hafi/moz-work/src/mozilla/python/mozbuild/mozbuild/jar.py", line 449, in _processEntryLine
    ', '.join(src_base)))
RuntimeError: File "mozilla/toolkit/themes/shared/media/clicktoplay-bgtexture.png" not found in /home/hafi/moz-work/src
make[4]: *** [/home/hafi/moz-work/src/mozilla/config/rules.mk:1271: libs] Error 1

Comment 1

[Bill Gianopoulos [:WG9s]]

The same issue exists with videoClickToPlayButton.svg just the build does not get as far as that error.

Comment 2

[Hartmut Figge]

(In reply to Bill Gianopoulos [:WG9s] from comment #1)
> just the build does not get as far as that error.

I'm using 1367252-verify-cert-bustage.patch of Bug 1367252 to get further. :)

Comment 3

[Hartmut Figge]

Forget that. It's already checked in. Sorry.

Comment 4

[Bill Gianopoulos [:WG9s]]

I kluged my builds by using the images from toolkit/themes/mobile/global/media/ in order to get them to complete.

Comment 5

[Hartmut Figge]

Attachment: workaround

Thanks. That allows a workaround until a real fix is ready.

Comment 6

[Bill Gianopoulos [:WG9s]]

(In reply to Hartmut Figge from comment #5)
> Created attachment 8870773 [details]
> workaround
> 
> Thanks. That allows a workaround until a real fix is ready.

Once in a while I actually have a good idea!

Comment 7

[Hartmut Figge]

And I should have checked 'workaround' before sending. A lot of trash before the changes. Well, it works, it is not the real fix, so no need to replace it. :-D

Comment 8

[Bill Gianopoulos [:WG9s]]

(In reply to Hartmut Figge from comment #7)
> And I should have checked 'workaround' before sending. A lot of trash before
> the changes. Well, it works, it is not the real fix, so no need to replace
> it. :-D

But we knew what you intended.

Comment 9

[Bill Gianopoulos [:WG9s]]

Attachment: workaround

I cleaned up the patch for you.

Comment 10

[Hartmut Figge]

Thanks for that. I believe, though, that the fix should not depend on mobile. The two .png should instead be put in suite/themes/modern/global/media/ and suite/themes/modern/jar.mn should be adjusted to that.

That would require the use of Mercurial as far as I know. Well, I do not use that. I'm content with find, grep, diff and patch. Therefore the 'workaround'.

Comment 11

[Frank-Rainer Grahl (:frg)]

Modern has "shot" video contrals at the moment anyway. If you don't mind I am taking over and removing the missing files and putting the css from toolkit in which uses a different icons.

Comment 12

[Frank-Rainer Grahl (:frg)]

Attachment: 1367337-removeclicktoplayicons.patch

This doens't fix the video controls (Bug 1364491) but it allows SeaMonkey to build.

Comment 13

[Frank-Rainer Grahl (:frg)]

Attachment: 1367337-removeclicktoplayicons.patch

Sorry first patch had some whitespace problems.

Comment 14

[Hartmut Figge]

(In reply to Frank-Rainer Grahl from comment #11)
> If you don't mind I am taking over

Gladly. History says that I myself had put my name to Assignee. Well, I wasn't aware of that until now and I don't know, how that that happened. An automatism by the new design of Bugzilla? Hm. Have to look out for that in the future.

Comment 15

[Edmund Wong (:ewong)]

Comment on attachment 8870979 [details] [diff] [review]
1367337-removeclicktoplayicons.patch

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

looks good.  though not really a reviewer.

Comment 16

[Ian Neal]

Comment on attachment 8870979 [details] [diff] [review]
1367337-removeclicktoplayicons.patch

LGTM

Comment 17

[Frank-Rainer Grahl (:frg)]

https://hg.mozilla.org/comm-central/rev/49a68316ebabe052b42cee27985fdbc1015feb45