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 1224000 - Install defaults/permissions file under browser/ instead of under browser/chrome/browser. r=mshal,r=MattN

Browse Source 
And restore resource://app/ to its true meaning.
This commit is contained in:
Mike Hommey 2015-11-12 08:02:21 +09:00
parent 067204b48e
commit 71f6508c06
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/app/jar.mn
View File

@ -1,3 +0,0 @@
browser.jar:
% resource app %
defaults/permissions (permissions)

3
browser/app/moz.build
View File

@ -21,6 +21,7 @@ SOURCES += [
FINAL_TARGET_FILES += ['blocklist.xml'] FINAL_TARGET_FILES += ['blocklist.xml']
FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js'] FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']
FINAL_TARGET_FILES.defaults += ['permissions']
DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
@ -70,7 +71,5 @@ if CONFIG['MOZ_LINKER']:
if CONFIG['HAVE_CLOCK_MONOTONIC']: if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS'] OS_LIBS += CONFIG['REALTIME_LIBS']
JAR_MANIFESTS += ['jar.mn']
if CONFIG['GNU_CXX']: if CONFIG['GNU_CXX']:
CXXFLAGS += ['-Wshadow'] CXXFLAGS += ['-Wshadow']

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

@ -708,6 +708,7 @@
@RESPATH@/greprefs.js @RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/profile/prefs.js @RESPATH@/browser/defaults/profile/prefs.js
@RESPATH@/browser/defaults/permissions
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
; Technically this is an app pref file, but we are keeping it in the original ; Technically this is an app pref file, but we are keeping it in the original