Mercurial Mercurial > hg > comm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initial import of patches
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 09 Feb 2010 11:09:19 +0100
changeset 0 b71590debb98
child 1 371dfea907fd
initial import of patches
.hgignore file | annotate | diff | comparison | revisions
comm-system-ldap.patch file | annotate | diff | comparison | revisions
seamonkey-no-update.patch file | annotate | diff | comparison | revisions
seamonkey-shared-nss-db.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
tb-develdirs.patch file | annotate | diff | comparison | revisions
thunderbird-appname.patch file | annotate | diff | comparison | revisions
thunderbird-shared-nss-db.patch file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,5 @@
+^\.hg
+^\.mq
+syntax: glob
+status
+guards
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/comm-system-ldap.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,148 @@
+diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
+@@ -421,16 +421,17 @@ NSPR_CONFIG	= @NSPR_CONFIG@
+ NSPR_CFLAGS	= @NSPR_CFLAGS@
+ NSPR_LIBS	= @NSPR_LIBS@
+ 
+ NSS_CONFIG	= @NSS_CONFIG@
+ NSS_CFLAGS	= @NSS_CFLAGS@
+ NSS_LIBS	= @NSS_LIBS@
+ NSS_DEP_LIBS	= @NSS_DEP_LIBS@
+ 
++MOZ_NATIVE_MOZLDAP = @SYSTEM_MOZLDAP@
+ LDAP_CFLAGS	= @LDAP_CFLAGS@
+ LDAP_LIBS	= @LDAP_LIBS@
+ XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
+ XPCOM_STANDALONE_GLUE_LDOPTS = @XPCOM_STANDALONE_GLUE_LDOPTS@
+ MOZ_XPCOM_OBSOLETE_LIBS = @MOZ_XPCOM_OBSOLETE_LIBS@
+ 
+ USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@
+ 
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -4936,16 +4936,34 @@ dnl ====================================
+ dnl = LDAP
+ dnl =========================================================
+ MOZ_ARG_DISABLE_BOOL(ldap,
+ [  --disable-ldap          Disable LDAP support],
+     MOZ_LDAP_XPCOM=,
+     MOZ_LDAP_XPCOM=1)
+ 
+ dnl ========================================================
++dnl = If mozldap was not detected in the system, 
++dnl = use the one in the source tree (mozilla/directory/c-sdk)
++dnl ========================================================
++
++if test -n "$MOZ_LDAP_XPCOM"; then
++  MOZ_ARG_ENABLE_BOOL(system-mozldap,
++  [  --enable-system-mozldap  
++                          Use system installed mozldap (located with pkgconfig)],
++      SYSTEM_MOZLDAP=1 )
++
++  if test -n "$SYSTEM_MOZLDAP"; then
++      PKG_CHECK_MODULES(MOZLDAP, mozldap >= 6.0.6,
++        SYSTEM_MOZLDAP=1, SYSTEM_MOZLDAP=)
++  fi
++fi
++AC_SUBST(SYSTEM_MOZLDAP)
++
++dnl ========================================================
+ dnl = Trademarked Branding 
+ dnl ========================================================
+ MOZ_ARG_ENABLE_BOOL(official-branding,
+ [  --enable-official-branding Enable Official mozilla.org Branding
+                           Do not distribute builds with
+                           --enable-official-branding unless you have
+                           permission to use trademarks per
+                           http://www.mozilla.org/foundation/trademarks/ .],
+@@ -7043,17 +7061,22 @@ if test "$MOZ_LDAP_XPCOM"; then
+         if test -n "$GNU_CC"; then
+             LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
+         else
+             LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
+         fi
+     elif test "$OS_ARCH" = "OS2"; then
+             LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
+     else
+-        LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
++        if test "$SYSTEM_MOZLDAP"; then
++            LDAP_LIBS="$MOZLDAP_LIBS"
++            LDAP_CFLAGS="$MOZLDAP_CFLAGS"
++        else
++            LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
++        fi
+     fi
+ fi
+ 
+ dnl ========================================================
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
+ dnl =
+ dnl ========================================================
+@@ -7603,17 +7626,17 @@ fi
+ AC_OUTPUT_SUBDIRS(mozilla)
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ # if we're building the LDAP XPCOM component, we need to build 
+ # the c-sdk first.  
+ #
+-if test "$MOZ_LDAP_XPCOM"; then
++if test "$MOZ_LDAP_XPCOM" -a -z "$SYSTEM_MOZLDAP" ; 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"; then
+         mkdir "directory"
+     fi
+     if test ! -d "directory/c-sdk"; then
+diff --git a/mail/build.mk b/mail/build.mk
+--- a/mail/build.mk
++++ b/mail/build.mk
+@@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS
+ tier_app_dirs += extensions
+ endif
+ 
+ else # toplevel Makefile
+ 
+ TIERS += app
+ 
+ ifdef MOZ_LDAP_XPCOM
++ifndef MOZ_NATIVE_MOZLDAP
+ tier_app_staticdirs += directory/c-sdk
++endif
+ tier_app_dirs += directory/xpcom
+ endif
+ 
+ ifdef MOZ_COMPOSER
+ tier_app_dirs += editor/ui
+ endif
+ 
+ ifdef MOZ_BRANDING_DIRECTORY
+diff --git a/suite/build.mk b/suite/build.mk
+--- a/suite/build.mk
++++ b/suite/build.mk
+@@ -47,17 +47,19 @@ ifdef MOZ_EXTENSIONS
+ tier_app_dirs += extensions
+ endif
+ 
+ else # toplevel Makefile
+ 
+ TIERS += app
+ 
+ ifdef MOZ_LDAP_XPCOM
++ifndef MOZ_NATIVE_MOZLDAP
+ tier_app_staticdirs += directory/c-sdk
++endif
+ tier_app_dirs += directory/xpcom
+ endif
+ 
+ ifdef MOZ_COMPOSER
+ tier_app_dirs += editor/ui
+ endif
+ 
+ ifdef MOZ_BRANDING_DIRECTORY
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/seamonkey-no-update.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,17 @@
+diff --git a/suite/common/utilityOverlay.js b/suite/common/utilityOverlay.js
+--- a/suite/common/utilityOverlay.js
++++ b/suite/common/utilityOverlay.js
+@@ -671,7 +671,13 @@ function updateCheckUpdatesItem()
+   // administrator or if we cannot update for some other reason.
+   var checkForUpdates = document.getElementById("checkForUpdates");
+   var canUpdate = updates.canUpdate;
++  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
++                       .getService(Components.interfaces.nsIPrefBranch);
++  var updateEnabled = prefs.getBoolPref("app.update.enabled", true);
+   checkForUpdates.setAttribute("disabled", !canUpdate);
++  checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled);
++  var updateSeparator = document.getElementById("menu_HelpUpdatesSeparator");
++  updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled);
+   if (!canUpdate)
+     return;
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/seamonkey-shared-nss-db.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,86 @@
+From: Hans Petter Jansson <hpj@copyleft.no>
+      Wolfgang Rosenauer <wr@rosenauer.org>
+Subject: use libnsssharedhelper if available at compile time
+         (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
+References:
+
+diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
+@@ -478,16 +478,20 @@ MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
+ XT_LIBS			= @XT_LIBS@
+ 
+ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
+ 
+ GLIB_CFLAGS	= @GLIB_CFLAGS@
+ GLIB_LIBS	= @GLIB_LIBS@
+ GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
+ 
++MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
++NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
++NSSHELPER_LIBS = @NSSHELPER_LIBS@
++
+ MOZ_NATIVE_MAKEDEPEND	= @SYSTEM_MAKEDEPEND@
+ 
+ # Used for LD_LIBRARY_PATH
+ LIBS_PATH       = @LIBS_PATH@
+ 
+ MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
+ COMPILER_DEPEND = @COMPILER_DEPEND@
+ MDDEPDIR        := @MDDEPDIR@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
+ 
+ dnl qcms
+ dnl ========================================================
+ 
+ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'    
+ AC_SUBST(QCMS_LIBS)
+ 
+ dnl ========================================================
++dnl Check for nss-shared-helper
++dnl ========================================================
++
++  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, 
++   [MOZ_ENABLE_NSSHELPER=1],
++   [MOZ_ENABLE_NSSHELPER=])
++
++if test "$MOZ_ENABLE_NSSHELPER"; then
++  AC_DEFINE(MOZ_ENABLE_NSSHELPER)
++fi
++AC_SUBST(MOZ_ENABLE_NSSHELPER)
++AC_SUBST(NSSHELPER_CFLAGS)
++AC_SUBST(NSSHELPER_LIBS)
++
++dnl ========================================================
+ dnl disable xul
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [  --disable-xul           Disable XUL],
+     MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+   AC_DEFINE(MOZ_XUL)
+ fi
+diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
+--- a/suite/app/Makefile.in
++++ b/suite/app/Makefile.in
+@@ -112,16 +112,17 @@ APP_XPCOM_LIBS = $(XPCOM_LIBS)
+ endif
+ 
+ LIBS += \
+ 	$(STATIC_COMPONENTS_LINKER_PATH) \
+ 	$(MOZ_JS_LIBS) \
+ 	$(EXTRA_DSO_LIBS) \
+ 	$(APP_XPCOM_LIBS) \
+ 	$(NSPR_LIBS) \
++	$(NSSHELPER_LIBS) \
+ 	$(TK_LIBS) \
+ 	$(NULL)
+ 
+ # Add explicit X11 dependency when building against X11 toolkits
+ ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)))
+ LIBS += $(XLDFLAGS) $(XLIBS)
+ endif
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/series	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,11 @@
+# Thunderbird
+thunderbird-appname.patch #+tb
+tb-develdirs.patch #+tb
+thunderbird-shared-nss-db.patch #+tb
+comm-system-ldap.patch
+
+# SeaMonkey
+seamonkey-shared-nss-db.patch #+sm
+seamonkey-no-update.patch #+sm
+
+# Sunbird/Lightning
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tb-develdirs.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,16 @@
+--- config/autoconf.mk.in.orig	2009-02-11 20:12:19.000000000 +0100
++++ b/config/autoconf.mk.in	2009-02-11 20:13:15.000000000 +0100
+@@ -60,11 +60,11 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)3
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @libdir@/$(MOZ_APP_NAME)3
+ 
+ installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thunderbird-appname.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,26 @@
+Index: mail/components/shell/nsMailGNOMEIntegration.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v
+retrieving revision 1.8.2.1
+diff -u -p -6 -r1.8.2.1 nsMailGNOMEIntegration.cpp
+--- mail/components/shell/nsMailGNOMEIntegration.cpp	23 Oct 2006 03:32:47 -0000	1.8.2.1
++++ ./mail/components/shell/nsMailGNOMEIntegration.cpp	19 Nov 2006 11:54:48 -0000
+@@ -94,12 +94,18 @@ nsMailGNOMEIntegration::Init()
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird"));
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   rv = appPath->GetNativePath(mAppPath);
++
++  /* This path of thunderbird is hardcoded for the default path setting 
++   * And the above code is not used.
++   */
++  mAppPath.Assign ("/usr/bin/thunderbird");
++
+   return rv;
+ }
+ 
+ NS_IMPL_ISUPPORTS1(nsMailGNOMEIntegration, nsIShellService)
+ 
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thunderbird-shared-nss-db.patch	Tue Feb 09 11:09:19 2010 +0100
@@ -0,0 +1,75 @@
+From: Hans Petter Jansson <hpj@copyleft.no>
+      Wolfgang Rosenauer <wr@rosenauer.org>
+Subject: use libnsssharedhelper if available at compile time
+         (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
+References:
+
+diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
+@@ -478,16 +478,20 @@ MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
+ XT_LIBS			= @XT_LIBS@
+ 
+ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
+ 
+ GLIB_CFLAGS	= @GLIB_CFLAGS@
+ GLIB_LIBS	= @GLIB_LIBS@
+ GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
+ 
++MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
++NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
++NSSHELPER_LIBS = @NSSHELPER_LIBS@
++
+ MOZ_NATIVE_MAKEDEPEND	= @SYSTEM_MAKEDEPEND@
+ 
+ # Used for LD_LIBRARY_PATH
+ LIBS_PATH       = @LIBS_PATH@
+ 
+ MOZ_AUTO_DEPS	= @MOZ_AUTO_DEPS@
+ COMPILER_DEPEND = @COMPILER_DEPEND@
+ MDDEPDIR        := @MDDEPDIR@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
+ 
+ dnl qcms
+ dnl ========================================================
+ 
+ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'    
+ AC_SUBST(QCMS_LIBS)
+ 
+ dnl ========================================================
++dnl Check for nss-shared-helper
++dnl ========================================================
++
++  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, 
++   [MOZ_ENABLE_NSSHELPER=1],
++   [MOZ_ENABLE_NSSHELPER=])
++
++if test "$MOZ_ENABLE_NSSHELPER"; then
++  AC_DEFINE(MOZ_ENABLE_NSSHELPER)
++fi
++AC_SUBST(MOZ_ENABLE_NSSHELPER)
++AC_SUBST(NSSHELPER_CFLAGS)
++AC_SUBST(NSSHELPER_LIBS)
++
++dnl ========================================================
+ dnl disable xul
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [  --disable-xul           Disable XUL],
+     MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+   AC_DEFINE(MOZ_XUL)
+ fi
+--- mail/app/Makefile.in.orig	2009-02-26 11:02:11.000000000 +0100
++++ b/mail/app/Makefile.in	2009-02-26 11:04:00.000000000 +0100
+@@ -129,6 +129,7 @@
+ 	$(EXTRA_DSO_LIBS) \
+ 	$(APP_XPCOM_LIBS) \
+ 	$(NSPR_LIBS) \
++	$(NSSHELPER_LIBS) \
+ 	$(TK_LIBS) \
+ 	$(NULL)
+
comm