[packages/iceweasel] - updated packaging patch - updated files for new directory chierarchy - rel 1

baggins baggins at pld-linux.org
Fri Jun 28 11:48:23 CEST 2013 

commit d5be93be85ab27aaafad28577ccf0b18351092fa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jun 28 11:47:33 2013 +0200

    - updated packaging patch
    - updated files for new directory chierarchy
    - rel 1

 iceweasel-packaging.patch | 137 ++++++++++++++++++---------------
 iceweasel.spec            | 190 +++++++++++++++++-----------------------------
 2 files changed, 147 insertions(+), 180 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 76a1b54..edd19df 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -31,7 +31,7 @@ Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
 Version:	22.0
-Release:	0.1
+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
@@ -290,10 +290,10 @@ cd mozilla
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
 	$RPM_BUILD_ROOT%{_desktopdir} \
-	$RPM_BUILD_ROOT%{_datadir}/%{name} \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+	$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
 
 cd obj-%{_target_cpu}
 %{__make} -C browser/installer stage-package \
@@ -312,25 +312,23 @@ 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}/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/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
+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
 %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}/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
-ln -s ../../%{_lib}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
+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
+ln -s ../../../%{_lib}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
 %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
+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
 
 %if %{without xulrunner}
@@ -359,25 +357,25 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 %if %{without xulrunner}
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/pref/vendor.js
 %else
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/preferences/vendor.js
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
 %endif
 
 %if "%{pld_release}" == "ac"
 %if %{without xulrunner}
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/pref/vendor.js
 %else
-cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/preferences/vendor.js
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
 %endif
 %endif
 
 # files created by iceweasel -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!!!
@@ -395,23 +393,17 @@ chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 rm -rf $RPM_BUILD_ROOT
 
 %pretrans
-if [ -d %{_datadir}/%{name}/extensions ] && [ ! -L %{_datadir}/%{name}/extensions ]; then
-	install -d %{_libdir}/%{name}
-	if [ -e %{_libdir}/%{name}/extensions ]; then
-		mv %{_libdir}/%{name}/extensions{,.rpmsave}
-	fi
-	mv %{_datadir}/%{name}/extensions %{_libdir}/%{name}/extensions
+if [ -d %{_datadir}/%{name}/extensions ] && [ ! -L %{_datadir}/%{name}/browser/extensions ]; then
+	install -d %{_libdir}/%{name}/browser
+	mv -v %{_datadir}/%{name}/extensions %{_libdir}/%{name}/browser/extensions
 fi
 if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
 	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
 fi
-for d in chrome defaults greprefs.js icons res searchplugins; do
+for d in chrome defaults icons searchplugins res greprefs.js; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
-		install -d %{_datadir}/%{name}
-		if [ -e %{_datadir}/%{name}/$d ]; then
-			mv %{_datadir}/%{name}/$d{,.rpmsave}
-		fi
-		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
+		install -d %{_datadir}/%{name}/browser
+		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/browser/$d
 	fi
 done
 exit 0
@@ -440,13 +432,46 @@ fi
 %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
+%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/icons
+%{_datadir}/%{name}/browser/searchplugins
+%{_datadir}/%{name}/browser/defaults
+
+# symlinks
+%{_datadir}/%{name}/browser/extensions
+%{_libdir}/%{name}/browser/chrome
+%{_libdir}/%{name}/browser/icons
+%{_libdir}/%{name}/browser/searchplugins
+%{_libdir}/%{name}/browser/defaults
+%if %{with xulrunner}
+%{_libdir}/%{name}/xulrunner
 %endif
-%{_libdir}/%{name}/blocklist.xml
+
+%{_libdir}/%{name}/application.ini
+%{_libdir}/%{name}/browser/blocklist.xml
+%{_libdir}/%{name}/browser/chrome.manifest
+# the signature of the default theme
+%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/browser/omni.ja
+%{_libdir}/%{name}/browser/components/components.manifest
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
+%attr(755,root,root) %{_libdir}/%{name}/iceweasel
+%{_libdir}/%{name}/webapprt
+%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
+
+%{_iconsdir}/hicolor/*/*/iceweasel.png
+%{_desktopdir}/iceweasel.desktop
+
+# files created by iceweasel -register
+%ghost %{_libdir}/%{name}/browser/components/compreg.dat
+%ghost %{_libdir}/%{name}/browser/components/xpti.dat
 
 %if %{with crashreporter}
 %{_libdir}/%{name}/crashreporter
@@ -455,35 +480,6 @@ fi
 %{_libdir}/%{name}/Throbber-small.gif
 %endif
 
-# config?
-%{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/chrome.manifest
-
-%dir %{_libdir}/%{name}/components
-
-%{_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/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/nsPrivateBrowsingServiceObsolete.js
-%{_libdir}/%{name}/components/nsSessionStartup.js
-%{_libdir}/%{name}/components/nsSessionStore.js
-%{_libdir}/%{name}/components/nsSetDefaultBrowser.js
-%{_libdir}/%{name}/components/nsSidebar.js
-
-%{_libdir}/%{name}/components/components.manifest
-%{_libdir}/%{name}/components/interfaces.manifest
-
 %if %{without xulrunner}
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/platform.ini
@@ -549,63 +545,19 @@ fi
 %{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
 %{_libdir}/%{name}/components/Weave.js
 %{_libdir}/%{name}/components/Webapps.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
-%endif
-
-%if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
-%endif
-
-%attr(755,root,root) %{_libdir}/%{name}/iceweasel
-%dir %{_libdir}/%{name}/plugins
-%if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libdbusservice.so
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libmozgnome.so
 %attr(755,root,root) %{_libdir}/%{name}/iceweasel-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
-
-%{_iconsdir}/hicolor/*/*/iceweasel.png
-%{_desktopdir}/iceweasel.desktop
-
-# symlinks
-%{_datadir}/%{name}/extensions
-%{_libdir}/%{name}/chrome
-%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/icons
-%{_libdir}/%{name}/modules
-%{_libdir}/%{name}/searchplugins
-%if %{with xulrunner}
-%{_libdir}/%{name}/xulrunner
-%else
+%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
 %{_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
 %endif
-
-%dir %{_libdir}/%{name}/extensions
-# the signature of the default theme
-%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-
-# files created by iceweasel -register
-%ghost %{_libdir}/%{name}/components/compreg.dat
-%ghost %{_libdir}/%{name}/components/xpti.dat
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index a4b684f..c24a827 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -1,6 +1,25 @@
 --- 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,35 +49,45 @@
+@@ -32,14 +32,18 @@
+ [@AB_CD@]
+ @BINPATH@/browser/chrome/@AB_CD@@JAREXT@
+ @BINPATH@/browser/chrome/@AB_CD at .manifest
++#ifndef LIBXUL_SDK
+ @BINPATH@/chrome/@AB_CD@@JAREXT@
+ @BINPATH@/chrome/@AB_CD at .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]
@@ -24,7 +43,7 @@
  #ifndef MOZ_NATIVE_NSPR
  #ifndef MOZ_FOLD_LIBS
  @BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX at plc4@DLL_SUFFIX@
+@@ -69,17 +79,21 @@
  @BINPATH@/@DLL_PREFIX at plds4@DLL_SUFFIX@
  #endif
  #endif
@@ -46,7 +65,7 @@
  #ifdef XP_WIN32
  @BINPATH@/plugin-hang-ui at BIN_SUFFIX@
  #ifndef MOZ_DEBUG
-@@ -107,14 +117,18 @@
+@@ -111,14 +125,18 @@
  #ifndef XP_UNIX
  @BINPATH@/@MOZ_APP_NAME at .exe
  #else
@@ -64,9 +83,9 @@
 +#endif
  #ifndef XP_OS2
  #ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX at mozsqlite3@DLL_SUFFIX@
-@@ -126,13 +140,16 @@
- @BINPATH@/blocklist.xml
+ #ifndef MOZ_FOLD_LIBS
+@@ -131,13 +149,16 @@
+ @BINPATH@/browser/blocklist.xml
  #ifdef XP_UNIX
  #ifndef XP_MACOSX
 +#ifndef LIBXUL_SDK
@@ -82,7 +101,7 @@
  @BINPATH@/components/alerts.xpt
  #ifdef ACCESSIBILITY
  #ifdef XP_WIN32
-@@ -144,8 +161,10 @@
+@@ -149,8 +170,10 @@
  @BINPATH@/components/appstartup.xpt
  @BINPATH@/components/autocomplete.xpt
  @BINPATH@/components/autoconfig.xpt
@@ -93,7 +112,7 @@
  @BINPATH@/components/caps.xpt
  @BINPATH@/components/chrome.xpt
  @BINPATH@/components/commandhandler.xpt
-@@ -219,7 +238,9 @@
+@@ -233,7 +256,9 @@
  @BINPATH@/components/filepicker.xpt
  #endif
  @BINPATH@/components/find.xpt
@@ -103,7 +122,7 @@
  @BINPATH@/components/gfx.xpt
  @BINPATH@/components/html5.xpt
  @BINPATH@/components/htmlparser.xpt
-@@ -243,7 +264,9 @@
+@@ -256,7 +281,9 @@
  @BINPATH@/components/layout_xul.xpt
  @BINPATH@/components/locale.xpt
  @BINPATH@/components/lwbrk.xpt
@@ -113,7 +132,7 @@
  @BINPATH@/components/mimetype.xpt
  @BINPATH@/components/mozfind.xpt
  @BINPATH@/components/necko_about.xpt
-@@ -275,12 +298,16 @@
+@@ -291,12 +318,16 @@
  @BINPATH@/components/rdf.xpt
  @BINPATH@/components/satchel.xpt
  @BINPATH@/components/saxparser.xpt
@@ -130,7 +149,7 @@
  @BINPATH@/components/shistory.xpt
  @BINPATH@/components/spellchecker.xpt
  @BINPATH@/components/storage.xpt
-@@ -322,6 +349,7 @@
+@@ -341,6 +372,7 @@
  @BINPATH@/components/BrowserElementParent.js
  @BINPATH@/components/FeedProcessor.manifest
  @BINPATH@/components/FeedProcessor.js
@@ -138,15 +157,15 @@
  @BINPATH@/browser/components/BrowserFeeds.manifest
  @BINPATH@/browser/components/FeedConverter.js
  @BINPATH@/browser/components/FeedWriter.js
-@@ -340,6 +368,7 @@
+@@ -356,6 +388,7 @@
+ @BINPATH@/browser/components/DownloadsStartup.js
  @BINPATH@/browser/components/DownloadsUI.js
  @BINPATH@/browser/components/BrowserPlaces.manifest
- @BINPATH@/components/BrowserPageThumbs.manifest
 +#ifndef LIBXUL_SDK
+ @BINPATH@/components/BrowserPageThumbs.manifest
  @BINPATH@/components/SiteSpecificUserAgent.js
  @BINPATH@/components/SiteSpecificUserAgent.manifest
- @BINPATH@/components/toolkitsearch.manifest
-@@ -368,31 +397,39 @@
+@@ -383,31 +416,39 @@
  @BINPATH@/components/NetworkGeolocationProvider.js
  @BINPATH@/components/GPSDGeolocationProvider.manifest
  @BINPATH@/components/GPSDGeolocationProvider.js
@@ -186,7 +205,7 @@
  @BINPATH@/components/txEXSLTRegExFunctions.manifest
  @BINPATH@/components/txEXSLTRegExFunctions.js
  @BINPATH@/components/toolkitplaces.manifest
-@@ -401,10 +438,14 @@
+@@ -416,9 +457,13 @@
  @BINPATH@/components/nsPlacesAutoComplete.manifest
  @BINPATH@/components/nsPlacesAutoComplete.js
  @BINPATH@/components/nsPlacesExpiration.js
@@ -196,12 +215,11 @@
  @BINPATH@/components/PlacesCategoriesStarter.js
  @BINPATH@/components/ColorAnalyzer.js
 +#endif
- @BINPATH@/components/PageThumbsProtocol.js
 +#ifndef LIBXUL_SDK
+ @BINPATH@/components/PageThumbsProtocol.js
  @BINPATH@/components/nsDefaultCLH.manifest
  @BINPATH@/components/nsDefaultCLH.js
- @BINPATH@/components/nsContentPrefService.manifest
-@@ -425,6 +466,7 @@
+@@ -438,6 +483,7 @@
  @BINPATH@/components/contentSecurityPolicy.js
  @BINPATH@/components/contentAreaDropListener.manifest
  @BINPATH@/components/contentAreaDropListener.js
@@ -209,41 +227,34 @@
  #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,6 +508,7 @@
+ #ifdef XP_MACOSX
+ @BINPATH@/browser/components/SafariProfileMigrator.js
  #endif
 +#ifndef LIBXUL_SDK
  #ifdef MOZ_ENABLE_DBUS
  @BINPATH@/components/@DLL_PREFIX at dbusservice@DLL_SUFFIX@
  #endif
-@@ -457,6 +500,7 @@
+@@ -478,6 +525,8 @@
  @BINPATH@/components/nsINIProcessor.js
  @BINPATH@/components/nsPrompter.manifest
  @BINPATH@/components/nsPrompter.js
 +#endif
++#ifndef LIBXUL_SDK
  #ifdef MOZ_DATA_REPORTING
  @BINPATH@/components/DataReporting.manifest
  @BINPATH@/components/DataReportingService.js
-@@ -468,6 +512,7 @@
- #ifdef MOZ_SERVICES_HEALTHREPORT
- @BINPATH@/components/HealthReportComponents.manifest
- #endif
-+#ifndef LIBXUL_SDK
- #ifdef MOZ_SERVICES_SYNC
- @BINPATH@/components/SyncComponents.manifest
- @BINPATH@/components/Weave.js
-@@ -488,14 +533,17 @@
- @BINPATH@/components/AlarmsManager.manifest
+@@ -524,7 +573,9 @@
  @BINPATH@/components/TCPSocket.js
+ @BINPATH@/components/TCPSocketParentIntermediary.js
  @BINPATH@/components/TCPSocket.manifest
 +#endif
  
++#ifndef LIBXUL_SDK
  @BINPATH@/components/AppProtocolHandler.js
  @BINPATH@/components/AppProtocolHandler.manifest
  
-+#ifndef LIBXUL_SDK
- #ifdef MOZ_WEBRTC
+@@ -532,6 +583,7 @@
  @BINPATH@/components/PeerConnection.js
  @BINPATH@/components/PeerConnection.manifest
  #endif
@@ -251,50 +262,58 @@
  
  #ifdef ENABLE_MARIONETTE
  @BINPATH@/chrome/marionette at JAREXT@
-@@ -499,6 +545,7 @@
+@@ -542,6 +594,7 @@
+ 
  ; Modules
+ @BINPATH@/browser/modules/*
++#ifndef LIBXUL_SDK
  @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 at mozgnome@DLL_SUFFIX@
+@@ -559,6 +612,7 @@
+ @BINPATH@/libGLESv2.dll
+ @BINPATH@/@MOZ_D3DCOMPILER_DLL@
  #endif
 +#endif
  
- ; ANGLE GLES-on-D3D rendering library
- #ifdef MOZ_ANGLE_RENDERER
-@@ -531,8 +579,10 @@
+ ; [Browser Chrome Files]
+ @BINPATH@/browser/chrome.manifest
+@@ -571,10 +625,12 @@
  #ifdef SHIP_FEEDBACK
  @BINPATH@/browser/distribution/extensions/testpilot at labs.mozilla.com.xpi
  #endif
 +#ifndef LIBXUL_SDK
  @BINPATH@/chrome/toolkit at JAREXT@
  @BINPATH@/chrome/toolkit.manifest
-+#endif
  @BINPATH@/chrome/recording.manifest
  @BINPATH@/chrome/recording/*
++#endif
  #ifdef MOZ_GTK2
-@@ -560,14 +610,14 @@
- 
- ; [Default Preferences]
+ @BINPATH@/browser/chrome/icons/default/default16.png
+ @BINPATH@/browser/chrome/icons/default/default32.png
+@@ -595,31 +651,36 @@
  ; All the pref files must be part of base to prevent migration bugs
-+#ifndef LIBXUL_SDK
  @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
++#endif
  @BINPATH@/browser/defaults/profile/prefs.js
  
--#ifndef LIBXUL_SDK
+ #ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  ; Technically this is an app pref file, but we are keeping it in the original
  ; gre location for now.
-@@ -566,9 +616,11 @@
+ @BINPATH@/defaults/pref/channel-prefs.js
+ #else
+ ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
+- at BINPATH@/@PREF_DIR@/channel-prefs.js
++ at BINPATH@/browser/@PREF_DIR@/channel-prefs.js
+ #endif
+ 
+ ; Services (gre) prefs
  #ifdef MOZ_SERVICES_NOTIFICATIONS
  @BINPATH@/defaults/pref/services-notifications.js
  #endif
@@ -306,15 +325,11 @@
  
  ; [Layout Engine Resources]
  ; Style Sheets, Graphics and other Resources used by the layout engine. 
-@@ -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 @@
+@@ -646,23 +705,28 @@
  @BINPATH@/res/table-remove-row-hover.gif
  @BINPATH@/res/table-remove-row.gif
  @BINPATH@/res/grabber.gif
@@ -322,14 +337,14 @@
  #ifdef XP_MACOSX
  @BINPATH@/res/cursors/*
  #endif
++#ifndef LIBXUL_SDK
  @BINPATH@/res/fonts/*
  @BINPATH@/res/dtd/*
  @BINPATH@/res/html/*
-+#ifndef LIBXUL_SDK
  @BINPATH@/res/langGroups.properties
  @BINPATH@/res/language.properties
-+#endif
  @BINPATH@/res/entityTables/*
++#endif
  #ifdef XP_MACOSX
  @BINPATH@/res/MainMenu.nib/
  #endif
@@ -343,9 +358,9 @@
  
  ; [Personal Security Manager]
  ;
-@@ -632,11 +688,13 @@
+@@ -683,11 +747,13 @@
+ #endif
  @BINPATH@/@DLL_PREFIX at softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX at ssl3@DLL_SUFFIX@
  #endif
 +#ifndef LIBXUL_SDK
  @BINPATH@/chrome/pippki at JAREXT@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/d5be93be85ab27aaafad28577ccf0b18351092fa

More information about the pld-cvs-commit mailing list