wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1150417 - use theme manifest for overrides, r=glandium,dao

Browse Source
This commit is contained in:
Gijs Kruitbosch 2015-06-05 12:48:34 +01:00
parent ad6bd576e5
commit a20f30d1f3
10 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/installer/package-manifest.in
View File

@ -664,8 +664,9 @@
@RESPATH@/browser/chrome/shumway.manifest
@RESPATH@/browser/chrome/shumway/*
#endif
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@RESPATH@/chrome/toolkit@JAREXT@
@RESPATH@/chrome/toolkit.manifest
@RESPATH@/chrome/recording.manifest

1
browser/themes/linux/jar.mn
View File

@ -469,6 +469,7 @@ browser.jar:
skin/classic/browser/warning16.png (../shared/warning16.png)
skin/classic/browser/warning16@2x.png (../shared/warning16@2x.png)
../extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png

1
browser/themes/osx/jar.mn
View File

@ -613,6 +613,7 @@ browser.jar:
skin/classic/browser/warning16.png (../shared/warning16.png)
skin/classic/browser/warning16@2x.png (../shared/warning16@2x.png)
../extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png

1
browser/themes/windows/jar.mn
View File

@ -563,6 +563,7 @@ browser.jar:
skin/classic/browser/warning16.png (../shared/warning16.png)
skin/classic/browser/warning16@2x.png (../shared/warning16@2x.png)
../extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
% override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png

2
python/mozbuild/mozbuild/jar.py
View File

@ -70,7 +70,7 @@ class JarMaker(object):
'''
ignore = re.compile('\s*(\#.*)?$')
jarline = re.compile('(?:(?P<jarfile>[\w\d.\-\_\\\/]+).jar\:)|(?:\s*(\#.*)?)\s*$')
jarline = re.compile('(?:(?P<jarfile>[\w\d.\-\_\\\/{}]+).jar\:)|(?:\s*(\#.*)?)\s*$')
relsrcline = re.compile('relativesrcdir\s+(?P<relativesrcdir>.+?):')
regline = re.compile('\%\s+(.*)$')
entryre = '(?P<optPreprocess>\*)?(?P<optOverwrite>\+?)\s+'

3
toolkit/themes/linux/mozapps/jar.mn
View File

@ -36,4 +36,7 @@ toolkit.jar:
+ skin/classic/mozapps/places/defaultFavicon.png (places/defaultFavicon.png)
#endif
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://mozapps/skin/passwordmgr/key.png chrome://mozapps/skin/passwordmgr/key-16.png

3
toolkit/themes/osx/global/jar.mn
View File

@ -215,4 +215,7 @@ toolkit.jar:
skin/classic/global/tree/folder.png (tree/folder.png)
skin/classic/global/tree/folder@2x.png (tree/folder@2x.png)
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://global/skin/dirListing/local.png chrome://global/skin/dirListing/folder.png

3
toolkit/themes/osx/mozapps/jar.mn
View File

@ -84,6 +84,9 @@ toolkit.jar:
#endif
skin/classic/mozapps/handling/handling.css (handling/handling.css)
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://mozapps/skin/extensions/category-extensions.png chrome://mozapps/skin/extensions/extensionGeneric.png
% override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png
% override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png

6
toolkit/themes/windows/global/jar.mn
View File

@ -243,6 +243,9 @@ toolkit.jar:
skin/classic/global/tree/twisty-clsd-XP.png (tree/twisty-clsd-XP.png)
skin/classic/global/tree/twisty-open-XP.png (tree/twisty-open-XP.png)
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://global/skin/console/console-toolbar.png chrome://global/skin/console/console-toolbar-XP.png osversion<6
% override chrome://global/skin/dirListing/folder.png chrome://global/skin/dirListing/folder-XP.png osversion<6
% override chrome://global/skin/dirListing/local.png chrome://global/skin/dirListing/local-XP.png osversion<6
@ -283,5 +286,8 @@ toolkit.jar:
% override chrome://global/skin/tree/twisty-open.png chrome://global/skin/tree/twisty-open-XP.png osversion<6
#endif
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif
% override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif

6
toolkit/themes/windows/mozapps/jar.mn
View File

@ -94,6 +94,9 @@ toolkit.jar:
skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png)
skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png)
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://mozapps/skin/downloads/downloadButtons.png chrome://mozapps/skin/downloads/downloadButtons-XP.png osversion<6
% override chrome://mozapps/skin/downloads/downloadIcon.png chrome://mozapps/skin/downloads/downloadIcon-XP.png osversion<6
% override chrome://mozapps/skin/extensions/category-discover.png chrome://mozapps/skin/extensions/category-discover-XP.png osversion<6
@ -112,6 +115,9 @@ toolkit.jar:
% override chrome://mozapps/skin/update/downloadButtons.png chrome://mozapps/skin/update/downloadButtons-XP.png osversion<6
#endif
#if MOZ_BUILD_APP == browser
../browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.jar:
#endif
% override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png
% override chrome://mozapps/skin/extensions/category-experiments.png chrome://mozapps/skin/extensions/experimentGeneric.png
% override chrome://mozapps/skin/extensions/category-extensions.png chrome://mozapps/skin/extensions/extensionGeneric.png