* [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird/files: thunderbird-3.3-gconf-config-update.patch 2000-thunderbird_gentoo_install_dirs.patch enigmail-1.1.2-20110124-locale-fixup.diff 1001-xulrunner_fix_jemalloc_vs_aslr.patch
@ 2011-04-04 2:33 Jory Pratt (anarchy)
0 siblings, 0 replies; only message in thread
From: Jory Pratt (anarchy) @ 2011-04-04 2:33 UTC (permalink / raw
To: gentoo-commits
anarchy 11/04/04 02:33:57
Added: thunderbird-3.3-gconf-config-update.patch
2000-thunderbird_gentoo_install_dirs.patch
enigmail-1.1.2-20110124-locale-fixup.diff
1001-xulrunner_fix_jemalloc_vs_aslr.patch
Log:
Initial import of tb-3.3_alpha3 to tree for testing/porting
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Revision Changes Path
1.1 mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/thunderbird-3.3-gconf-config-update.patch?rev=1.1&content-type=text/plain
Index: thunderbird-3.3-gconf-config-update.patch
===================================================================
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -5031,16 +5031,21 @@ then
fi
MOZ_ENABLE_GIO=
])
fi
dnl ========================================================
dnl = GConf support module
dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(gconf,
+ [ --disable-gconf Disable Gconf support ],
+ MOZ_ENABLE_GCONF=,
+ MOZ_ENABLE_GCONF=force)
+
if test "$MOZ_ENABLE_GCONF"
then
PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
MOZ_ENABLE_GCONF=1
],[
MOZ_ENABLE_GCONF=
])
fi
diff --git a/mozilla/configure.in b/mozilla/configure.in
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -5701,16 +5701,21 @@ then
AC_SUBST(MOZ_ENABLE_GIO)
AC_SUBST(MOZ_GIO_CFLAGS)
AC_SUBST(MOZ_GIO_LIBS)
dnl ========================================================
dnl = GConf support module
dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(gconf,
+ [ --disable-gconf Disable Gconf support ],
+ MOZ_ENABLE_GCONF=,
+ MOZ_ENABLE_GCONF=force)
+
if test "$MOZ_ENABLE_GCONF"
then
PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
MOZ_ENABLE_GCONF=1
],[
if test "$MOZ_ENABLE_GCONF" = "force"
then
1.1 mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/2000-thunderbird_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain
Index: 2000-thunderbird_gentoo_install_dirs.patch
===================================================================
diff -ur work.orig/config/autoconf.mk.in work/config/autoconf.mk.in
--- work.orig/config/autoconf.mk.in 2009-04-28 16:55:24.000000000 +0000
+++ work/config/autoconf.mk.in 2009-04-28 16:57:12.000000000 +0000
@@ -60,14 +60,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/thunderbird
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = $(datadir)/idl/thunderbird
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/thunderbird
+sdkdir = $(libdir)/thunderbird-devel
MOZDEPTH = $(DEPTH)/mozilla
DIST = $(MOZDEPTH)/dist
1.1 mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/enigmail-1.1.2-20110124-locale-fixup.diff?rev=1.1&content-type=text/plain
Index: enigmail-1.1.2-20110124-locale-fixup.diff
===================================================================
--- enigmail/lang/current-languages.txt
+++ enigmail/lang/current-languages.txt
@@ -1,5 +1,4 @@
ar
-bg-BG
ca
cs-CZ
de-AT
1.1 mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/files/1001-xulrunner_fix_jemalloc_vs_aslr.patch?rev=1.1&content-type=text/plain
Index: 1001-xulrunner_fix_jemalloc_vs_aslr.patch
===================================================================
diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c
--- mozilla-orig/memory/jemalloc/jemalloc.c 2009-07-30 17:30:25.000000000 +0200
+++ mozilla/memory/jemalloc/jemalloc.c 2009-08-10 14:28:59.000000000 +0200
@@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
static const bool __isthreaded = true;
#endif
-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
#define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */
#endif
@@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si
* We don't use MAP_FIXED here, because it can cause the *replacement*
* of existing mappings, and we only want to create new mappings.
*/
-#ifdef MALLOC_PAGEFILE
- if (pfd != -1) {
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
- MAP_NOSYNC | MAP_ALIGN, pfd, 0);
- } else
-#endif
- {
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
- MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
- }
+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+ MAP_NOSYNC| MAP_ANON, -1, 0);
assert(ret != NULL);
if (ret == MAP_FAILED)
ret = NULL;
+ else {
+ uintptr_t aligned_ret;
+ size_t extra_size;
+
+ aligned_ret = (uintptr_t)ret + alignment - 1;
+ aligned_ret &= ~(alignment - 1);
+ extra_size = aligned_ret - (uintptr_t)ret;
+ munmap(ret, extra_size);
+ munmap(ret + extra_size + size, alignment - extra_size);
+ ret = (void *)aligned_ret;
+#ifdef MALLOC_PAGEFILE
+ if (pfd != -1) {
+ ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+ MAP_NOSYNC | MAP_FIXED, pfd, 0);
+ }
+ if (ret == MAP_FAILED)
+ ret = NULL;
+#endif
+ }
return (ret);
}
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-04 2:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-04 2:33 [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird/files: thunderbird-3.3-gconf-config-update.patch 2000-thunderbird_gentoo_install_dirs.patch enigmail-1.1.2-20110124-locale-fixup.diff 1001-xulrunner_fix_jemalloc_vs_aslr.patch Jory Pratt (anarchy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox