From 96ef4151a9f89d2bd54eb0e01aa153c1ca1b0e69 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 23 Feb 2013 10:52:26 +0100 Subject: [PATCH] - up to 19.0, further sync with iceweasel --- mozilla-firefox-branding.patch | 4 +- mozilla-firefox-bug-722975-workaround.patch | 34 -- mozilla-firefox-install.patch | 49 ++- mozilla-firefox-middle_click_paste.patch | 18 ++ mozilla-firefox-nss_cflags.patch | 31 -- mozilla-firefox-packaging.patch | 336 ++++++++++++++++++++ mozilla-firefox-prefs.patch | 28 +- mozilla-firefox-system-cairo.patch | 34 ++ mozilla-firefox-system-virtualenv.patch | 53 +++ mozilla-firefox.desktop | 2 +- mozilla-firefox.spec | 86 +++-- 11 files changed, 555 insertions(+), 120 deletions(-) delete mode 100644 mozilla-firefox-bug-722975-workaround.patch create mode 100644 mozilla-firefox-middle_click_paste.patch delete mode 100644 mozilla-firefox-nss_cflags.patch create mode 100644 mozilla-firefox-packaging.patch create mode 100644 mozilla-firefox-system-cairo.patch create mode 100644 mozilla-firefox-system-virtualenv.patch diff --git a/mozilla-firefox-branding.patch b/mozilla-firefox-branding.patch index 1f249a9..2add2d6 100644 --- a/mozilla-firefox-branding.patch +++ b/mozilla-firefox-branding.patch @@ -1,5 +1,5 @@ ---- mozilla/build/application.ini.in.orig 2012-03-13 02:36:39.000000000 +0100 -+++ mozilla/build/application.ini.in 2012-03-24 19:29:15.284836726 +0100 +--- mozilla/build/application.ini.orig 2012-03-13 02:36:39.000000000 +0100 ++++ mozilla/build/application.ini 2012-03-24 19:29:15.284836726 +0100 @@ -43,8 +43,8 @@ #endif #filter substitution diff --git a/mozilla-firefox-bug-722975-workaround.patch b/mozilla-firefox-bug-722975-workaround.patch deleted file mode 100644 index 64f96f8..0000000 --- a/mozilla-firefox-bug-722975-workaround.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- firefox/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 -+++ firefox/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000 -@@ -446,6 +446,7 @@ - static_cast(srcBuffer)->Release(); - } - -+#ifdef MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) - { - gfxImageSurface* origSurf = -@@ -453,6 +454,7 @@ - - origSurf->SetData(&kSourceSurface, NULL, NULL); - } -+#endif - - RefPtr - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) -@@ -522,6 +524,7 @@ - imgSurface->Stride(), - format); - -+ #ifdef MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, -@@ -530,6 +533,7 @@ - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+ #endif - } - - srcBuffer->AddRef(); diff --git a/mozilla-firefox-install.patch b/mozilla-firefox-install.patch index 8625747..22a3807 100644 --- a/mozilla-firefox-install.patch +++ b/mozilla-firefox-install.patch @@ -1,11 +1,11 @@ --- 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 @@ - rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES) - $(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign + 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)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox -+ cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME) +- 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 @@ -19,32 +19,41 @@ endif @@ -433,7 +433,7 @@ - rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks + 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 + 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,30 +708,30 @@ +@@ -708,41 +708,41 @@ endif - stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack -- @rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) -+ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) + 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..." -- @mkdir $(DIST)/$(MOZ_PKG_DIR) -+ @mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR) +- 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))", \ @@ -63,10 +72,16 @@ - $(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_PKG_FORMAT),DMG) + ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) ifndef STAGE_SDK @@ -741,10 +741,10 @@ @$(NSINSTALL) -D $(DIST)/xpt @@ -85,8 +100,8 @@ cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) endif $(NSINSTALL) -D $(DESTDIR)$(installdir) -- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ -+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ +- (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 new file mode 100644 index 0000000..179b086 --- /dev/null +++ b/mozilla-firefox-middle_click_paste.patch @@ -0,0 +1,18 @@ +--- 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 @@ + + 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 + + try { + addToUrlbarHistory(url); diff --git a/mozilla-firefox-nss_cflags.patch b/mozilla-firefox-nss_cflags.patch deleted file mode 100644 index ff64329..0000000 --- a/mozilla-firefox-nss_cflags.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- mozilla/config/rules.mk.orig 2008-06-19 18:45:00.000000000 +0200 -+++ mozilla/config/rules.mk 2008-06-19 18:42:40.000000000 +0200 -@@ -1365,23 +1365,23 @@ - # Rules for building native targets must come first because of the host_ prefix - host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS) - $(REPORT_BUILD) -- $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) -+ $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) - - host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS) - $(REPORT_BUILD) -- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) -+ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) - - host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS) - $(REPORT_BUILD) -- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) -+ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) - - host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS) - $(REPORT_BUILD) -- $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) -+ $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) - - host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS) - $(REPORT_BUILD) -- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) -+ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) - - %:: %.c $(GLOBAL_DEPS) - $(REPORT_BUILD) diff --git a/mozilla-firefox-packaging.patch b/mozilla-firefox-packaging.patch new file mode 100644 index 0000000..75caf11 --- /dev/null +++ b/mozilla-firefox-packaging.patch @@ -0,0 +1,336 @@ +--- 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 @@ + #endif + + [xpcom] ++#ifndef LIBXUL_SDK + @BINPATH@/dependentlibs.list ++#endif + #ifdef XP_WIN32 + @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ ++#endif + #ifdef MOZ_SHARED_MOZGLUE + @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ + #endif ++#ifndef LIBXUL_SDK + #ifndef MOZ_STATIC_JS + @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ + #endif ++#endif + #ifndef MOZ_NATIVE_NSPR + @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@ + #ifdef XP_MACOSX + @BINPATH@/XUL + #else + @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ + #endif ++#endif + #ifdef XP_MACOSX + @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ + @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@ + #else ++#ifndef LIBXUL_SDK + @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ + #endif ++#endif + #ifdef XP_WIN32 + #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 + #ifdef MOZ_UPDATER + @BINPATH@/update-settings.ini + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/platform.ini ++#endif + #ifndef XP_OS2 + #ifndef MOZ_NATIVE_SQLITE + @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ +@@ -126,13 +140,16 @@ + @BINPATH@/blocklist.xml + #ifdef XP_UNIX + #ifndef XP_MACOSX ++#ifndef LIBXUL_SDK + @BINPATH@/run-mozilla.sh + @BINPATH@/mozilla-xremote-client + #endif + #endif ++#endif + + ; [Components] + @BINPATH@/components/components.manifest ++#ifndef LIBXUL_SDK + @BINPATH@/components/alerts.xpt + #ifdef ACCESSIBILITY + #ifdef XP_WIN32 +@@ -144,8 +161,10 @@ + @BINPATH@/components/appstartup.xpt + @BINPATH@/components/autocomplete.xpt + @BINPATH@/components/autoconfig.xpt ++#endif + @BINPATH@/components/browsercompsbase.xpt + @BINPATH@/components/browser-feeds.xpt ++#ifndef LIBXUL_SDK + @BINPATH@/components/caps.xpt + @BINPATH@/components/chrome.xpt + @BINPATH@/components/commandhandler.xpt +@@ -219,7 +238,9 @@ + @BINPATH@/components/filepicker.xpt + #endif + @BINPATH@/components/find.xpt ++#endif + @BINPATH@/components/fuel.xpt ++#ifndef LIBXUL_SDK + @BINPATH@/components/gfx.xpt + @BINPATH@/components/html5.xpt + @BINPATH@/components/htmlparser.xpt +@@ -243,7 +264,9 @@ + @BINPATH@/components/layout_xul.xpt + @BINPATH@/components/locale.xpt + @BINPATH@/components/lwbrk.xpt ++#endif + @BINPATH@/components/migration.xpt ++#ifndef LIBXUL_SDK + @BINPATH@/components/mimetype.xpt + @BINPATH@/components/mozfind.xpt + @BINPATH@/components/necko_about.xpt +@@ -275,9 +298,13 @@ + @BINPATH@/components/rdf.xpt + @BINPATH@/components/satchel.xpt + @BINPATH@/components/saxparser.xpt ++#endif + @BINPATH@/components/sessionstore.xpt ++#ifndef LIBXUL_SDK + @BINPATH@/components/services-crypto-component.xpt ++#endif + @BINPATH@/components/shellservice.xpt ++#ifndef LIBXUL_SDK + @BINPATH@/components/shistory.xpt + @BINPATH@/components/spellchecker.xpt + @BINPATH@/components/storage.xpt +@@ -322,6 +349,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 ++#ifndef LIBXUL_SDK + @BINPATH@/components/SiteSpecificUserAgent.js + @BINPATH@/components/SiteSpecificUserAgent.manifest + @BINPATH@/components/toolkitsearch.manifest +@@ -368,31 +397,39 @@ + @BINPATH@/components/NetworkGeolocationProvider.js + @BINPATH@/components/GPSDGeolocationProvider.manifest + @BINPATH@/components/GPSDGeolocationProvider.js ++#endif + @BINPATH@/components/nsSidebar.manifest + @BINPATH@/components/nsSidebar.js ++#ifndef LIBXUL_SDK + @BINPATH@/components/extensions.manifest + @BINPATH@/components/addonManager.js + @BINPATH@/components/amContentHandler.js + @BINPATH@/components/amWebInstallListener.js + @BINPATH@/components/nsBlocklistService.js ++#endif + #ifdef MOZ_UPDATER + @BINPATH@/components/nsUpdateService.manifest + @BINPATH@/components/nsUpdateService.js + @BINPATH@/components/nsUpdateServiceStub.js + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/nsUpdateTimerManager.manifest + @BINPATH@/components/nsUpdateTimerManager.js + @BINPATH@/components/pluginGlue.manifest ++#endif + @BINPATH@/components/nsSessionStore.manifest + @BINPATH@/components/nsSessionStartup.js + @BINPATH@/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@ + #else + @BINPATH@/components/brwsrcmp@DLL_SUFFIX@ + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/components/txEXSLTRegExFunctions.manifest + @BINPATH@/components/txEXSLTRegExFunctions.js + @BINPATH@/components/toolkitplaces.manifest +@@ -401,10 +438,14 @@ + @BINPATH@/components/nsPlacesAutoComplete.manifest + @BINPATH@/components/nsPlacesAutoComplete.js + @BINPATH@/components/nsPlacesExpiration.js ++#endif + @BINPATH@/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 @@ + @BINPATH@/components/contentSecurityPolicy.js + @BINPATH@/components/contentAreaDropListener.manifest + @BINPATH@/components/contentAreaDropListener.js ++#endif + #ifdef MOZ_B2G_RIL + @BINPATH@/components/RadioInterfaceLayer.manifest + @BINPATH@/components/RadioInterfaceLayer.js +@@ -450,6 +492,7 @@ + @BINPATH@/components/SafariProfileMigrator.js + @BINPATH@/components/libalerts.dylib + #endif ++#ifndef LIBXUL_SDK + #ifdef MOZ_ENABLE_DBUS + @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ + #endif +@@ -457,6 +500,7 @@ + @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 @@ + @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 + ++#ifndef LIBXUL_SDK + #ifdef MOZ_WEBRTC + @BINPATH@/components/PeerConnection.js + @BINPATH@/components/PeerConnection.manifest + #endif ++#endif + + #ifdef ENABLE_MARIONETTE + @BINPATH@/chrome/marionette@JAREXT@ +@@ -499,6 +545,7 @@ + ; Modules + @BINPATH@/modules/* + ++#ifndef LIBXUL_SDK + ; Safe Browsing + #ifdef MOZ_URL_CLASSIFIER + @BINPATH@/components/nsURLClassifier.manifest +@@ -512,6 +559,7 @@ + #ifdef MOZ_ENABLE_GNOME_COMPONENT + @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@ + #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 ++#ifndef LIBXUL_SDK + @BINPATH@/chrome/toolkit@JAREXT@ + @BINPATH@/chrome/toolkit.manifest ++#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 ++#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) + @BINPATH@/defaults/pref/channel-prefs.js + #else +@@ -573,6 +623,7 @@ + + ; [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/* + #endif + @BINPATH@/res/fonts/* + @BINPATH@/res/dtd/* + @BINPATH@/res/html/* ++#ifndef LIBXUL_SDK + @BINPATH@/res/langGroups.properties + @BINPATH@/res/language.properties ++#endif + @BINPATH@/res/entityTables/* + #ifdef XP_MACOSX + @BINPATH@/res/MainMenu.nib/ + #endif + + ; svg ++#ifndef LIBXUL_SDK + @BINPATH@/res/svg.css + @BINPATH@/components/dom_svg.xpt + @BINPATH@/components/dom_smil.xpt ++#endif + + ; [Personal Security Manager] + ; +@@ -632,11 +688,13 @@ + @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ + #endif ++#ifndef LIBXUL_SDK + @BINPATH@/chrome/pippki@JAREXT@ + @BINPATH@/chrome/pippki.manifest + @BINPATH@/components/pipboot.xpt + @BINPATH@/components/pipnss.xpt + @BINPATH@/components/pippki.xpt ++#endif + + ; for Solaris SPARC + #ifdef SOLARIS diff --git a/mozilla-firefox-prefs.patch b/mozilla-firefox-prefs.patch index bebe2df..f802d12 100644 --- a/mozilla-firefox-prefs.patch +++ b/mozilla-firefox-prefs.patch @@ -1,7 +1,16 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js --- mozilla.orig/browser/app/profile/firefox.js 2008-06-21 12:55:30.000000000 +0200 +++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000 +0200 -@@ -89,12 +89,12 @@ +@@ -94,7 +94,7 @@ pref("extensions.hotfix.certs.1.sha1Fingerprint", "F1:DB:F9:6A:7B:B8:04:FA:48:3C + + // Disable add-ons that are not installed by the user in all scopes by default. + // See the SCOPE constants in AddonManager.jsm for values to use here. +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 3); + + // Dictionary download preference + pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); +@@ -157,12 +157,12 @@ pref("app.update.certs.2.commonName", "aus3.mozilla.org"); // Whether or not app updates are enabled @@ -16,7 +25,7 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile // Defines how the Application Update Service notifies the user about updates: // -@@ -249,7 +249,7 @@ +@@ -252,7 +252,7 @@ #endif // At startup, check if we're the default browser and prompt user if not. @@ -25,7 +34,7 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile // 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 -@@ -391,6 +394,8 @@ +@@ -448,6 +448,8 @@ // 0: no backups created (and deletes all existing backups) pref("browser.bookmarks.max_backups", 10); @@ -34,7 +43,7 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile // Scripts & Windows prefs pref("dom.disable_open_during_load", true); pref("javascript.options.showInConsole", true); -@@ -445,7 +445,7 @@ +@@ -574,7 +576,7 @@ pref("alerts.totalOpenTime", 4000); pref("browser.xul.error_pages.enabled", true); @@ -54,3 +63,14 @@ diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozill + "> +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -1510,7 +1510,7 @@ pref("layout.css.visited_links_enabled", true); + // A value of 0 means use the system DPI. A positive value is used as the DPI. + // This sets the physical size of a device pixel and thus controls the + // interpretation of physical units such as "pt". +-pref("layout.css.dpi", -1); ++pref("layout.css.dpi", 0); + + // Set the number of device pixels per CSS pixel. A value <= 0 means choose + // automatically based on user settings for the platform (e.g., "UI scale factor" diff --git a/mozilla-firefox-system-cairo.patch b/mozilla-firefox-system-cairo.patch new file mode 100644 index 0000000..072173f --- /dev/null +++ b/mozilla-firefox-system-cairo.patch @@ -0,0 +1,34 @@ +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 new file mode 100644 index 0000000..fbba18b --- /dev/null +++ b/mozilla-firefox-system-virtualenv.patch @@ -0,0 +1,53 @@ +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 diff --git a/mozilla-firefox.desktop b/mozilla-firefox.desktop index f148a6e..d7a120a 100644 --- a/mozilla-firefox.desktop +++ b/mozilla-firefox.desktop @@ -73,7 +73,7 @@ Comment[pl]=Przeglądarka WWW oparta o technologię Mozilli Exec=mozilla-firefox %u Icon=mozilla-firefox Terminal=false -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; Type=Application StartupNotify=true Categories=GTK;Network;WebBrowser; diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 7b21118..93e2f91 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -21,27 +21,33 @@ %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 + Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 12.0 +Version: 19.0 Release: 1 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking -Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: 80c3e5927274de7f181fb5f931ac5fd4 -Source1: %{name}.desktop -Source2: %{name}.sh +Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 +# Source0-md5: 3dc732b6ce177792b43324f4bc7164d8 +Source3: %{name}.desktop +Source4: %{name}.sh 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 -Patch6: %{name}-nss_cflags.patch Patch7: %{name}-prefs.patch Patch9: %{name}-no-subshell.patch -Patch10: %{name}-bug-722975-workaround.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 URL: http://www.mozilla.org/projects/firefox/ BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: OpenGL-devel @@ -50,7 +56,7 @@ BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: cairo-devel >= 1.10.2-5 BuildRequires: dbus-glib-devel >= 0.60 -BuildRequires: glib2-devel >= 1:2.18 +BuildRequires: glib2-devel >= 1:2.20 BuildRequires: gtk+2-devel >= 2:2.14 %{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1} BuildRequires: hunspell-devel @@ -61,22 +67,25 @@ BuildRequires: libevent-devel >= 1.4.7 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 +BuildRequires: libjpeg-turbo-devel BuildRequires: libnotify-devel >= 0.4 BuildRequires: libpng(APNG)-devel >= 0.10 -BuildRequires: libpng-devel >= 1.4.1 +BuildRequires: libpng-devel >= 1.5.13 BuildRequires: libstdc++-devel BuildRequires: libvpx-devel >= 1.0.0 -BuildRequires: nspr-devel >= 1:4.9 -BuildRequires: nss-devel >= 1:3.13.3 +BuildRequires: nspr-devel >= 1:%{nspr_ver} +BuildRequires: nss-devel >= 1:%{nss_ver} BuildRequires: pango-devel >= 1:1.14.0 BuildRequires: perl-modules >= 5.004 BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) >= 3.0.9 BuildRequires: python-modules +BuildRequires: python-virtualenv BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.601 -BuildRequires: sqlite3-devel >= 3.7.10 +BuildRequires: sqlite3-devel >= 3.7.14.1 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXext-devel @@ -88,19 +97,21 @@ BuildRequires: xulrunner-devel >= 2:%{version} BuildRequires: zip BuildRequires: zlib-devel >= 1.2.3 Requires(post): mktemp >= 1.5-18 +Requires: desktop-file-utils %if %{with xulrunner} %requires_eq_to xulrunner xulrunner-devel %else Requires: browser-plugins >= 2.0 Requires: cairo >= 1.10.2-5 Requires: dbus-glib >= 0.60 -Requires: glib2 >= 1:2.18 +Requires: glib2 >= 1:2.20 Requires: gtk+2 >= 2:2.14 -Requires: libpng >= 1.4.1 +Requires: libjpeg-turbo +Requires: libpng >= 1.5.13 Requires: libpng(APNG) >= 0.10 Requires: myspell-common -Requires: nspr >= 1:4.8.9 -Requires: nss >= 1:3.13.1 +Requires: nspr >= 1:%{nspr_ver} +Requires: nss >= 1:%{nss_ver} Requires: pango >= 1:1.14.0 Requires: sqlite3 >= %{sqlite_build_version} Requires: startup-notification >= 0.8 @@ -112,11 +123,13 @@ Obsoletes: mozilla-firefox-libs Conflicts: mozilla-firefox-lang-resources < %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+ + # don't satisfy other packages (don't use %{name} here) %define _noautoprovfiles %{_libdir}/mozilla-firefox %if %{without xulrunner} # and as we don't provide them, don't require either -%define _noautoreq libmozjs.so libxpcom.so libxul.so libmozalloc.so +%define _noautoreq libmozalloc.so libmozjs.so libxpcom.so libxul.so %endif %if "%{cc_version}" >= "3.4" @@ -158,11 +171,13 @@ cd mozilla %patch5 -p1 %endif -%patch6 -p1 %patch7 -p1 %patch9 -p2 -%patch10 -p1 +%patch10 -p2 +%patch11 -p2 +%patch12 -p2 +%patch13 -p2 # config/rules.mk is patched by us and js/src/config/rules.mk # is supposed to be exact copy @@ -176,6 +191,10 @@ cat << EOF > .mozconfig . \$topsrcdir/browser/config/mozconfig mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} +# parallel build fails on _xpidlgen/ +%if %{without xulrunner} +mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags} +%endif # Options for 'configure' (same as command-line options). ac_add_options --prefix=%{_prefix} @@ -304,21 +323,17 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation %endif -sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox +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 -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop # files created by firefox -register touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat -%if %{with xulrunner} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh -%endif - cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate #!/bin/sh umask 022 @@ -354,6 +369,7 @@ exit 0 %post %{_sbindir}/%{name}-chrome+xpcom-generate %update_browser_plugins +%update_desktop_database %postun if [ "$1" = 0 ]; then @@ -392,11 +408,16 @@ fi %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 @@ -404,26 +425,26 @@ fi %{_libdir}/%{name}/components/nsBrowserContentHandler.js %{_libdir}/%{name}/components/nsBrowserGlue.js %{_libdir}/%{name}/components/nsPrivateBrowsingService.js -%{_libdir}/%{name}/components/nsSafebrowsingApplication.js %{_libdir}/%{name}/components/nsSessionStartup.js %{_libdir}/%{name}/components/nsSessionStore.js %{_libdir}/%{name}/components/nsSetDefaultBrowser.js %{_libdir}/%{name}/components/nsSidebar.js -%{_libdir}/%{name}/components/PageThumbsProtocol.js -%{_libdir}/%{name}/components/ProfileMigrator.js %{_libdir}/%{name}/components/components.manifest %{_libdir}/%{name}/components/interfaces.manifest -%{_libdir}/%{name}/update-settings.ini - %if %{without xulrunner} +%{_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 @@ -432,6 +453,7 @@ fi %{_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 @@ -457,7 +479,6 @@ fi %{_libdir}/%{name}/components/nsSearchSuggestions.js %{_libdir}/%{name}/components/nsTaggingService.js %{_libdir}/%{name}/components/nsURLFormatter.js -%{_libdir}/%{name}/components/nsUpdateTimerManager.js %{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js %{_libdir}/%{name}/components/nsUrlClassifierLib.js %{_libdir}/%{name}/components/nsUrlClassifierListManager.js @@ -467,6 +488,9 @@ fi %{_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} %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so -- 2.43.0