Bug#567920: Cleaning up the upstream tarballs

Mike Hommey mh at glandium.org
Tue Mar 23 12:52:13 UTC 2010


I went through the most obvious images and here are my current
- The files in ./modules/libpr0n/test/reftest/pngsuite-transparency/
  are very likely to have been converted from the original NeXT icons
  on NeXT OS. Which means they all need to be removed (including the
  html files, which are the same images converted as html tables)
- Some files in ./testing/performance are of doubtful origin.
- Some files in ./content/xml/tests are of doubtful origin.
- Some files in ./layout/doc are of doubtful origin.
- Some files in ./layout/html/tests are of doubtful origin.
- Images embedded in ./browser/locales/en-US/searchplugins/*.xml are most
  likely non-free.
- The Firefox icons are *not* non-free.
   (See https://bugzilla.mozilla.org/show_bug.cgi?id=541761)

Considering all of the above, considering I didn't want to spend too
much time to track each file's origin and considering most of the above
files are useless to the builds and even the testsuite itself, here is
how I'm going to fix this in xulrunner, iceweasel and iceape:

# rm -fvr ./layout/html/tests
# rm -fvr ./layout/doc
# rm -fvr ./content/xml/tests
# rm -fvr ./testing/performance
# rm -fvr ./modules/libpr0n/test/reftest/pngsuite-transparency/

As I'm now also running reftests on xulrunner, I'll also do the
# sed -i /pngsuite-transparency/d ./modules/libpr0n/test/reftest/reftest.list
which avoids including the removed files in the reftest.

And finally, for the search plugins images, I'm going to do:

# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.amazon.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/amazondotcom.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.answers.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/answers.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.creativecommons.org/favicon.ico\1,' ./browser/locales/en-US/searchplugins/creativecommons.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.ebay.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/eBay.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.google.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/google.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://en.wikipedia.org/favicon.ico\1,' ./browser/locales/en-US/searchplugins/wikipedia.xml
# sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.yahoo.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/yahoo.xml

Which replaces the embedded images with links to the icon on the web.
Please note that these files are normally only used by iceweasel, so
you can just apply the changes in the upstream tarball without caring

For iceweasel (xulrunner, actually), however, it is necessary to also
apply the patch from https://bugzilla.mozilla.org/show_bug.cgi?id=554265


PS: For reference, the upstream bug about the test suite images is:

More information about the pkg-mozilla-maintainers mailing list