From c5cd9be2f8e1de17393f6cead93a9124ef75fcdc Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 13 Nov 2013 18:43:26 +0100 Subject: [PATCH] - up to 25.0 --- ...irefox-Disable-Firefox-Health-Report.patch | 21 ++ mozilla-firefox-agent-ac.patch | 12 - mozilla-firefox-agent.patch | 12 - mozilla-firefox-branding.patch | 4 +- mozilla-firefox-gcc3.patch | 41 -- mozilla-firefox-gyp-slashism.patch | 57 +++ mozilla-firefox-install.patch | 107 ------ mozilla-firefox-middle_click_paste.patch | 29 +- mozilla-firefox-packaging.patch | 329 ++++++++++------- mozilla-firefox-prefs.patch | 4 +- mozilla-firefox-system-cairo.patch | 34 -- mozilla-firefox-system-virtualenv.patch | 65 +--- mozilla-firefox-ti-agent.patch | 11 - mozilla-firefox.spec | 349 ++++++------------ vendor-ac.js | 8 + vendor.js | 8 + 16 files changed, 439 insertions(+), 652 deletions(-) create mode 100644 mozilla-firefox-Disable-Firefox-Health-Report.patch delete mode 100644 mozilla-firefox-agent-ac.patch delete mode 100644 mozilla-firefox-agent.patch delete mode 100644 mozilla-firefox-gcc3.patch create mode 100644 mozilla-firefox-gyp-slashism.patch delete mode 100644 mozilla-firefox-install.patch delete mode 100644 mozilla-firefox-system-cairo.patch delete mode 100644 mozilla-firefox-ti-agent.patch create mode 100644 vendor-ac.js create mode 100644 vendor.js diff --git a/mozilla-firefox-Disable-Firefox-Health-Report.patch b/mozilla-firefox-Disable-Firefox-Health-Report.patch new file mode 100644 index 0000000..081a9b2 --- /dev/null +++ b/mozilla-firefox-Disable-Firefox-Health-Report.patch @@ -0,0 +1,21 @@ +From: Mike Hommey +Date: Fri, 15 Mar 2013 17:08:40 +0100 +Subject: Disable Firefox Health Report + +--- + browser/confvars.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/browser/confvars.sh b/browser/confvars.sh +index 35cbdac..906de7a 100644 +--- a/browser/confvars.sh ++++ b/browser/confvars.sh +@@ -27,7 +27,7 @@ MOZ_CHROME_FILE_FORMAT=omni + MOZ_SAFE_BROWSING=1 + MOZ_SERVICES_COMMON=1 + MOZ_SERVICES_CRYPTO=1 +-MOZ_SERVICES_HEALTHREPORT=1 ++MOZ_SERVICES_HEALTHREPORT= + MOZ_SERVICES_METRICS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION diff --git a/mozilla-firefox-agent-ac.patch b/mozilla-firefox-agent-ac.patch deleted file mode 100644 index f6533d5..0000000 --- a/mozilla-firefox-agent-ac.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21 17:21:55.000000000 +0100 -+++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21 17:23:53.000000000 +0100 -@@ -163,6 +163,9 @@ - pref("general.useragent.locale", "@AB_CD@"); - pref("general.skins.selectedSkin", "classic/1.0"); - pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@"); -+pref("general.useragent.vendor", "PLD"); -+pref("general.useragent.vendorSub", "2.0"); -+pref("general.useragent.vendorComment", "Ac"); - - pref("general.smoothScroll", false); - #ifdef UNIX_BUT_NOT_MAC diff --git a/mozilla-firefox-agent.patch b/mozilla-firefox-agent.patch deleted file mode 100644 index 69ccc6e..0000000 --- a/mozilla-firefox-agent.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21 17:21:55.000000000 +0100 -+++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21 17:23:53.000000000 +0100 -@@ -163,6 +163,9 @@ - - pref("general.useragent.locale", "@AB_CD@"); - pref("general.skins.selectedSkin", "classic/1.0"); -+pref("general.useragent.vendor", "PLD"); -+pref("general.useragent.vendorSub", "3.0"); -+pref("general.useragent.vendorComment", "Th"); - - pref("general.smoothScroll", false); - #ifdef UNIX_BUT_NOT_MAC diff --git a/mozilla-firefox-branding.patch b/mozilla-firefox-branding.patch index 2add2d6..79d13b1 100644 --- a/mozilla-firefox-branding.patch +++ b/mozilla-firefox-branding.patch @@ -21,8 +21,8 @@ +

+

PLD Home Page +
PLD Users Wiki -+
PLD Documentation in english -+
PLD Documentation in polish ++
PLD Documentation in English ++
PLD Documentation in Polish +
Planet PLD +

diff --git a/mozilla-firefox-gcc3.patch b/mozilla-firefox-gcc3.patch deleted file mode 100644 index 5f4efc6..0000000 --- a/mozilla-firefox-gcc3.patch +++ /dev/null @@ -1,41 +0,0 @@ -in short: that '-z defs' makes tls symbols invisible on gcc 3.3.6 - -gmake[1]: Entering directory `/home/glen/rpm/pld/BUILD/mozilla-firefox-3.0/mozilla/obj-amd64/memory/jemalloc' -rm -f libjemalloc.so -ccache amd64-pld-linux-g++ -I/usr/X11R6/include -fno-rtti -fno-exceptions -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align -Wno-long-long -pedantic -fno-strict-aliasing -fshort-wchar -pthread -pipe -DNDEBUG -DTRIMMED -O2 -fno-strict-aliasing -fPIC -shared -Wl,-z,defs -Wl,-h,libjemalloc.so -o libjemalloc.so jemalloc.o -lpthread -Wl,-rpath-link,../../dist/bin -ldl -lm -jemalloc.o(.text+0x1b5c): In function `choose_arena_hard': -jemalloc.c: undefined reference to `__tls_get_addr' -jemalloc.o(.text+0x3cf1): In function `arena_ralloc': -jemalloc.c: undefined reference to `__tls_get_addr' -jemalloc.o(.text+0x4921): In function `malloc_init_hard': -jemalloc.c: undefined reference to `__tls_get_addr' -jemalloc.o(.text+0x4ce1): In function `malloc': -jemalloc.c: undefined reference to `__tls_get_addr' -jemalloc.o(.text+0x4eb7): In function `calloc': -jemalloc.c: undefined reference to `__tls_get_addr' -jemalloc.o(.text+0x5051):jemalloc.c: more undefined references to `__tls_get_addr' follow -collect2: ld returned 1 exit status -gmake[1]: *** [libjemalloc.so] Error 1 - ---- mozilla-firefox-3.0rc1/mozilla/configure~ 2008-05-06 00:11:03.000000000 +0300 -+++ mozilla-firefox-3.0rc1/mozilla/configure 2008-05-27 08:09:43.180357890 +0300 -@@ -5444,7 +5444,7 @@ - DSO_LDOPTS='-shared' - if test "$GCC_USE_GNU_LD"; then - # Don't allow undefined symbols in libraries -- DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" -+: # DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" - fi - WARNINGS_AS_ERRORS='-Werror' - DSO_CFLAGS='' ---- mozilla-firefox-3.0rc1/mozilla/configure.in~ 2008-05-06 00:08:14.000000000 +0300 -+++ mozilla-firefox-3.0rc1/mozilla/configure.in 2008-05-27 08:09:43.210357726 +0300 -@@ -1273,7 +1273,7 @@ - DSO_LDOPTS='-shared' - if test "$GCC_USE_GNU_LD"; then - # Don't allow undefined symbols in libraries -- DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" -+: # DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" - fi - WARNINGS_AS_ERRORS='-Werror' - DSO_CFLAGS='' diff --git a/mozilla-firefox-gyp-slashism.patch b/mozilla-firefox-gyp-slashism.patch new file mode 100644 index 0000000..5100011 --- /dev/null +++ b/mozilla-firefox-gyp-slashism.patch @@ -0,0 +1,57 @@ +--- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig 2013-01-05 00:44:41.000000000 +0100 ++++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100 +@@ -114,6 +114,12 @@ + if dir and not os.path.exists(dir): + os.makedirs(dir) + ++def append_relative(base, rel): ++ if rel == '': ++ return base ++ else: ++ return base + '/' + rel ++ + def GetFlavor(params): + """Returns |params.flavor| if it's set, the system's default flavor else.""" + flavors = { +@@ -142,9 +148,9 @@ + + def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None): + if not os.path.isabs(topsrcdir): +- topsrcdir = depth + "/" + topsrcdir ++ topsrcdir = append_relative(depth, topsrcdir) + if not os.path.isabs(srcdir): +- srcdir = depth + "/" + srcdir ++ srcdir = append_relative(depth, srcdir) + #TODO: should compare with the existing file and not overwrite it if the + # contents are the same! + ensure_directory_exists(filename) +@@ -261,7 +267,7 @@ + qualified_target) + build_file = os.path.abspath(build_file) + rel_path, output_file = self.CalculateMakefilePath(build_file, target) +- subdepth = self.depth + "/" + getdepth(rel_path) ++ subdepth = append_relative(self.depth, getdepth(rel_path)) + if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth): + # If WriteTargetMakefile returns True, then this is a useful target + dirs.append(rel_path) +@@ -399,7 +405,7 @@ + # The relative path from objdir to gyp_file_dir + srcdir = gyp.common.RelativePath(gyp_file_dir, objdir) + # The absolute path to the source dir +- abs_srcdir = topsrcdir + "/" + relative_srcdir ++ abs_srcdir = append_relative(topsrcdir, relative_srcdir) + # The path to get up to the root of the objdir from the output dir. + depth = getdepth(relative_srcdir) + # The output directory. +@@ -408,9 +414,9 @@ + makefile_path = os.path.join(output_dir, "Makefile") + + def topsrcdir_path(path): +- return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir)) ++ return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir))) + def objdir_path(path): +- return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir)) ++ return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir))) + + # Find the list of targets that derive from the gyp file(s) being built. + needed_targets = set() diff --git a/mozilla-firefox-install.patch b/mozilla-firefox-install.patch deleted file mode 100644 index 22a3807..0000000 --- a/mozilla-firefox-install.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- mozilla/browser/app/Makefile.in 2008-06-22 22:54:03.000000000 +0200 -+++ mozilla/browser/app/Makefile.in 2008-06-23 10:34:59.000000000 +0200 -@@ -397,7 +397,7 @@ - sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings - rsync -a $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES) - ifdef LIBXUL_SDK -- cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/firefox -+ cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME) - else - rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) - rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS -@@ -359,7 +359,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) - endif - endif - -@@ -433,7 +433,7 @@ - rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(dist_dest)/Contents/Frameworks - else - $(NSINSTALL) -D $(DIST)/bin/xulrunner -- (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -) -+ cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner - endif #} cocoa - endif #} SKIP_COPY_XULRUNNER - endif #} LIBXUL_SDK ---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19 00:34:12.000000000 +0100 -+++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22 23:53:43.877485659 +0100 -@@ -708,41 +708,41 @@ - endif - - stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) -- @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) -+ @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) - ifndef MOZ_FAST_PACKAGE -- @rm -rf $(DIST)/$(MOZ_PKG_DIR) -+ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) - endif - # NOTE: this must be a tar now that dist links into the tree so that we - # do not strip the binaries actually in the tree. - @echo "Creating package directory..." -- if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \ -- mkdir $(DIST)/$(MOZ_PKG_DIR); \ -+ if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \ -+ mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR); \ - fi - ifndef UNIVERSAL_BINARY - # If UNIVERSAL_BINARY, the package will be made from an already-prepared - # STAGEPATH - ifdef MOZ_PKG_MANIFEST - ifndef MOZ_FAST_PACKAGE - $(RM) -rf $(DIST)/xpt $(DIST)/manifests - endif - $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ -- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \ -+ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \ - "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) -- $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" -+ $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ - $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST)) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ - $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST)) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ - $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST)) - ifdef MOZ_WEBAPP_RUNTIME -- mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest -- sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest -+ mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest -+ sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest - endif -- printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest -+ printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest - else # !MOZ_PKG_MANIFEST - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) - ifndef STAGE_SDK -@@ -741,10 +741,10 @@ - @$(NSINSTALL) -D $(DIST)/xpt - @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing... - else -- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) -+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) - endif - else -- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) -+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) - @echo "Linking XPT files..." - @rm -rf $(DIST)/xpt - @$(NSINSTALL) -D $(DIST)/xpt -@@ -830,7 +830,7 @@ - cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) - endif - $(NSINSTALL) -D $(DESTDIR)$(installdir) -- (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ -+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(installdir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(bindir) - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) diff --git a/mozilla-firefox-middle_click_paste.patch b/mozilla-firefox-middle_click_paste.patch index 179b086..b325338 100644 --- a/mozilla-firefox-middle_click_paste.patch +++ b/mozilla-firefox-middle_click_paste.patch @@ -1,18 +1,19 @@ --- iceweasel-13.0/mozilla/browser/base/content/browser.js.orig 2012-06-06 11:12:17.021562264 +0200 +++ iceweasel-13.0/mozilla/browser/base/content/browser.js 2012-06-06 11:21:37.000000000 +0200 -@@ -5953,12 +5953,9 @@ +@@ -5231,12 +5231,9 @@ - let mayInheritPrincipal = { value: false }; - let url = getShortcutOrURI(clipboard, mayInheritPrincipal); -- try { -- makeURI(url); -- } catch (ex) { -- // Not a valid URI. -- return; -- } -+ var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"].getService(Components.interfaces.nsIURIFixup); -+ url = URIFixup.createFixupURI(url, 1).spec; -+ // 1 is FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP + Task.spawn(function() { + let data = yield getShortcutOrURIAndPostData(clipboard); +- try { +- makeURI(data.url); +- } catch (ex) { +- // Not a valid URI. +- return; +- } ++ var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"].getService(Components.interfaces.nsIURIFixup); ++ data.url = URIFixup.createFixupURI(data.url, 1).spec; ++ // 1 is FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP - try { - addToUrlbarHistory(url); + try { + addToUrlbarHistory(data.url); + diff --git a/mozilla-firefox-packaging.patch b/mozilla-firefox-packaging.patch index 75caf11..6426cf6 100644 --- a/mozilla-firefox-packaging.patch +++ b/mozilla-firefox-packaging.patch @@ -1,6 +1,26 @@ ---- iceweasel-17.0/mozilla/browser/installer/package-manifest.in.orig 2012-11-27 08:03:11.673587982 +0100 -+++ iceweasel-17.0/mozilla/browser/installer/package-manifest.in 2012-11-27 08:31:24.343528272 +0100 -@@ -49,34 +49,44 @@ +diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in iceweasel-24.0/mozilla/browser/installer/package-manifest.in +--- iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in 2013-09-11 01:14:52.000000000 +0200 ++++ iceweasel-24.0/mozilla/browser/installer/package-manifest.in 2013-10-23 08:51:36.788646262 +0200 +@@ -32,14 +32,18 @@ + [@AB_CD@] + @BINPATH@/browser/chrome/@AB_CD@@JAREXT@ + @BINPATH@/browser/chrome/@AB_CD@.manifest ++#ifndef LIBXUL_SDK + @BINPATH@/chrome/@AB_CD@@JAREXT@ + @BINPATH@/chrome/@AB_CD@.manifest ++#endif + @BINPATH@/browser/defaults/profile/bookmarks.html + @BINPATH@/browser/defaults/profile/chrome/* + @BINPATH@/browser/defaults/profile/localstore.rdf + @BINPATH@/browser/defaults/profile/mimeTypes.rdf ++#ifndef LIBXUL_SDK + @BINPATH@/dictionaries/* + @BINPATH@/hyphenation/* ++#endif + @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js + @BINPATH@/browser/searchplugins/* + #ifdef XP_WIN32 +@@ -51,17 +55,23 @@ #endif [xpcom] @@ -16,21 +36,19 @@ #ifdef MOZ_SHARED_MOZGLUE @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #endif -+#ifndef LIBXUL_SDK #ifndef MOZ_STATIC_JS ++#ifndef LIBXUL_SDK @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif +#endif #ifndef MOZ_NATIVE_NSPR + #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ - #endif -+#ifndef LIBXUL_SDK - @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ +@@ -72,14 +82,18 @@ #ifdef XP_MACOSX @BINPATH@/XUL #else ++#ifndef LIBXUL_SDK @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ #endif +#endif @@ -43,18 +61,9 @@ #endif +#endif #ifdef XP_WIN32 + @BINPATH@/plugin-hang-ui@BIN_SUFFIX@ #ifndef MOZ_DEBUG - #if MOZ_MSVC_REDIST == 1400 -@@ -107,14 +117,18 @@ - #ifndef XP_UNIX - @BINPATH@/@MOZ_APP_NAME@.exe - #else -+#ifndef LIBXUL_SDK - @BINPATH@/@MOZ_APP_NAME@-bin -+#endif - @BINPATH@/@MOZ_APP_NAME@ - #endif - @BINPATH@/application.ini +@@ -118,7 +132,9 @@ #ifdef MOZ_UPDATER @BINPATH@/update-settings.ini #endif @@ -63,92 +72,139 @@ +#endif #ifndef XP_OS2 #ifndef MOZ_NATIVE_SQLITE - @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ -@@ -126,13 +140,16 @@ - @BINPATH@/blocklist.xml + #ifndef MOZ_FOLD_LIBS +@@ -132,25 +148,34 @@ #ifdef XP_UNIX #ifndef XP_MACOSX -+#ifndef LIBXUL_SDK @BINPATH@/run-mozilla.sh ++#ifndef LIBXUL_SDK @BINPATH@/mozilla-xremote-client #endif #endif +#endif ; [Components] - @BINPATH@/components/components.manifest + @BINPATH@/browser/components/components.manifest +#ifndef LIBXUL_SDK @BINPATH@/components/alerts.xpt ++#endif #ifdef ACCESSIBILITY #ifdef XP_WIN32 -@@ -144,8 +161,10 @@ + @BINPATH@/AccessibleMarshal.dll + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/accessibility.xpt + #endif ++#endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/appshell.xpt @BINPATH@/components/appstartup.xpt @BINPATH@/components/autocomplete.xpt @BINPATH@/components/autoconfig.xpt +#endif - @BINPATH@/components/browsercompsbase.xpt - @BINPATH@/components/browser-feeds.xpt + @BINPATH@/browser/components/browsercompsbase.xpt + @BINPATH@/browser/components/browser-feeds.xpt +#ifndef LIBXUL_SDK @BINPATH@/components/caps.xpt @BINPATH@/components/chrome.xpt @BINPATH@/components/commandhandler.xpt -@@ -219,7 +238,9 @@ +@@ -169,6 +194,7 @@ + @BINPATH@/components/dom_apps.xpt + @BINPATH@/components/dom_base.xpt + @BINPATH@/components/dom_system.xpt ++#endif + #ifdef MOZ_B2G_RIL + @BINPATH@/components/dom_telephony.xpt + @BINPATH@/components/dom_voicemail.xpt +@@ -212,6 +212,7 @@ + #ifdef MOZ_B2G_BT + @BINPATH@/components/dom_bluetooth.xpt + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/dom_camera.xpt + @BINPATH@/components/dom_canvas.xpt + @BINPATH@/components/dom_contacts.xpt +@@ -216,6 +243,8 @@ + @BINPATH@/components/dom_xbl.xpt + @BINPATH@/components/dom_xpath.xpt + @BINPATH@/components/dom_xul.xpt ++#endif ++#ifndef LIBXUL_SDK + #ifdef MOZ_GAMEPAD + @BINPATH@/components/dom_gamepad.xpt + #endif +@@ -231,7 +260,9 @@ @BINPATH@/components/filepicker.xpt #endif @BINPATH@/components/find.xpt +#endif - @BINPATH@/components/fuel.xpt + @BINPATH@/browser/components/fuel.xpt +#ifndef LIBXUL_SDK @BINPATH@/components/gfx.xpt @BINPATH@/components/html5.xpt @BINPATH@/components/htmlparser.xpt -@@ -243,7 +264,9 @@ +@@ -254,7 +285,9 @@ @BINPATH@/components/layout_xul.xpt @BINPATH@/components/locale.xpt @BINPATH@/components/lwbrk.xpt +#endif - @BINPATH@/components/migration.xpt + @BINPATH@/browser/components/migration.xpt +#ifndef LIBXUL_SDK @BINPATH@/components/mimetype.xpt @BINPATH@/components/mozfind.xpt @BINPATH@/components/necko_about.xpt -@@ -275,9 +298,13 @@ +@@ -289,12 +322,16 @@ @BINPATH@/components/rdf.xpt @BINPATH@/components/satchel.xpt @BINPATH@/components/saxparser.xpt +#endif - @BINPATH@/components/sessionstore.xpt + @BINPATH@/browser/components/sessionstore.xpt +#ifndef LIBXUL_SDK @BINPATH@/components/services-crypto-component.xpt +#endif - @BINPATH@/components/shellservice.xpt + #ifdef MOZ_CAPTIVEDETECT + @BINPATH@/components/captivedetect.xpt + #endif + @BINPATH@/browser/components/shellservice.xpt +#ifndef LIBXUL_SDK @BINPATH@/components/shistory.xpt @BINPATH@/components/spellchecker.xpt @BINPATH@/components/storage.xpt -@@ -322,6 +349,7 @@ +@@ -312,9 +349,11 @@ + @BINPATH@/components/webBrowser_core.xpt + @BINPATH@/components/webbrowserpersist.xpt + @BINPATH@/components/widget.xpt ++#endif + #ifdef XP_MACOSX + @BINPATH@/components/widget_cocoa.xpt + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/windowds.xpt + @BINPATH@/components/windowwatcher.xpt + @BINPATH@/components/xpcom_base.xpt +@@ -339,6 +378,7 @@ @BINPATH@/components/BrowserElementParent.js @BINPATH@/components/FeedProcessor.manifest @BINPATH@/components/FeedProcessor.js +#endif - @BINPATH@/components/BrowserFeeds.manifest - @BINPATH@/components/FeedConverter.js - @BINPATH@/components/FeedWriter.js -@@ -340,6 +368,7 @@ - @BINPATH@/components/BrowserPageThumbs.manifest - @BINPATH@/components/nsPrivateBrowsingService.manifest - @BINPATH@/components/nsPrivateBrowsingService.js + @BINPATH@/browser/components/BrowserFeeds.manifest + @BINPATH@/browser/components/FeedConverter.js + @BINPATH@/browser/components/FeedWriter.js +@@ -354,6 +394,7 @@ + @BINPATH@/browser/components/DownloadsStartup.js + @BINPATH@/browser/components/DownloadsUI.js + @BINPATH@/browser/components/BrowserPlaces.manifest +#ifndef LIBXUL_SDK - @BINPATH@/components/SiteSpecificUserAgent.js - @BINPATH@/components/SiteSpecificUserAgent.manifest - @BINPATH@/components/toolkitsearch.manifest -@@ -368,31 +397,39 @@ + @BINPATH@/components/Downloads.manifest + @BINPATH@/components/DownloadLegacy.js + @BINPATH@/components/BrowserPageThumbs.manifest +@@ -381,31 +422,39 @@ + @BINPATH@/components/nsDownloadManagerUI.js + @BINPATH@/components/NetworkGeolocationProvider.manifest @BINPATH@/components/NetworkGeolocationProvider.js - @BINPATH@/components/GPSDGeolocationProvider.manifest - @BINPATH@/components/GPSDGeolocationProvider.js +#endif - @BINPATH@/components/nsSidebar.manifest - @BINPATH@/components/nsSidebar.js + @BINPATH@/browser/components/nsSidebar.manifest + @BINPATH@/browser/components/nsSidebar.js +#ifndef LIBXUL_SDK @BINPATH@/components/extensions.manifest @BINPATH@/components/addonManager.js @@ -166,38 +222,33 @@ @BINPATH@/components/nsUpdateTimerManager.js @BINPATH@/components/pluginGlue.manifest +#endif - @BINPATH@/components/nsSessionStore.manifest - @BINPATH@/components/nsSessionStartup.js - @BINPATH@/components/nsSessionStore.js + @BINPATH@/browser/components/nsSessionStore.manifest + @BINPATH@/browser/components/nsSessionStartup.js + @BINPATH@/browser/components/nsSessionStore.js +#ifndef LIBXUL_SDK @BINPATH@/components/nsURLFormatter.manifest @BINPATH@/components/nsURLFormatter.js +#endif #ifndef XP_OS2 - @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ + @BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@ #else - @BINPATH@/components/brwsrcmp@DLL_SUFFIX@ + @BINPATH@/browser/components/brwsrcmp@DLL_SUFFIX@ #endif +#ifndef LIBXUL_SDK @BINPATH@/components/txEXSLTRegExFunctions.manifest @BINPATH@/components/txEXSLTRegExFunctions.js @BINPATH@/components/toolkitplaces.manifest -@@ -401,10 +438,14 @@ +@@ -414,7 +463,9 @@ @BINPATH@/components/nsPlacesAutoComplete.manifest @BINPATH@/components/nsPlacesAutoComplete.js @BINPATH@/components/nsPlacesExpiration.js +#endif - @BINPATH@/components/PlacesProtocolHandler.js + @BINPATH@/browser/components/PlacesProtocolHandler.js +#ifndef LIBXUL_SDK @BINPATH@/components/PlacesCategoriesStarter.js @BINPATH@/components/ColorAnalyzer.js -+#endif @BINPATH@/components/PageThumbsProtocol.js -+#ifndef LIBXUL_SDK - @BINPATH@/components/nsDefaultCLH.manifest - @BINPATH@/components/nsDefaultCLH.js - @BINPATH@/components/nsContentPrefService.manifest -@@ -425,6 +466,7 @@ +@@ -437,6 +488,7 @@ @BINPATH@/components/contentSecurityPolicy.js @BINPATH@/components/contentAreaDropListener.manifest @BINPATH@/components/contentAreaDropListener.js @@ -205,114 +256,132 @@ #ifdef MOZ_B2G_RIL @BINPATH@/components/RadioInterfaceLayer.manifest @BINPATH@/components/RadioInterfaceLayer.js -@@ -450,6 +492,7 @@ - @BINPATH@/components/SafariProfileMigrator.js - @BINPATH@/components/libalerts.dylib +@@ -462,17 +514,24 @@ + @BINPATH@/browser/components/SafariProfileMigrator.js #endif -+#ifndef LIBXUL_SDK #ifdef MOZ_ENABLE_DBUS ++#ifndef LIBXUL_SDK @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ #endif -@@ -457,6 +500,7 @@ ++#endif + #ifdef MOZ_ENABLE_GNOME_COMPONENT ++#ifndef LIBXUL_SDK + @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ + #endif ++#endif + #ifdef MOZ_ENABLE_GNOMEVFS + @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif + #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS) ++#ifndef LIBXUL_SDK + @BINPATH@/components/components.manifest + #endif ++#endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/nsINIProcessor.manifest @BINPATH@/components/nsINIProcessor.js @BINPATH@/components/nsPrompter.manifest - @BINPATH@/components/nsPrompter.js -+#endif - #ifdef MOZ_SERVICES_AITC - @BINPATH@/components/AitcComponents.manifest - @BINPATH@/components/Aitc.js -@@ -468,6 +512,7 @@ +@@ -488,10 +547,12 @@ @BINPATH@/components/SyncComponents.manifest @BINPATH@/components/Weave.js #endif -+#ifndef LIBXUL_SDK - @BINPATH@/components/TelemetryPing.js - @BINPATH@/components/TelemetryPing.manifest - @BINPATH@/components/messageWakeupService.js -@@ -488,11 +533,14 @@ - @BINPATH@/components/AlarmsManager.manifest - @BINPATH@/components/TCPSocket.js - @BINPATH@/components/TCPSocket.manifest +#endif - + #ifdef MOZ_CAPTIVEDETECT + @BINPATH@/components/CaptivePortalDetectComponents.manifest + @BINPATH@/components/captivedetect.js + #endif +#ifndef LIBXUL_SDK - #ifdef MOZ_WEBRTC + @BINPATH@/components/servicesComponents.manifest + @BINPATH@/components/cryptoComponents.manifest + @BINPATH@/components/TelemetryPing.js +@@ -532,28 +593,37 @@ @BINPATH@/components/PeerConnection.js @BINPATH@/components/PeerConnection.manifest #endif +#endif - #ifdef ENABLE_MARIONETTE ++#ifndef LIBXUL_SDK @BINPATH@/chrome/marionette@JAREXT@ -@@ -499,6 +545,7 @@ + @BINPATH@/chrome/marionette.manifest + @BINPATH@/components/MarionetteComponents.manifest + @BINPATH@/components/marionettecomponent.js ++#endif + + #ifdef MOZ_WEBSPEECH ++#ifndef LIBXUL_SDK + @BINPATH@/components/dom_webspeechsynth.xpt + #endif ++#endif + ; Modules + @BINPATH@/browser/modules/* ++#ifndef LIBXUL_SDK @BINPATH@/modules/* ++#endif -+#ifndef LIBXUL_SDK ; Safe Browsing #ifdef MOZ_URL_CLASSIFIER ++#ifndef LIBXUL_SDK @BINPATH@/components/nsURLClassifier.manifest -@@ -512,6 +559,7 @@ - #ifdef MOZ_ENABLE_GNOME_COMPONENT - @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ + @BINPATH@/components/nsUrlClassifierHashCompleter.js + @BINPATH@/components/nsUrlClassifierListManager.js + @BINPATH@/components/nsUrlClassifierLib.js + @BINPATH@/components/url-classifier.xpt #endif +#endif ; ANGLE GLES-on-D3D rendering library #ifdef MOZ_ANGLE_RENDERER -@@ -531,8 +579,10 @@ - #ifdef SHIP_FEEDBACK - @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi - #endif +@@ -570,10 +640,12 @@ + @BINPATH@/browser/chrome/pdfjs/* + @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf + @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +#ifndef LIBXUL_SDK @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest + @BINPATH@/chrome/recording.manifest + @BINPATH@/chrome/recording/* +#endif - #ifdef MOZ_GTK2 - @BINPATH@/chrome/icons/default/default16.png - @BINPATH@/chrome/icons/default/default32.png -@@ -560,10 +610,10 @@ - #ifdef MOZ_SERVICES_SYNC - @BINPATH@/@PREF_DIR@/services-sync.js - #endif + #ifdef MOZ_GTK + @BINPATH@/browser/chrome/icons/default/default16.png + @BINPATH@/browser/chrome/icons/default/default32.png +@@ -596,9 +668,11 @@ + ; All the pref files must be part of base to prevent migration bugs + @BINPATH@/browser/@PREF_DIR@/firefox.js + @BINPATH@/browser/@PREF_DIR@/firefox-branding.js +#ifndef LIBXUL_SDK @BINPATH@/greprefs.js @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js --#ifndef LIBXUL_SDK - ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) ++#endif + @BINPATH@/browser/defaults/profile/prefs.js + + #ifndef LIBXUL_SDK +@@ -608,7 +682,7 @@ @BINPATH@/defaults/pref/channel-prefs.js #else -@@ -573,6 +623,7 @@ + ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) +-@BINPATH@/@PREF_DIR@/channel-prefs.js ++@BINPATH@/browser/@PREF_DIR@/channel-prefs.js + #endif - ; [Layout Engine Resources] - ; Style Sheets, Graphics and other Resources used by the layout engine. -+#ifndef LIBXUL_SDK - @BINPATH@/res/EditorOverride.css - @BINPATH@/res/contenteditable.css - @BINPATH@/res/designmode.css -@@ -597,23 +648,28 @@ - @BINPATH@/res/table-remove-row-hover.gif - @BINPATH@/res/table-remove-row.gif - @BINPATH@/res/grabber.gif -+#endif - #ifdef XP_MACOSX - @BINPATH@/res/cursors/* + ; Services (gre) prefs +@@ -616,11 +690,14 @@ + @BINPATH@/defaults/pref/services-notifications.js #endif - @BINPATH@/res/fonts/* - @BINPATH@/res/dtd/* - @BINPATH@/res/html/* + #ifdef MOZ_SERVICES_SYNC +#ifndef LIBXUL_SDK - @BINPATH@/res/langGroups.properties - @BINPATH@/res/language.properties -+#endif - @BINPATH@/res/entityTables/* - #ifdef XP_MACOSX - @BINPATH@/res/MainMenu.nib/ + @BINPATH@/defaults/pref/services-sync.js #endif ++#endif - ; svg + ; [Layout Engine Resources] + ; Style Sheets, Graphics and other Resources used by the layout engine. +#ifndef LIBXUL_SDK + @BINPATH@/res/EditorOverride.css + @BINPATH@/res/contenteditable.css + @BINPATH@/res/designmode.css +@@ -663,6 +740,7 @@ @BINPATH@/res/svg.css @BINPATH@/components/dom_svg.xpt @BINPATH@/components/dom_smil.xpt @@ -320,9 +389,9 @@ ; [Personal Security Manager] ; -@@ -632,11 +688,13 @@ +@@ -683,11 +761,13 @@ + #endif @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ #endif +#ifndef LIBXUL_SDK @BINPATH@/chrome/pippki@JAREXT@ diff --git a/mozilla-firefox-prefs.patch b/mozilla-firefox-prefs.patch index f802d12..d8cc277 100644 --- a/mozilla-firefox-prefs.patch +++ b/mozilla-firefox-prefs.patch @@ -26,14 +26,14 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile // Defines how the Application Update Service notifies the user about updates: // @@ -252,7 +252,7 @@ - #endif + pref("general.useragent.complexOverride.moodle", false); // bug 797703 // At startup, check if we're the default browser and prompt user if not. -pref("browser.shell.checkDefaultBrowser", true); +pref("browser.shell.checkDefaultBrowser", false); + pref("browser.shell.shortcutFavicons",true); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore @@ -448,6 +448,8 @@ // 0: no backups created (and deletes all existing backups) pref("browser.bookmarks.max_backups", 10); diff --git a/mozilla-firefox-system-cairo.patch b/mozilla-firefox-system-cairo.patch deleted file mode 100644 index 072173f..0000000 --- a/mozilla-firefox-system-cairo.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp ---- a/mozilla/gfx/thebes/gfxPlatform.cpp Sun Mar 04 00:38:41 2012 +0000 -+++ b/mozilla/gfx/thebes/gfxPlatform.cpp Wed May 16 17:37:10 2012 +0200 -@@ -448,11 +448,9 @@ gfxPlatform::CreateDrawTargetForSurface( - delete static_cast(srcSurfUD); - } - --void SourceSnapshotDetached(cairo_surface_t *nullSurf) -+void SourceSnapshotDetached(void *nullSurf) - { -- gfxImageSurface* origSurf = -- static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); -- -+ gfxImageSurface *origSurf = static_cast(nullSurf); - origSurf->SetData(&kSourceSurface, NULL, NULL); - } - -@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface( - - } - -- cairo_surface_t *nullSurf = -- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); -- cairo_surface_set_user_data(nullSurf, -- &kSourceSurface, -- imgSurface, -- NULL); -- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); -- cairo_surface_destroy(nullSurf); -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", -+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get()); - } - - srcBuffer->AddRef(); diff --git a/mozilla-firefox-system-virtualenv.patch b/mozilla-firefox-system-virtualenv.patch index fbba18b..a2d150f 100644 --- a/mozilla-firefox-system-virtualenv.patch +++ b/mozilla-firefox-system-virtualenv.patch @@ -1,53 +1,12 @@ -Restore --system-site-packages when system virtualenv gets 1.7 upgrade - ---- a/mozilla/configure.in~ 2013-02-15 22:14:45.000000000 +0100 -+++ a/mozilla/configure.in 2013-02-20 17:05:55.258742791 +0100 -@@ -141,7 +141,7 @@ - PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe - ;; - *) -- PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python -+ PYTHON=/usr/bin/python - ;; - esac - ---- a/mozilla/configure~ 2013-02-15 22:15:48.000000000 +0100 -+++ a/mozilla/configure 2013-02-20 17:06:11.479134735 +0100 -@@ -1344,7 +1344,7 @@ - PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe - ;; - *) -- PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python -+ PYTHON=/usr/bin/python - ;; - esac - ---- iceweasel-19.0/mozilla/configure.in~ 2013-02-20 17:11:35.849980531 +0100 -+++ iceweasel-19.0/mozilla/configure.in 2013-02-20 17:18:24.806617099 +0100 -@@ -128,13 +128,6 @@ - AC_MSG_ERROR([python was not found in \$PATH]) - fi - --AC_MSG_RESULT([Creating Python environment]) --dnl This verifies our Python version is sane and ensures the Python --dnl virtualenv is present and up to date. It sanitizes the environment --dnl for us, so we don't need to clean anything out. --$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \ -- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1 -- - dnl Create a virtualenv where we can install local Python packages - case "$host_os" in - mingw*) ---- iceweasel-19.0/mozilla/configure~ 2013-02-20 17:11:35.853313949 +0100 -+++ iceweasel-19.0/mozilla/configure 2013-02-20 17:17:59.639339399 +0100 -@@ -1335,10 +1335,6 @@ - { echo "configure: error: python was not found in \$PATH" 1>&2; exit 1; } - fi - --echo "$ac_t""Creating Python environment" 1>&6 --$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \ -- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1 -- - case "$host_os" in - mingw*) - PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe +--- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 ++++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py 2013-05-14 22:51:32.136719267 +0200 +@@ -37,8 +37,7 @@ + @property + def virtualenv_script_path(self): + """Path to virtualenv's own populator script.""" +- return os.path.join(self.topsrcdir, 'python', 'virtualenv', +- 'virtualenv.py') ++ return '/usr/bin/virtualenv' + + @property + def python_path(self): diff --git a/mozilla-firefox-ti-agent.patch b/mozilla-firefox-ti-agent.patch deleted file mode 100644 index 969b08a..0000000 --- a/mozilla-firefox-ti-agent.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21 17:21:55.000000000 +0100 -+++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21 17:23:53.000000000 +0100 -@@ -163,6 +163,8 @@ - pref("general.useragent.locale", "@AB_CD@"); - pref("general.skins.selectedSkin", "classic/1.0"); - pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@"); -+pref("general.useragent.vendor", "PLD"); -+pref("general.useragent.vendorSub", "Titanium"); - - pref("general.smoothScroll", false); - #ifdef UNIX_BUT_NOT_MAC diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 93e2f91..b5f2661 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -7,47 +7,38 @@ # # Conditional build: %bcond_with tests # enable tests (whatever they check) -%bcond_without gnomeui # disable gnomeui support -%bcond_without gnome # synonym for gnomeui (gconf, libnotify and gio are still enabled) %bcond_without kerberos # disable krb5 support %bcond_without xulrunner # system xulrunner -%if %{without gnome} -%undefine with_gnomeui -%endif - %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): %define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) %endif -%define nspr_ver 4.9.5 -%define nss_ver 3.14.3 +%define nspr_ver 4.9.6 +%define nss_ver 3.15 Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 19.0 +Version: 25.0 Release: 1 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: 3dc732b6ce177792b43324f4bc7164d8 +# Source0-md5: 90ac047e83079a9046192c732e195329 Source3: %{name}.desktop Source4: %{name}.sh +Source5: vendor.js +Source6: vendor-ac.js Patch0: %{name}-branding.patch -Patch1: %{name}-install.patch -Patch2: %{name}-gcc3.patch -Patch3: %{name}-agent.patch -Patch4: %{name}-agent-ac.patch -Patch5: %{name}-ti-agent.patch Patch7: %{name}-prefs.patch Patch9: %{name}-no-subshell.patch -Patch10: %{name}-system-cairo.patch Patch11: %{name}-middle_click_paste.patch Patch12: %{name}-packaging.patch -# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade Patch13: %{name}-system-virtualenv.patch +Patch14: %{name}-gyp-slashism.patch +Patch15: %{name}-Disable-Firefox-Health-Report.patch URL: http://www.mozilla.org/projects/firefox/ BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: OpenGL-devel @@ -56,6 +47,7 @@ BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: cairo-devel >= 1.10.2-5 BuildRequires: dbus-glib-devel >= 0.60 +BuildRequires: gcc-c++ >= 6:4.4 BuildRequires: glib2-devel >= 1:2.20 BuildRequires: gtk+2-devel >= 2:2.14 %{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1} @@ -65,7 +57,6 @@ BuildRequires: libdnet-devel BuildRequires: libevent-devel >= 1.4.7 # standalone libffi 3.0.9 or gcc's from 4.5(?)+ BuildRequires: libffi-devel >= 6:3.0.9 -%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0} BuildRequires: libiw-devel # requires libjpeg-turbo implementing at least libjpeg 6b API BuildRequires: libjpeg-devel >= 6b @@ -73,7 +64,7 @@ BuildRequires: libjpeg-turbo-devel BuildRequires: libnotify-devel >= 0.4 BuildRequires: libpng(APNG)-devel >= 0.10 BuildRequires: libpng-devel >= 1.5.13 -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel >= 6:4.4 BuildRequires: libvpx-devel >= 1.0.0 BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} @@ -85,7 +76,7 @@ BuildRequires: python-modules BuildRequires: python-virtualenv BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.601 -BuildRequires: sqlite3-devel >= 3.7.14.1 +BuildRequires: sqlite3-devel >= 3.7.17 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXext-devel @@ -98,6 +89,7 @@ BuildRequires: zip BuildRequires: zlib-devel >= 1.2.3 Requires(post): mktemp >= 1.5-18 Requires: desktop-file-utils +Requires: hicolor-icon-theme %if %{with xulrunner} %requires_eq_to xulrunner xulrunner-devel %else @@ -132,12 +124,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreq libmozalloc.so libmozjs.so libxpcom.so libxul.so %endif -%if "%{cc_version}" >= "3.4" -%define specflags -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector -%else -%define specflags -fno-strict-aliasing -%endif - %description Firefox Community Edition is an open-source web browser, designed for standards compliance, performance and portability. @@ -153,31 +139,13 @@ mv -f mozilla-release mozilla cd mozilla %patch0 -p1 -%patch1 -p1 - -%if "%{cc_version}" < "3.4" -%patch2 -p2 -%endif - -%if "%{pld_release}" == "th" -%patch3 -p1 -%endif - -%if "%{pld_release}" == "ac" -%patch4 -p1 -%endif - -%if "%{pld_release}" == "ti" -%patch5 -p1 -%endif - %patch7 -p1 - %patch9 -p2 -%patch10 -p2 %patch11 -p2 %patch12 -p2 %patch13 -p2 +%patch14 -p2 +%patch15 -p1 # config/rules.mk is patched by us and js/src/config/rules.mk # is supposed to be exact copy @@ -195,8 +163,11 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} %if %{without xulrunner} mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags} %endif +mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ @MOZ_OBJDIR@/_profile/pgo/profileserver.py' # Options for 'configure' (same as command-line options). +ac_add_options --build=%{_target_platform} +ac_add_options --host=%{_target_platform} ac_add_options --prefix=%{_prefix} ac_add_options --exec-prefix=%{_exec_prefix} ac_add_options --bindir=%{_bindir} @@ -210,7 +181,6 @@ ac_add_options --localstatedir=%{_localstatedir} ac_add_options --sharedstatedir=%{_sharedstatedir} ac_add_options --mandir=%{_mandir} ac_add_options --infodir=%{_infodir} -ac_add_options --disable-elf-hack %if %{?debug:1}0 ac_add_options --disable-optimize ac_add_options --enable-debug @@ -225,44 +195,55 @@ ac_add_options --enable-optimize="%{rpmcflags} -Os" %endif ac_add_options --disable-strip ac_add_options --disable-strip-libs +ac_add_options --disable-install-strip %if %{with tests} ac_add_options --enable-tests %else ac_add_options --disable-tests %endif -%if %{with gnomeui} -ac_add_options --enable-gnomeui -%else +ac_add_options --disable-crashreporter +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-gconf ac_add_options --disable-gnomeui -%endif ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter ac_add_options --disable-installer ac_add_options --disable-javaxpcom +ac_add_options --disable-long-long-warning +ac_add_options --disable-pedantic ac_add_options --disable-updater +ac_add_options --disable-xterm-updates +ac_add_options --enable-canvas +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-extensions="default,permissions,gio" ac_add_options --enable-gio ac_add_options --enable-libxul +ac_add_options --enable-mathml ac_add_options --enable-pango +ac_add_options --enable-readline ac_add_options --enable-shared-js ac_add_options --enable-startup-notification +ac_add_options --enable-svg ac_add_options --enable-system-cairo +ac_add_options --enable-system-ffi ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite +ac_add_options --enable-url-classifier +ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} ac_add_options --with-distribution-id=org.pld-linux %if %{with xulrunner} ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul) %endif ac_add_options --with-pthreads ac_add_options --with-system-bz2 -ac_add_options --with-system-ffi ac_add_options --with-system-jpeg ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss +ac_add_options --with-system-ply ac_add_options --with-system-png ac_add_options --with-system-zlib -ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} +ac_add_options --with-x EOF %{__make} -f client.mk build \ @@ -275,18 +256,18 @@ rm -rf $RPM_BUILD_ROOT cd mozilla install -d \ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ - $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT%{_datadir}/%{name} + $RPM_BUILD_ROOT%{_desktopdir} \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/browser \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins -%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins +%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins %{__make} -C obj-%{_target_cpu}/browser/installer stage-package \ DESTDIR=$RPM_BUILD_ROOT \ - MOZ_PKG_DIR=%{_libdir}/%{name} \ + installdir=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 -install -d \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +cp -a obj-%{_target_cpu}/dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/ %if %{with xulrunner} # >= 5.0 seems to require this @@ -294,50 +275,54 @@ ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner %endif # move arch independant ones to datadir -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/icons +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/searchplugins %if %{without xulrunner} -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs.js -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/{pref,preferences} +%else +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults %endif -ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome -ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults -ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions -ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules -ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons -ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins -%if %{without xulrunner} -ln -s ../../share/%{name}/greprefs.js $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js -ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res -%endif +ln -s ../../../share/%{name}/browser/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome +ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults +ln -s ../../../share/%{name}/browser/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons +ln -s ../../../share/%{name}/browser/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/searchplugins %if %{without xulrunner} %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries -%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation -ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation %endif sed 's,@LIBDIR@,%{_libdir},' %{SOURCE4} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox chmod 755 $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox -cp -a browser/branding/unofficial/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png +# install icons and desktop file +for i in 48 64; do + install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps + cp -a browser/branding/unofficial/content/icon${i}.png \ + $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/mozilla-firefox.png +done + cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +# install our settings +%if "%{pld_release}" == "ac" +cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js +%else +cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js +%endif + # files created by firefox -register -touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat -touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat +touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/compreg.dat +touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/xpti.dat cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate #!/bin/sh umask 022 -rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat +rm -f %{_libdir}/%{name}/browser/components/{compreg,xpti}.dat # it attempts to touch files in $HOME/.mozilla # beware if you run this with sudo!!! @@ -358,22 +343,18 @@ rm -rf $RPM_BUILD_ROOT if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave} fi -for d in chrome defaults extensions greprefs.js icons res searchplugins; do - if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then - install -d %{_datadir}/%{name} - mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d - fi -done exit 0 %post %{_sbindir}/%{name}-chrome+xpcom-generate %update_browser_plugins +%update_icon_cache hicolor %update_desktop_database %postun if [ "$1" = 0 ]; then %update_browser_plugins + %update_icon_cache hicolor fi %files @@ -382,167 +363,67 @@ fi %attr(755,root,root) %{_bindir}/firefox %attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate +%{_desktopdir}/mozilla-firefox.desktop +%{_iconsdir}/hicolor/*/apps/mozilla-firefox.png + # browser plugins v2 %{_browserpluginsconfdir}/browsers.d/%{name}.* %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist %dir %{_libdir}/%{name} -%if %{without xulrunner} -%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so -%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so -%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so -%attr(755,root,root) %{_libdir}/%{name}/libxul.so -%endif -%{_libdir}/%{name}/blocklist.xml +%dir %{_libdir}/%{name}/browser +%dir %{_libdir}/%{name}/browser/components +%dir %{_libdir}/%{name}/browser/extensions +%dir %{_libdir}/%{name}/browser/plugins + +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/browser +%{_datadir}/%{name}/browser/chrome +%{_datadir}/%{name}/browser/defaults +%{_datadir}/%{name}/browser/icons +%{_datadir}/%{name}/browser/searchplugins -%if %{with crashreporter} -%{_libdir}/%{name}/crashreporter -%{_libdir}/%{name}/crashreporter-override.ini -%{_libdir}/%{name}/crashreporter.ini -%{_libdir}/%{name}/Throbber-small.gif +# symlinks +%{_libdir}/%{name}/browser/chrome +%{_libdir}/%{name}/browser/icons +%{_libdir}/%{name}/browser/searchplugins +%if %{with xulrunner} +%{_libdir}/%{name}/xulrunner %endif +%{_libdir}/%{name}/browser/defaults -# config? +%attr(755,root,root) %{_libdir}/%{name}/firefox +%attr(755,root,root) %{_libdir}/%{name}/firefox-bin +%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh %{_libdir}/%{name}/application.ini -%{_libdir}/%{name}/chrome.manifest - -%dir %{_libdir}/%{name}/components - -%{_libdir}/%{name}/components/Aitc.js -%{_libdir}/%{name}/components/ChromeProfileMigrator.js -%{_libdir}/%{name}/components/DownloadsStartup.js -%{_libdir}/%{name}/components/DownloadsUI.js -%{_libdir}/%{name}/components/FeedConverter.js -%{_libdir}/%{name}/components/FeedWriter.js -%{_libdir}/%{name}/components/FirefoxProfileMigrator.js -%{_libdir}/%{name}/components/PageThumbsProtocol.js -%{_libdir}/%{name}/components/PlacesProtocolHandler.js -%{_libdir}/%{name}/components/ProfileMigrator.js -%{_libdir}/%{name}/components/Weave.js -%{_libdir}/%{name}/components/WebContentConverter.js -%{_libdir}/%{name}/components/browser.xpt -%{_libdir}/%{name}/components/fuelApplication.js -%{_libdir}/%{name}/components/nsBrowserContentHandler.js -%{_libdir}/%{name}/components/nsBrowserGlue.js -%{_libdir}/%{name}/components/nsPrivateBrowsingService.js -%{_libdir}/%{name}/components/nsSessionStartup.js -%{_libdir}/%{name}/components/nsSessionStore.js -%{_libdir}/%{name}/components/nsSetDefaultBrowser.js -%{_libdir}/%{name}/components/nsSidebar.js +%{_libdir}/%{name}/browser/blocklist.xml +%{_libdir}/%{name}/browser/chrome.manifest +%{_libdir}/%{name}/browser/components/components.manifest +%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so +# the signature of the default theme +%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{_libdir}/%{name}/browser/omni.ja +%{_libdir}/%{name}/webapprt +%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub -%{_libdir}/%{name}/components/components.manifest -%{_libdir}/%{name}/components/interfaces.manifest +# files created by firefox -register +%ghost %{_libdir}/%{name}/browser/components/compreg.dat +%ghost %{_libdir}/%{name}/browser/components/xpti.dat %if %{without xulrunner} +# private xulrunner instance %{_libdir}/%{name}/dependentlibs.list %{_libdir}/%{name}/platform.ini -%{_libdir}/%{name}/components/AppsService.js -%{_libdir}/%{name}/components/BrowserElementParent.js -%{_libdir}/%{name}/components/ConsoleAPI.js -%{_libdir}/%{name}/components/ContactManager.js -%{_libdir}/%{name}/components/FeedProcessor.js -%{_libdir}/%{name}/components/GPSDGeolocationProvider.js -%{_libdir}/%{name}/components/NetworkGeolocationProvider.js -%{_libdir}/%{name}/components/PlacesCategoriesStarter.js -%{_libdir}/%{name}/components/SettingsManager.js -%{_libdir}/%{name}/components/TelemetryPing.js -%{_libdir}/%{name}/components/addonManager.js -%{_libdir}/%{name}/components/amContentHandler.js -%{_libdir}/%{name}/components/amWebInstallListener.js -%{_libdir}/%{name}/components/contentAreaDropListener.js -%{_libdir}/%{name}/components/contentSecurityPolicy.js -%{_libdir}/%{name}/components/crypto-SDR.js -%{_libdir}/%{name}/components/jsconsole-clhandler.js -%{_libdir}/%{name}/components/messageWakeupService.js -%{_libdir}/%{name}/components/nsBadCertHandler.js -%{_libdir}/%{name}/components/nsBlocklistService.js -%{_libdir}/%{name}/components/nsContentDispatchChooser.js -%{_libdir}/%{name}/components/nsContentPrefService.js -%{_libdir}/%{name}/components/nsDefaultCLH.js -%{_libdir}/%{name}/components/nsDownloadManagerUI.js -%{_libdir}/%{name}/components/nsFilePicker.js -%{_libdir}/%{name}/components/nsFormAutoComplete.js -%{_libdir}/%{name}/components/nsFormHistory.js -%{_libdir}/%{name}/components/nsHandlerService.js -%{_libdir}/%{name}/components/nsHelperAppDlg.js -%{_libdir}/%{name}/components/nsINIProcessor.js -%{_libdir}/%{name}/components/nsInputListAutoComplete.js -%{_libdir}/%{name}/components/nsLivemarkService.js -%{_libdir}/%{name}/components/nsLoginInfo.js -%{_libdir}/%{name}/components/nsLoginManager.js -%{_libdir}/%{name}/components/nsLoginManagerPrompter.js -%{_libdir}/%{name}/components/nsPlacesAutoComplete.js -%{_libdir}/%{name}/components/nsPlacesExpiration.js -%{_libdir}/%{name}/components/nsPrompter.js -%{_libdir}/%{name}/components/nsProxyAutoConfig.js -%{_libdir}/%{name}/components/nsSearchService.js -%{_libdir}/%{name}/components/nsSearchSuggestions.js -%{_libdir}/%{name}/components/nsTaggingService.js -%{_libdir}/%{name}/components/nsURLFormatter.js -%{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js -%{_libdir}/%{name}/components/nsUrlClassifierLib.js -%{_libdir}/%{name}/components/nsUrlClassifierListManager.js -%{_libdir}/%{name}/components/nsWebHandlerApp.js -%{_libdir}/%{name}/components/storage-Legacy.js -%{_libdir}/%{name}/components/storage-mozStorage.js -%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js -%endif - -%{_libdir}/%{name}/webapprt -%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub - -%attr(755,root,root) %{_libdir}/%{name}/components/libbrowsercomps.so -%if %{without xulrunner} +%dir %{_libdir}/%{name}/components +%{_libdir}/%{name}/components/components.manifest %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so -%endif - -%if %{without xulrunner} %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so -%endif - -%attr(755,root,root) %{_libdir}/%{name}/firefox -%dir %{_libdir}/%{name}/plugins -%if %{without xulrunner} -%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh -%attr(755,root,root) %{_libdir}/%{name}/firefox-bin +%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so +%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so +%attr(755,root,root) %{_libdir}/%{name}/libxul.so %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client %attr(755,root,root) %{_libdir}/%{name}/plugin-container -%endif - -%{_pixmapsdir}/mozilla-firefox.png -%{_desktopdir}/mozilla-firefox.desktop - -# symlinks -%{_libdir}/%{name}/chrome -%{_libdir}/%{name}/defaults -%{_libdir}/%{name}/extensions -%{_libdir}/%{name}/icons -%{_libdir}/%{name}/modules -%{_libdir}/%{name}/searchplugins -%if %{with xulrunner} -%{_libdir}/%{name}/xulrunner -%else %{_libdir}/%{name}/dictionaries -%{_libdir}/%{name}/hyphenation -%{_libdir}/%{name}/greprefs.js -%{_libdir}/%{name}/res -%endif - -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/chrome -%{_datadir}/%{name}/defaults -%{_datadir}/%{name}/icons -%{_datadir}/%{name}/modules -%{_datadir}/%{name}/searchplugins -%if %{without xulrunner} -%{_datadir}/%{name}/greprefs.js -%{_datadir}/%{name}/res +%{_libdir}/%{name}/chrome.manifest +%{_libdir}/%{name}/omni.ja %endif - -%dir %{_datadir}/%{name}/extensions -# the signature of the default theme -%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} - -# files created by firefox -register -%ghost %{_libdir}/%{name}/components/compreg.dat -%ghost %{_libdir}/%{name}/components/xpti.dat diff --git a/vendor-ac.js b/vendor-ac.js new file mode 100644 index 0000000..2b4cf82 --- /dev/null +++ b/vendor-ac.js @@ -0,0 +1,8 @@ +pref("general.useragent.vendor", "PLD"); +pref("general.useragent.vendorSub", "2.0"); +pref("general.useragent.vendorComment", "Ac"); + +pref("general.useragent.compatMode.firefox", true); +pref("distribution.searchplugins.defaultLocale", "en-US"); +// Forbid application updates +lockPref("app.update.enabled", false); diff --git a/vendor.js b/vendor.js new file mode 100644 index 0000000..2eabbe1 --- /dev/null +++ b/vendor.js @@ -0,0 +1,8 @@ +pref("general.useragent.vendor", "PLD"); +pref("general.useragent.vendorSub", "3.0"); +pref("general.useragent.vendorComment", "Th"); + +pref("general.useragent.compatMode.firefox", true); +pref("distribution.searchplugins.defaultLocale", "en-US"); +// Forbid application updates +lockPref("app.update.enabled", false); -- 2.43.0