- updated to 2.31

- updated makefile,enable-addons,system-virtualenv,system-mozldap patches
- removed obsolete pixman patch
- venkman js-debugger is gone

diff --git a/makefile.patch b/makefile.patch
index 46882cce95a770170ca92122978c9f627e7ad3a8..f210af0615ebb64892b7ab68d38ec6e2d180cade 100644 (file)
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,28 +1,28 @@
---- mozilla/Makefile.in~       2011-08-12 16:52:03.000000000 +0300
-+++ mozilla/Makefile.in        2011-08-26 13:00:59.373870016 +0300
+--- comm-release/Makefile.in.orig      2014-12-11 16:09:07.771804209 +0100
++++ comm-release/Makefile.in   2014-12-11 16:37:56.318398334 +0100
 @@ -26,21 +26,7 @@
  
  include $(topsrcdir)/config/config.mk
  
--default alldep all:: $(topsrcdir)/configure config.status
+-libs binaries export tools:: $(topsrcdir)/configure config.status
 -
 -$(topsrcdir)/configure: $(topsrcdir)/configure.in
--      @echo "STOP!  configure.in has changed, and your configure is out of date."
--      @echo "Please rerun autoconf and configure."
--      @echo "To ignore this message, touch 'configure' in the source directory."
+-      @echo 'STOP!  configure.in has changed, and your configure is out of date.'
+-      @echo 'Please rerun autoconf and configure.'
+-      @echo 'To ignore this message, touch "configure" in the source directory.'
 -      @exit 1
 -
 -config.status: $(topsrcdir)/configure
--      @echo "STOP!  configure has changed and needs to be run in this build directory."
--      @echo "Please rerun configure."
--      @echo "To ignore this message, touch 'config.status' in the build directory."
+-      @echo 'STOP!  configure has changed and needs to be run in this build directory.'
+-      @echo 'Please rerun configure.'
+-      @echo 'To ignore this message, touch "config.status" in the build directory.'
 -      @exit 1
 -
 -default export libs clean realclean distclean alldep \
 +default export libs clean realclean distclean \
+ package installer package-compare stage-package install source-package \
+ upload source-upload hg-bundle l10n-check \
  maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES)
-       $(MAKE) -C mozilla $@
- 
 --- mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300
 +++ mozilla/client.mk  2011-08-26 13:10:11.365956960 +0300
 @@ -278,8 +278,8 @@

diff --git a/seamonkey-enable-addons.patch b/seamonkey-enable-addons.patch
index 6eb395ba1d5eada25ab0d4cf6b93351b80a66339..6002b15b9af4cb9429c85b54e01cb3ecd42ec7ed 100644 (file)
--- a/seamonkey-enable-addons.patch
+++ b/seamonkey-enable-addons.patch
@@ -1,6 +1,5 @@
-diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js
---- seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old 2011-11-21 11:20:08.000000000 +0100
-+++ seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js     2011-12-14 12:40:24.074179826 +0100
+--- comm-release/mail/app/profile/all-thunderbird.js.old       2011-11-21 11:20:08.000000000 +0100
++++ comm-release/mail/app/profile/all-thunderbird.js   2011-12-14 12:40:24.074179826 +0100
 @@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
  // Disable add-ons installed into the shared user and shared system areas by
  // default. This does not include the application directory. See the SCOPE
@@ -10,19 +9,8 @@ diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seam
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
---- iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.orig   2014-05-14 18:10:44.574018230 +0200
-+++ iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm        2014-05-14 18:13:00.020682073 +0200
-@@ -2051,7 +2051,7 @@
-         this.showUpgradeUI();
-         flushCaches = true;
-       }
--      else if (aAppChanged === undefined) {
-+      else {
-         // For new profiles we will never need to show the add-on selection UI
-         Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
-       }
---- iceape-2.22/comm-release/suite/browser/browser-prefs.js~   2013-11-06 19:54:38.789734061 +0100
-+++ iceape-2.22/comm-release/suite/browser/browser-prefs.js    2013-11-06 20:55:33.765611935 +0100
+--- comm-release/suite/browser/browser-prefs.js~       2013-11-06 19:54:38.789734061 +0100
++++ comm-release/suite/browser/browser-prefs.js        2013-11-06 20:55:33.765611935 +0100
 @@ -616,7 +616,7 @@
  // Disable add-ons installed into the shared user and shared system areas by
  // default. This does not include the application directory. See the SCOPE
@@ -32,8 +20,8 @@ diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seam
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
---- iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js~   2013-10-29 02:20:40.000000000 +0100
-+++ iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js    2013-11-06 20:56:58.633092070 +0100
+--- comm-release/mozilla/browser/app/profile/firefox.js~       2013-10-29 02:20:40.000000000 +0100
++++ comm-release/mozilla/browser/app/profile/firefox.js        2013-11-06 20:56:58.633092070 +0100
 @@ -62,7 +62,7 @@
  
  // Disable add-ons that are not installed by the user in all scopes by default.

diff --git a/seamonkey-pixman.patch b/seamonkey-pixman.patch
deleted file mode 100644 (file)
index c265c84..0000000
--- a/seamonkey-pixman.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-release/config/config.mk.orig 2014-04-29 06:55:06.000000000 +0200
-+++ comm-release/config/config.mk      2014-05-15 19:16:52.358801349 +0200
-@@ -411,7 +411,7 @@
- #
- CCC           = $(CXX)
- 
--OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
-+OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
- 
- INCLUDES = \
-   $(LOCAL_INCLUDES) \

diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index 3650d5697d974a2f36573b77a98fd3a6ebd9e257..e3f7b2cd0e5f3d38b179589e8de94d125dc14f8a 100644 (file)
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -10,3 +10,14 @@
  
      @property
      def python_path(self):
+--- comm-release/mail/test/resources/installmozmill.py.orig    2014-10-14 08:26:59.000000000 +0200
++++ comm-release/mail/test/resources/installmozmill.py 2014-12-02 17:52:03.074177834 +0100
+@@ -79,7 +79,7 @@
+   env = os.environ.copy()
+   env.pop('PYTHONHOME', None)
+   # The --no-site-packages is because of https://github.com/pypa/virtualenv/issues/165
+-  returncode = call([sys.executable, os.path.join('virtualenv', 'virtualenv.py'),
++  returncode = call([sys.executable, '/usr/bin/virtualenv',
+                      destination], env=env)
+   if returncode:
+     print 'Failure to install virtualenv'

diff --git a/seamonkey-venkman.desktop b/seamonkey-venkman.desktop
deleted file mode 100644 (file)
index f3edf91..0000000
--- a/seamonkey-venkman.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=SeaMonkey Community Edition Venkman
-Name[pl]=SeaMonkey Community Edition Venkman
-Comment=JavaScript Debugger
-Comment[pl]=Debugger JavaScript
-Exec=seamonkey -venkman
-Icon=seamonkey
-Terminal=false
-Type=Application
-Categories=Development;WebDevelopment;
-# vi: encoding=utf-8

diff --git a/seamonkey.spec b/seamonkey.spec
index 3bf2b001b77f0d4d8db0c3e2dacf75a96cd3dd13..07959fd991c88d25443f1d58a265e09e37141fd7 100644 (file)
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -9,8 +9,8 @@
 %bcond_with    tests           # enable tests (whatever they check)
 
 %define                nspr_ver        4.10.3
-%define                nss_ver         3.16
-%define                xulrunner_ver   29.0
+%define                nss_ver         3.17.2
+%define                xulrunner_ver   34.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -22,24 +22,22 @@ Summary(es.UTF-8):  Navegador de Internet SeaMonkey Community Edition
 Summary(pl.UTF-8):     SeaMonkey Community Edition - przeglądarka WWW
 Summary(pt_BR.UTF-8):  Navegador SeaMonkey Community Edition
 Name:          seamonkey
-Version:       2.26.1
+Version:       2.31
 Release:       1
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
-# Source0-md5: 4bfa46b370b4d211eef56b90277a9517
+# Source0-md5: 44b6f9cfc2a95fd08dba35ff236d306e
 Source4:       %{name}.desktop
 Source5:       %{name}-composer.desktop
 Source6:       %{name}-chat.desktop
 Source7:       %{name}-mail.desktop
-Source8:       %{name}-venkman.desktop
 Source9:       %{name}.sh
 Patch1:                %{name}-pld-branding.patch
 Patch2:                %{name}-agent.patch
 Patch3:                %{name}-enable-addons.patch
 Patch4:                system-mozldap.patch
 Patch5:                makefile.patch
-Patch6:                %{name}-pixman.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch7:                %{name}-system-virtualenv.patch
 Patch9:                %{name}-system-xulrunner.patch
@@ -68,23 +66,23 @@ BuildRequires:      libjpeg-devel >= 6b
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libnotify-devel >= 0.4
 BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 2:1.6.7
+BuildRequires: libpng-devel >= 2:1.6.13
 BuildRequires: libstdc++-devel
 BuildRequires: libvpx-devel >= 1.3.0
-BuildRequires: mozldap-devel
+BuildRequires: mozldap-devel >= 6.0
 BuildRequires: nspr-devel >= 1:%{nspr_ver}
 BuildRequires: nss-devel >= 1:%{nss_ver}
-BuildRequires: pango-devel >= 1:1.14.0
+BuildRequires: pango-devel >= 1:1.22.0
 BuildRequires: perl-base >= 1:5.6
 BuildRequires: perl-modules >= 5.004
 BuildRequires: pkgconfig
 BuildRequires: python >= 1:2.5
 BuildRequires: python-modules
-BuildRequires: python-virtualenv
+BuildRequires: python-virtualenv >= 1.11.6-2
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.8.2
+BuildRequires: sqlite3-devel >= 3.8.6
 BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXScrnSaver-devel
@@ -111,13 +109,13 @@ Requires: glib2 >= 1:2.20
 %{!?with_gtk3:Requires:        gtk+2 >= 2:2.18}
 %{?with_gtk3:Requires: gtk+3 >= 3.0.0}
 Requires:      libjpeg-turbo
-Requires:      libpng >= 2:1.6.7
+Requires:      libpng >= 2:1.6.13
 Requires:      libpng(APNG) >= 0.10
 Requires:      libvpx >= 1.3.0
 Requires:      myspell-common
 Requires:      nspr >= 1:%{nspr_ver}
 Requires:      nss >= 1:%{nss_ver}
-Requires:      pango >= 1:1.14.0
+Requires:      pango >= 1:1.22.0
 Requires:      sqlite3 >= %{sqlite_build_version}
 Requires:      startup-notification >= 0.8
 %endif
@@ -127,6 +125,7 @@ Obsoletes:  light
 Obsoletes:     mozilla
 Obsoletes:     mozilla-gnomevfs
 Obsoletes:     seamonkey-calendar
+Obsoletes:     seamonkey-js-debugger
 Obsoletes:     seamonkey-libs
 Obsoletes:     seamonkey-mailnews
 Obsoletes:     seamonkey-gnomevfs
@@ -141,8 +140,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # don't satisfy other packages
 %define                _noautoprovfiles        %{_libdir}/%{name}
 # and as we don't provide them, don't require either
-%define                _noautoreq      libmozjs.so libxpcom.so libxul.so libjemalloc.so %{!?with_xulrunner:libmozalloc.so}
-%define                _noautoreqdep   libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpistub.so
+%if %{without xulrunner}
+%define                _noautoreq      libmozalloc.so libmozjs.so libmozsandbox.so libxul.so
+%endif
 
 %description
 SeaMonkey Community Edition is an open-source web browser, designed
@@ -234,10 +234,9 @@ chrome w SeaMonkey Community Edition lub tworzących strony WWW.
 cd comm-release
 %patch1 -p1
 %patch2 -p1
-%patch3 -p2
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch9 -p2
 
@@ -323,7 +322,7 @@ ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:ca
 ac_add_options --enable-gio
 %if %{with ldap}
 ac_add_options --enable-ldap
-ac_add_options --with-system-ldap
+ac_add_options --enable-system-ldap
 %else
 ac_add_options --disable-ldap
 %endif
@@ -344,6 +343,7 @@ ac_add_options --with-system-libxul
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
 ac_add_options --with-system-ffi
+ac_add_options --with-system-icu
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
@@ -373,7 +373,8 @@ install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_libdir}} \
        $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
        $RPM_BUILD_ROOT%{_datadir}/%{name} \
-       $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
+       $RPM_BUILD_ROOT%{_mandir}/man1
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
@@ -385,7 +386,8 @@ cwd=`pwd`
        installdir=%{_libdir}/%{name} \
        PKG_SKIP_STRIP=1
 
-cp -a mozilla/dist/seamonkey/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
+cp -a dist/seamonkey/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
+cp -p dist/man/man1/seamonkey.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %if %{with xulrunner}
 # >= 5.0 seems to require this
@@ -401,8 +403,10 @@ install -d $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name}
 cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name}
 %endif
 
-# copy manually lightning files, somewhy they are not installed by make
-cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
+# copy manually lightning and chat files, somewhy they are not installed by make
+cp -a dist/bin/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
+cp -a dist/bin/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi \
        $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
 
 # move arch independant ones to datadir
@@ -435,7 +439,7 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 sed 's,@LIBDIR@,%{_libdir},' %{SOURCE9} > $RPM_BUILD_ROOT%{_bindir}/seamonkey
 chmod a+rx $RPM_BUILD_ROOT%{_bindir}/seamonkey
 
-install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
+install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
        $RPM_BUILD_ROOT%{_desktopdir}
 
 cp -p %{topdir}/comm-release/suite/branding/nightly/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
@@ -461,13 +465,6 @@ rm -rf $HOME
 EOF
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/register
 
-%if %{without xulrunner}
-# never package these. always remove
-# mozldap
-%{__sed} -i '/lib\(ldap\|ldif\|prldap\)60.so/d' $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -484,6 +481,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/seamonkey
+%{_mandir}/man1/seamonkey.1*
 
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
@@ -493,6 +491,7 @@ 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}/libmozsandbox.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %endif
 
@@ -574,20 +573,7 @@ fi
 %if %{with lightning}
 %files addon-lightning
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/application.ini
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
-%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components
-%attr(755,root,root) %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.so
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.js
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.manifest
-%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.xpt
-%{_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/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
 %endif
 
 %files chat
@@ -595,11 +581,6 @@ fi
 %{_libdir}/%{name}/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
 %{_desktopdir}/%{name}-chat.desktop
 
-%files js-debugger
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi
-%{_desktopdir}/%{name}-venkman.desktop
-
 %files dom-inspector
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/extensions/inspector@mozilla.org.xpi

diff --git a/system-mozldap.patch b/system-mozldap.patch
index 65a95bb5d6b2e3968b0465d8042d48ce2fa0f444..a4ce5ac1e0d6a23108a0cb1d32c384e7985860d3 100644 (file)
--- a/system-mozldap.patch
+++ b/system-mozldap.patch
@@ -1,26 +1,17 @@
---- mozilla/configure.in.orig  2010-06-23 19:43:07.000000000 +0200
-+++ mozilla/configure.in       2010-07-06 11:14:54.350499449 +0200
-@@ -134,6 +134,13 @@
-   AC_MSG_RESULT([no])
- fi
- 
-+dnl system LDAP Support
-+dnl ========================================================
-+MOZ_ARG_WITH_STRING(system-ldap,
-+[  --with-system-ldap[=PFX]
-+                          Use system mozldap [installed at prefix PFX]],
-+    MOZ_LDAP_DIR=$withval)
-+
- dnl ========================================================
- dnl = Trademarked Branding 
- dnl ========================================================
---- 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 @@
+--- comm-release/mail/configure.in.orig        2014-12-03 07:11:58.000000000 +0100
++++ comm-release/mail/configure.in     2014-12-10 21:34:07.344611754 +0100
+@@ -50,7 +50,19 @@
      MOZ_LDAP_XPCOM=,
      MOZ_LDAP_XPCOM=1)
  
 -if test "$MOZ_LDAP_XPCOM"; then
++dnl system LDAP Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-ldap,
++[  --enable-system-ldap
++                          Use system mozldap],
++    MOZ_LDAP_DIR=yes)
++
 +if test "$MOZ_LDAP_DIR" ; then
 +    LDAP_CFLAGS=$(pkg-config --cflags mozldap)
 +    LDAP_LIBS=$(pkg-config --libs mozldap)
@@ -28,9 +19,9 @@
 +    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 @@
+ fi
+ 
+@@ -77,7 +89,7 @@
  
  # if we're building the LDAP XPCOM component, we need to build
  # the c-sdk first.
@@ -39,13 +30,20 @@
      # 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 @@
+--- comm-release/suite/configure.in.orig       2014-12-03 07:12:00.000000000 +0100
++++ comm-release/suite/configure.in    2014-12-10 21:35:29.477941640 +0100
+@@ -50,7 +50,19 @@
      MOZ_LDAP_XPCOM=,
      MOZ_LDAP_XPCOM=1)
  
 -if test "$MOZ_LDAP_XPCOM"; then
++dnl system LDAP Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-ldap,
++[  --enable-system-ldap
++                          Use system mozldap],
++    MOZ_LDAP_DIR=yes)
++
 +if test "$MOZ_LDAP_DIR" ; then
 +    LDAP_CFLAGS=$(pkg-config --cflags mozldap)
 +    LDAP_LIBS=$(pkg-config --libs mozldap)
@@ -53,9 +51,19 @@
 +    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 @@
+ fi
+ 
+@@ -68,6 +80,9 @@
+ 
+ AC_SUBST(MOZ_LDAP_XPCOM)
+ AC_SUBST(LDAP_CFLAGS)
++AC_SUBST_LIST(LDAP_LIBS)
++AC_SUBST(LDAP_COMPONENT)
++AC_SUBST(LDAP_MODULE)
+ 
+ dnl =========================================================
+ dnl = MAPI support (Windows only)
+@@ -77,7 +92,7 @@
  
  # if we're building the LDAP XPCOM component, we need to build
  # the c-sdk first.
@@ -64,3 +72,80 @@
      # Save configure args so we can restore them after configuring LDAP.
      _save_ac_configure_args="$ac_configure_args"
      ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+--- comm-release/ldap/moz.build.orig   2014-12-03 07:11:58.000000000 +0100
++++ comm-release/ldap/moz.build        2014-12-13 21:33:15.543736333 +0100
+@@ -14,8 +14,4 @@
+         '/ldap/sdks/c-sdk/ldap/libraries/libprldap/nsldappr32v60',
+     ]
+ else:
+-    USE_LIBS += [
+-        '/ldap/sdks/c-sdk/ldap/libraries/libldap/ldap60',
+-        '/ldap/sdks/c-sdk/ldap/libraries/libldif/ldif60',
+-        '/ldap/sdks/c-sdk/ldap/libraries/libprldap/prldap60',
+-    ]
++    OS_LIBS += CONFIG['LDAP_LIBS']
+--- comm-release/ldap/Makefile.in.orig 2014-12-03 07:11:58.000000000 +0100
++++ comm-release/ldap/Makefile.in      2014-12-14 14:35:24.641162595 +0100
+@@ -7,11 +7,7 @@
+ # reach in and just install the headers that we need.
+ 
+ export::
+-      $(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/config export
+-      $(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk/ldap/include export
+ 
+ libs clean distclean::
+-      $(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk $@
+ 
+ target::
+-      $(MAKE) -C $(DEPTH)/ldap/sdks/c-sdk export
+--- comm-release/mozilla/build/autoconf/config.status.m4.orig  2014-12-03 07:22:33.000000000 +0100
++++ comm-release/mozilla/build/autoconf/config.status.m4       2014-12-20 11:51:52.906485837 +0100
+@@ -157,6 +157,10 @@
+   variable='$'$ac_subst_arg
+   echo "    (''' $ac_subst_arg ''', r''' `eval echo $variable` ''')," >> $CONFIG_STATUS
+ done
++for ac_subst_arg in $_subconfigure_ac_subst_list_args; do
++  variable='$'$ac_subst_arg
++  echo "    (''' $ac_subst_arg ''', list(r''' `eval echo $variable` '''.split()))," >> $CONFIG_STATUS
++done
+ 
+ cat >> $CONFIG_STATUS <<\EOF
+ ] ]
+--- comm-release/mozilla/build/autoconf/subconfigure.m4.orig   2014-12-03 07:22:33.000000000 +0100
++++ comm-release/mozilla/build/autoconf/subconfigure.m4        2014-12-20 11:50:26.996489440 +0100
+@@ -31,6 +31,11 @@
+ _subconfigure_ac_subst_args="$_subconfigure_ac_subst_args $1"
+ ])
+ 
++AC_DEFUN([AC_SUBST_LIST],
++[
++_subconfigure_ac_subst_list_args="$_subconfigure_ac_subst_list_args $1"
++])
++
+ dnl Override for AC_DEFINE.
+ AC_DEFUN([AC_DEFINE],
+ [
+--- comm-release/mozilla/configure.orig        2014-12-03 07:23:55.000000000 +0100
++++ comm-release/mozilla/configure     2014-12-21 08:15:22.603405124 +0100
+@@ -29627,6 +29627,10 @@
+   variable='$'$ac_subst_arg
+   echo "    (''' $ac_subst_arg ''', r''' `eval echo $variable` ''')," >> $CONFIG_STATUS
+ done
++for ac_subst_arg in $_subconfigure_ac_subst_list_args; do
++  variable='$'$ac_subst_arg
++  echo "    (''' $ac_subst_arg ''', list(r''' `eval echo $variable` '''.split()))," >> $CONFIG_STATUS
++done
+ 
+ cat >> $CONFIG_STATUS <<\EOF
+ ] ]
+--- comm-release/suite/installer/package-manifest.in.orig      2014-12-03 07:12:00.000000000 +0100
++++ comm-release/suite/installer/package-manifest.in   2014-12-21 16:18:12.162189385 +0100
+@@ -742,7 +742,7 @@
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@ldap60@DLL_SUFFIX@
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@ldif60@DLL_SUFFIX@
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@prldap60@DLL_SUFFIX@
+-#else
++#elif 0
+ @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@