Bug 1230778 - Port changes from bug 821291 (move libmozgnome into libxul) for c-c. r=jcranmer, a=rkent
authoraleth <aleth@instantbird.org>
Mon, 07 Dec 2015 18:27:13 +0100
changeset 26599 2fbcc55372e495899a90d5c29d4a4912771c44a5
parent 26598 7acb6c59ef1932f26548e1c386188f00f1580f13
child 26600 98cd9278b8ac5f89b15a99879b3afaac2ce73e97
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, rkent
bugs1230778, 821291
Bug 1230778 - Port changes from bug 821291 (move libmozgnome into libxul) for c-c. r=jcranmer, a=rkent
im/installer/package-manifest.in
mail/installer/package-manifest.in
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -721,13 +721,8 @@
 #ifdef XP_UNIX
 @RESPATH@/Throbber-small.gif
 #endif
 #endif
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 @BINPATH@/breakpadinjector.dll
 #endif
 #endif
-
-; GNOME hooks
-#ifdef MOZ_ENABLE_GNOME_COMPONENT
-@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
-#endif
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -150,19 +150,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @RESPATH@/defaults/messenger/mailViews.dat
 @RESPATH@/defaults/profile/localstore.rdf
 @RESPATH@/defaults/profile/prefs.js
 @RESPATH@/defaults/profile/mimeTypes.rdf
 
 @RESPATH@/isp/*
 
-#if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT)
-@RESPATH@/components/components.manifest
-#endif
 @RESPATH@/components/aboutRedirector.js
 @RESPATH@/components/activity.xpt
 @RESPATH@/components/activityComponents.manifest
 @RESPATH@/components/cloudFileComponents.manifest
 @RESPATH@/components/cloudfile.xpt
 @RESPATH@/components/addrbook.xpt
 @RESPATH@/components/fts3tok.xpt
 @RESPATH@/components/folderLookupService.js
@@ -632,20 +629,16 @@
 @RESPATH@/components/nsInputListAutoComplete.js
 @RESPATH@/components/formautofill.manifest
 @RESPATH@/components/FormAutofillContentService.js
 @RESPATH@/components/FormAutofillStartup.js
 @RESPATH@/components/contentAreaDropListener.manifest
 @RESPATH@/components/contentAreaDropListener.js
 @RESPATH@/components/PackagedAppUtils.manifest
 @RESPATH@/components/PackagedAppUtils.js
-; GNOME hooks
-#ifdef MOZ_ENABLE_GNOME_COMPONENT
-@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
-#endif
 
 #ifdef MOZ_CALENDAR
 [calendar]
 #ifdef NIGHTLY_BUILD
 @RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
 #else
 @RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
 #endif