From 505c350f805005bc1d77a0ffd54b21bcdbe01968 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 5 Nov 2013 21:19:51 +0100 Subject: [PATCH] - removed obsolete patches - updated mozldap patch - updated build, install and files --- enigmail-moz.build.patch | 75 ------------------- iceape-glueload-fix.patch | 21 ------ iceape.spec | 153 +++----------------------------------- packaging.patch | 117 ----------------------------- system-mozldap.patch | 59 ++++++++++++--- 5 files changed, 60 insertions(+), 365 deletions(-) delete mode 100644 enigmail-moz.build.patch delete mode 100644 iceape-glueload-fix.patch delete mode 100644 packaging.patch diff --git a/enigmail-moz.build.patch b/enigmail-moz.build.patch deleted file mode 100644 index 78d0540..0000000 --- a/enigmail-moz.build.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/build.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/build/Makefile.in ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/build.orig/Makefile.in 2013-01-20 18:08:40.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/build/Makefile.in 2013-08-08 21:06:45.870424762 +0200 -@@ -35,8 +35,6 @@ - - # Makefile for build directory - --DIRS = -- - # Specify these as parameters to the make command - XPI_MODULE = enigmime - XPI_MODULE_VERS = 1.5 -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in 2013-01-20 18:08:40.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in 2013-08-08 21:08:25.191537344 +0200 -@@ -41,12 +41,6 @@ - - include $(DEPTH)/config/autoconf.mk - --DIRS = modules -- --ifneq ($(OS_ARCH),WINNT) -- DIRS += src --endif -- - .PHONY: dirs $(DIRS) - - all: dirs -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build 1970-01-01 01:00:00.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build 2013-08-08 21:07:45.667761563 +0200 -@@ -0,0 +1,1 @@ -+DIRS += ['modules', 'src'] -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in.orig iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in.orig 2013-01-20 18:08:40.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in 2013-08-08 21:11:17.083457182 +0200 -@@ -51,14 +51,8 @@ - - GECKO18 = $(shell test $(MOZILLA_MAJOR_VERSION) -lt 19 && echo 1) - --DIRS = ipc public -- --ifeq ($(GECKO18),1) -- DIRS += src build --endif -- --DIRS += ui package lang -- -+STANDALONE_MAKEFILE := 1 -+ - PLATFORM_STR = unknown - - # Edit the lines below as needed, depending upon your platform(s) -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig 1970-01-01 01:00:00.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build 2013-08-08 21:11:28.480250891 +0200 -@@ -0,0 +1,1 @@ -+DIRS += ['ipc', 'public', 'ui', 'package', 'lang'] -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/Makefile.in ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/Makefile.in 2013-01-20 18:08:40.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/Makefile.in 2013-08-08 21:10:36.089666637 +0200 -@@ -41,8 +41,6 @@ - VPATH = @srcdir@ - srcdir = @srcdir@ - --DIRS = content -- - .PHONY: dirs $(DIRS) - - all: dirs jar -diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build ---- iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build 1970-01-01 01:00:00.000000000 +0100 -+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build 2013-08-08 21:10:29.579593990 +0200 -@@ -0,0 +1 @@ -+DIRS += ['content'] diff --git a/iceape-glueload-fix.patch b/iceape-glueload-fix.patch deleted file mode 100644 index 0da2ee4..0000000 --- a/iceape-glueload-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp 2006-02-22 22:57:09.000000000 +0100 -+++ seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp.fixed 2008-09-23 21:15:21.000000000 +0200 -@@ -86,8 +86,8 @@ - GetFrozenFunctionsFunc - XPCOMGlueLoad(const char *xpcomFile) - { -- char xpcomDir[MAXPATHLEN]; -- if (realpath(xpcomFile, xpcomDir)) { -+ char * xpcomDir; -+ if (xpcomDir = realpath(xpcomFile, NULL)) { - char *lastSlash = strrchr(xpcomDir, '/'); - if (lastSlash) { - *lastSlash = '\0'; -@@ -98,6 +98,7 @@ - - sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY); - } -+ free( xpcomDir ); - } - - // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is diff --git a/iceape.spec b/iceape.spec index 34c181f..ff2d8ef 100644 --- a/iceape.spec +++ b/iceape.spec @@ -31,7 +31,7 @@ Source0: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/so Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz # Source1-md5: 4a2bbcb020bdb282a660fda8c70d5608 Source2: %{name}-branding.tar.bz2 -# Source2-md5: 0bc28b4382aa8a961f8f7b2ba66d8f89 +# Source2-md5: 3feee544ef515f1dbf19b14479916784 Source3: %{name}-rm_nonfree.sh Source4: %{name}.desktop Source5: %{name}-composer.desktop @@ -42,15 +42,12 @@ Source9: %{name}.sh Patch0: %{name}-branding.patch Patch1: %{name}-pld-branding.patch Patch2: %{name}-agent.patch -Patch3: %{name}-glueload-fix.patch Patch4: system-mozldap.patch Patch5: makefile.patch # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade Patch7: system-virtualenv.patch Patch8: gyp-slashism.patch Patch9: %{name}-system-xulrunner.patch -Patch10: enigmail-moz.build.patch -Patch11: packaging.patch URL: http://www.pld-linux.org/Packages/Iceape BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: OpenGL-devel @@ -80,6 +77,7 @@ BuildRequires: libpng-devel >= 1.4.1 BuildRequires: librsvg BuildRequires: libstdc++-devel BuildRequires: libvpx-devel >= 1.0.0 +BuildRequires: mozldap-devel BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} BuildRequires: pango-devel >= 1:1.14.0 @@ -263,14 +261,11 @@ tar -jxf %{SOURCE2} %patch0 -p1 %patch1 -p1 %patch2 -p1 -#patch3 -p1 -#patch4 -p1 +%patch4 -p1 %patch5 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p2 -%patch10 -p2 -%patch11 -p2 %build cd comm-release @@ -312,7 +307,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 @@ -353,6 +347,7 @@ ac_add_options --enable-calendar %else ac_add_options --disable-calendar %endif +ac_add_options --disable-elf-dynstr-gc ac_add_options --disable-installer ac_add_options --disable-javaxpcom ac_add_options --disable-updater @@ -450,30 +445,19 @@ cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $R %endif # copy manually lightning files, somewhy they are not installed by make -cp -a mozilla/dist/bin/extensions/calendar-timezones@mozilla.org \ - mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ +cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions # 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}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp -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 -%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}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp -ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules 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 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/* \ $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/ @@ -486,8 +470,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions %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} -e "s|%MOZAPPDIR%|%{_libdir}/%{name}|" \ @@ -537,13 +519,13 @@ cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/chrome.manifes # never package these. always remove # nss -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* +#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* # nspr -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so +#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so # mozldap -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so # testpilot quiz -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi +#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi %clean rm -rf $RPM_BUILD_ROOT @@ -572,11 +554,11 @@ fi %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 +%{_libdir}/%{name}/omni.ja %attr(755,root,root) %{_libdir}/%{name}/register %if %{with crashreporter} @@ -591,92 +573,12 @@ fi %{_libdir}/%{name}/chrome.manifest %dir %{_libdir}/%{name}/components - -%{_libdir}/%{name}/components/Aitc.js -%{_libdir}/%{name}/components/AlarmsManager.js -%{_libdir}/%{name}/components/AppsService.js -%{_libdir}/%{name}/components/BrowserElementParent.js -%{_libdir}/%{name}/components/ColorAnalyzer.js -%{_libdir}/%{name}/components/ContactManager.js -%{_libdir}/%{name}/components/FeedConverter.js -%{_libdir}/%{name}/components/FeedWriter.js -%{_libdir}/%{name}/components/SettingsManager.js -%{_libdir}/%{name}/components/SiteSpecificUserAgent.js -%{_libdir}/%{name}/components/TCPSocket.js -%{_libdir}/%{name}/components/TCPSocketParentIntermediary.js -%{_libdir}/%{name}/components/Weave.js -%{_libdir}/%{name}/components/Webapps.js -%{_libdir}/%{name}/components/WebContentConverter.js -%{_libdir}/%{name}/components/messageWakeupService.js -%{_libdir}/%{name}/components/newMailNotificationService.js -%{_libdir}/%{name}/components/nsAbout.js -%{_libdir}/%{name}/components/nsBrowserContentHandler.js -%{_libdir}/%{name}/components/nsComposerCmdLineHandler.js -%{_libdir}/%{name}/components/nsDOMIdentity.js -%{_libdir}/%{name}/components/nsIDService.js -%{_libdir}/%{name}/components/nsSessionStartup.js -%{_libdir}/%{name}/components/nsSessionStore.js -%{_libdir}/%{name}/components/nsSetDefault.js -%{_libdir}/%{name}/components/nsSidebar.js -%{_libdir}/%{name}/components/nsSuiteDownloadManagerUI.js -%{_libdir}/%{name}/components/nsSuiteGlue.js -%{_libdir}/%{name}/components/nsTypeAheadFind.js -%{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js -%{_libdir}/%{name}/components/nsUrlClassifierLib.js -%{_libdir}/%{name}/components/nsUrlClassifierListManager.js -%{_libdir}/%{name}/components/smileApplication.js -%{_libdir}/%{name}/components/PermissionSettings.js - -%{_libdir}/%{name}/components/browser.xpt %{_libdir}/%{name}/components/components.manifest -%{_libdir}/%{name}/components/interfaces.manifest - %attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so %if %{without xulrunner} %{_libdir}/%{name}/dependentlibs.list %{_libdir}/%{name}/platform.ini -%{_libdir}/%{name}/components/ConsoleAPI.js -%{_libdir}/%{name}/components/FeedProcessor.js -%{_libdir}/%{name}/components/GPSDGeolocationProvider.js -%{_libdir}/%{name}/components/NetworkGeolocationProvider.js -%{_libdir}/%{name}/components/PlacesCategoriesStarter.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/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/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/nsSearchService.js -%{_libdir}/%{name}/components/nsSearchSuggestions.js -%{_libdir}/%{name}/components/nsTaggingService.js -%{_libdir}/%{name}/components/nsUpdateTimerManager.js -%{_libdir}/%{name}/components/nsURLFormatter.js -%{_libdir}/%{name}/components/nsWebHandlerApp.js -%{_libdir}/%{name}/components/storage-Legacy.js -%{_libdir}/%{name}/components/storage-mozStorage.js -%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so %attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh @@ -691,35 +593,17 @@ fi # symlinks %{_libdir}/%{name}/chrome %{_libdir}/%{name}/defaults -%{_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}/modules -%if %{with enigmail} -%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm -%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm -%exclude %{_datadir}/%{name}/modules/keyManagement.jsm -%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm -%exclude %{_datadir}/%{name}/modules/subprocess.jsm -%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js -%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js -%endif %{_datadir}/%{name}/searchplugins -%if %{without xulrunner} -%{_datadir}/%{name}/greprefs.js -%{_datadir}/%{name}/res -%endif %dir %{_datadir}/%{name}/extensions %dir %{_libdir}/%{name}/extensions @@ -731,22 +615,6 @@ fi %ghost %{_libdir}/%{name}/components/compreg.dat %ghost %{_libdir}/%{name}/components/xpti.dat -%{_libdir}/%{name}/components/glautocomp.js -%{_libdir}/%{name}/components/jsmimeemitter.js -%{_libdir}/%{name}/components/mail.xpt -%{_libdir}/%{name}/components/mdn-service.js -%{_libdir}/%{name}/components/msgAsyncPrompter.js -%{_libdir}/%{name}/components/newsblog.js -%{_libdir}/%{name}/components/nsAbAutoCompleteMyDomain.js -%{_libdir}/%{name}/components/nsAbAutoCompleteSearch.js -%{_libdir}/%{name}/components/nsAbLDAPAttributeMap.js -%{_libdir}/%{name}/components/nsLDAPProtocolHandler.js -%{_libdir}/%{name}/components/nsMailNewsCommandLineHandler.js -%{_libdir}/%{name}/components/nsMsgTraitService.js -%{_libdir}/%{name}/components/nsSMTPProtocolHandler.js -%{_libdir}/%{name}/components/offlineStartup.js -%{_libdir}/%{name}/components/smime-service.js - %{_libdir}/%{name}/isp %dir %{_datadir}/%{name}/isp %{_datadir}/%{name}/isp/Bogofilter.sfd @@ -780,7 +648,6 @@ fi %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite -%{_libdir}/%{name}/extensions/calendar-timezones@mozilla.org %endif %if %{with enigmail} diff --git a/packaging.patch b/packaging.patch deleted file mode 100644 index 1bdd503..0000000 --- a/packaging.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- iceape-2.20/comm-release/suite/installer/removed-files.in.orig 2013-08-15 17:04:13.800677008 +0200 -+++ iceape-2.20/comm-release/suite/installer/removed-files.in 2013-08-15 17:08:14.499464514 +0200 -@@ -192,9 +192,6 @@ - D3DCompiler_42.dll - d3dx9_42.dll - d3dx9_43.dll --#ifdef UNIX_BUT_NOT_MAC --components/nsFilePicker.js --#endif - #ifndef MOZ_CRASHREPORTER - #ifdef XP_MACOSX - crashreporter.app/ -@@ -617,34 +614,9 @@ - chrome/gloda.jar - chrome/nonlocalized.manifest - chrome/localized.manifest -- components/addonManager.js - components/Aitc.js -- components/AlarmsManager.js -- components/amContentHandler.js -- components/amWebInstallListener.js -- components/BrowserElementParent.js -- components/ColorAnalyzer.js -- components/ConsoleAPI.js -- components/ContactManager.js -- components/contentAreaDropListener.js -- components/contentSecurityPolicy.js -- components/crypto-SDR.js -- components/FeedConverter.js -- components/FeedProcessor.js -- components/FeedWriter.js -- components/glautocomp.js - components/GPSDGeolocationProvider.js -- components/jsconsole-clhandler.js -- components/jsmimeemitter.js -- components/mdn-service.js -- components/msgAsyncPrompter.js -- components/NetworkGeolocationProvider.js - components/NotificationsComponents.manifest -- components/newsblog.js -- components/nsAbAutoCompleteMyDomain.js -- components/nsAbAutoCompleteSearch.js -- components/nsAbLDAPAttributeMap.js -- components/nsAbout.js - components/nsAboutCertError.js - components/nsAboutData.js - components/nsAboutFeeds.js -@@ -653,69 +625,10 @@ - components/nsAboutSessionRestore.js - components/nsAboutSyncTabs.js - components/nsBadCertHandler.js -- components/nsBlocklistService.js -- components/nsBrowserContentHandler.js -- components/nsComposerCmdLineHandler.js -- components/nsContentDispatchChooser.js -- components/nsContentPrefService.js -- components/nsDefaultCLH.js -- components/nsDOMIdentity.js -- #ifdef UNIX_BUT_NOT_MAC -- components/nsFilePicker.js -- #endif -- components/nsFormAutoComplete.js -- components/nsFormHistory.js -- components/nsHandlerService.js -- components/nsHelperAppDlg.js -- components/nsIDService.js -- components/nsINIProcessor.js -- components/nsInputListAutoComplete.js -- components/nsLDAPProtocolHandler.js -- components/nsLivemarkService.js -- components/nsLoginInfo.js -- components/nsLoginManager.js -- components/nsLoginManagerPrompter.js -- components/nsMailNewsCommandLineHandler.js -- components/nsMsgTraitService.js -- components/nsPlacesAutoComplete.js - components/nsPlacesDBFlush.js -- components/nsPlacesExpiration.js -- components/nsPrompter.js -- components/nsSearchService.js -- components/nsSearchSuggestions.js -- components/nsSessionStartup.js -- components/nsSessionStore.js -- components/nsSetDefault.js -- components/nsSidebar.js -- components/nsSMTPProtocolHandler.js -- components/nsSuiteDownloadManagerUI.js -- components/nsSuiteGlue.js -- components/nsTaggingService.js - components/nsTryToClose.js -- components/nsTypeAheadFind.js - components/nsUpdateService.js - components/nsUpdateServiceStub.js -- components/nsUpdateTimerManager.js -- #ifdef MOZ_URL_CLASSIFIER -- components/nsUrlClassifierHashCompleter.js -- components/nsUrlClassifierLib.js -- components/nsUrlClassifierListManager.js -- #endif -- components/nsURLFormatter.js -- components/nsWebHandlerApp.js -- components/offlineStartup.js -- components/PlacesCategoriesStarter.js -- components/SettingsManager.js -- components/SiteSpecificUserAgent.js -- components/smileApplication.js -- components/smime-service.js -- components/storage-Legacy.js -- components/storage-mozStorage.js -- components/TCPSocket.js -- components/txEXSLTRegExFunctions.js -- components/Weave.js -- components/Webapps.js -- components/WebContentConverter.js - components/browser.xpt - components/binary.manifest - components/interfaces.manifest diff --git a/system-mozldap.patch b/system-mozldap.patch index 74a57b3..65a95bb 100644 --- a/system-mozldap.patch +++ b/system-mozldap.patch @@ -1,8 +1,8 @@ --- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 +++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200 -@@ -5032,6 +5032,13 @@ - MOZ_LDAP_XPCOM=, - MOZ_LDAP_XPCOM=1) +@@ -134,6 +134,13 @@ + AC_MSG_RESULT([no]) + fi +dnl system LDAP Support +dnl ======================================================== @@ -14,12 +14,53 @@ dnl ======================================================== dnl = Trademarked Branding dnl ======================================================== -@@ -7612,7 +7619,7 @@ +--- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 ++++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200 +@@ -59,7 +59,12 @@ + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) + +-if test "$MOZ_LDAP_XPCOM"; then ++if test "$MOZ_LDAP_DIR" ; then ++ LDAP_CFLAGS=$(pkg-config --cflags mozldap) ++ LDAP_LIBS=$(pkg-config --libs mozldap) ++ LDAP_COMPONENT=mozldap ++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)" ++elif test "$MOZ_LDAP_XPCOM"; then + LDAP_CFLAGS='-I${DIST}/public/ldap' + if test "$OS_ARCH" = "WINNT"; then + if test -n "$GNU_CC"; then +@@ -118,7 +130,7 @@ + + # if we're building the LDAP XPCOM component, we need to build + # the c-sdk first. +-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then ++if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then + # Save configure args so we can restore them after configuring LDAP. + _save_ac_configure_args="$ac_configure_args" + ac_configure_args="$_SUBDIR_CONFIG_ARGS" +--- mozilla/suite/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 ++++ mozilla/suite/configure.in 2010-07-06 11:14:54.350499449 +0200 +@@ -59,7 +59,12 @@ + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) + +-if test "$MOZ_LDAP_XPCOM"; then ++if test "$MOZ_LDAP_DIR" ; then ++ LDAP_CFLAGS=$(pkg-config --cflags mozldap) ++ LDAP_LIBS=$(pkg-config --libs mozldap) ++ LDAP_COMPONENT=mozldap ++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)" ++elif test "$MOZ_LDAP_XPCOM"; then + LDAP_CFLAGS='-I${DIST}/public/ldap' + if test "$OS_ARCH" = "WINNT"; then + if test -n "$GNU_CC"; then +@@ -113,7 +125,7 @@ - # if we're building the LDAP XPCOM component, we need to build - # the c-sdk first. + # if we're building the LDAP XPCOM component, we need to build + # the c-sdk first. -if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then +if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then - # these subdirs may not yet have been created in the build tree. - # don't use the "-p" switch to mkdir, since not all platforms have it - if test ! -d "directory/c-sdk/ldap"; then + # Save configure args so we can restore them after configuring LDAP. + _save_ac_configure_args="$ac_configure_args" + ac_configure_args="$_SUBDIR_CONFIG_ARGS" -- 2.44.0