* [gentoo-commits] gentoo commit in src/patchsets/xulrunner/1.9.0.10: 000_flex-configure-LANG.patch 001-xul_gentoo_install_dirs.patch 002-bzXXX_pc_honour_system_nspr_nss.patch 055_firefox-2.0_gfbsd-pthreads.patch 063_firefox-rpath-3.patch 064_firefox-nsplugins-v3.patch 068_firefox-nss-gentoo-fix.patch 080_gcc-4.4-elif.patch 085-arm-gcc42.patch 090-unaligned.patch 095_glibc_maxpathlen.patch 100-system-hunspell-corrections.patch 800-bsd_include.patch
@ 2009-04-28 14:07 Raul Porcel (armin76)
0 siblings, 0 replies; only message in thread
From: Raul Porcel (armin76) @ 2009-04-28 14:07 UTC (permalink / raw
To: gentoo-commits
armin76 09/04/28 14:07:42
Added: 000_flex-configure-LANG.patch
001-xul_gentoo_install_dirs.patch
002-bzXXX_pc_honour_system_nspr_nss.patch
055_firefox-2.0_gfbsd-pthreads.patch
063_firefox-rpath-3.patch
064_firefox-nsplugins-v3.patch
068_firefox-nss-gentoo-fix.patch
080_gcc-4.4-elif.patch 085-arm-gcc42.patch
090-unaligned.patch 095_glibc_maxpathlen.patch
100-system-hunspell-corrections.patch
800-bsd_include.patch
Log:
Add patchset for 1.9.0.10, remove old
Revision Changes Path
1.1 src/patchsets/xulrunner/1.9.0.10/000_flex-configure-LANG.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/000_flex-configure-LANG.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/000_flex-configure-LANG.patch?rev=1.1&content-type=text/plain
Index: 000_flex-configure-LANG.patch
===================================================================
The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
option parsing, it may break.
http://bugs.gentoo.org/103483
--- configure
+++ configure
@@ -54,6 +54,16 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
+# NLS nuisances.
+# Only set these to C if already set. These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
@@ -452,16 +463,6 @@
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
# AIX cpp loses on an empty file, so make sure it contains at least a newline.
1.1 src/patchsets/xulrunner/1.9.0.10/001-xul_gentoo_install_dirs.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/001-xul_gentoo_install_dirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/001-xul_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain
Index: 001-xul_gentoo_install_dirs.patch
===================================================================
--- config/autoconf.mk.in.orig 2007-08-03 22:02:32.000000000 +0200
+++ config/autoconf.mk.in 2007-08-03 22:07:00.000000000 +0200
@@ -58,14 +58,14 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/$(MOZ_APP_NAME)-1.9
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = $(includedir)/idl
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)-1.9
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-1.9
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
1.1 src/patchsets/xulrunner/1.9.0.10/002-bzXXX_pc_honour_system_nspr_nss.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/002-bzXXX_pc_honour_system_nspr_nss.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/002-bzXXX_pc_honour_system_nspr_nss.patch?rev=1.1&content-type=text/plain
Index: 002-bzXXX_pc_honour_system_nspr_nss.patch
===================================================================
---
xulrunner/installer/Makefile.in | 17 ++++++++++++++---
xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +-
xulrunner/installer/libxul-embedding.pc.in | 2 +-
xulrunner/installer/mozilla-nss.pc.in | 6 +++---
4 files changed, 19 insertions(+), 8 deletions(-)
Index: mozilla/xulrunner/installer/Makefile.in
===================================================================
--- mozilla.orig/xulrunner/installer/Makefile.in
+++ mozilla/xulrunner/installer/Makefile.in
@@ -90,40 +90,51 @@
mozilla-plugin.pc \
mozilla-gtkmozembed.pc \
mozilla-gtkmozembed-embedding.pc \
$(NULL)
ifdef MOZ_NATIVE_NSPR
NSPR_NAME=nspr
NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags)
+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs)
else
-pkg_config_files += mozilla-nspr.pc
NSPR_NAME=mozilla-nspr
FULL_NSPR_CFLAGS=-I\$${includedir}/stable
FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
endif
+pkg_config_files += mozilla-nspr.pc
$(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
-ifndef MOZ_NATIVE_NSS
-pkg_config_files += mozilla-nss.pc
+ifdef MOZ_NATIVE_NSS
+NSPR_VERSION=$(shell $(NSS_CONFIG) --version)
+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
+else
+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version)
+FULL_NSS_CFLAGS=-I\$${includedir}/stable
+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs))
endif
+pkg_config_files += mozilla-nss.pc
%.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
cat $< | sed \
-e "s|%prefix%|$(prefix)|" \
-e "s|%includedir%|$(includedir)|" \
-e "s|%idldir%|$(idldir)|" \
-e "s|%sdkdir%|$(sdkdir)|" \
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
+ -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \
+ -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \
-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
chmod 644 $@
install:: $(pkg_config_files)
@echo pkg_config_file: $(pkg_config_files)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
===================================================================
--- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in
+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
@@ -3,9 +3,9 @@
includedir=%includedir%
idldir=%idldir%
includetype=unstable
Name: libxul-embedding-unstable
Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
Version: %MOZILLA_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
Index: mozilla/xulrunner/installer/libxul-embedding.pc.in
===================================================================
--- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in
+++ mozilla/xulrunner/installer/libxul-embedding.pc.in
@@ -7,9 +7,9 @@
# Note: the default pkg-config cflags will only list include directories
# that contain stable (frozen or safe for linking) header files. To include
# nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
Name: libxul-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
Index: mozilla/xulrunner/installer/mozilla-nss.pc.in
===================================================================
--- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in
+++ mozilla/xulrunner/installer/mozilla-nss.pc.in
@@ -1,10 +1,10 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
Name: NSS
Description: Mozilla Network Security Services
-Version: %MOZILLA_VERSION%
+Version: %NSS_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
-Cflags: -I${includedir}/stable
+Libs: %FULL_NSS_LIBS%
+Cflags: %FULL_NSS_CFLAGS%
1.1 src/patchsets/xulrunner/1.9.0.10/055_firefox-2.0_gfbsd-pthreads.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&content-type=text/plain
Index: 055_firefox-2.0_gfbsd-pthreads.patch
===================================================================
# https://bugs.gentoo.org/show_bug.cgi?id=169825
--- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006
+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006
@@ -442,9 +442,7 @@
endif
ifeq ($(OS_ARCH),FreeBSD)
-ifdef IS_COMPONENT
-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-endif
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
endif
ifeq ($(OS_ARCH),NetBSD)
--- mozilla/configure.in.orig 2007-02-06 02:37:37 -0300
+++ mozilla/configure.in 2007-03-07 15:35:41 -0300
@@ -2667,7 +2667,7 @@
*-hpux11.*)
;;
*)
- AC_CHECK_LIB(c_r, gethostbyname_r)
+ AC_SEARCH_LIBS([gethostbyname_r], [c_r])
;;
esac
AC_CHECK_LIB(m, atan)
--- mozilla/configure.in.orig 2007-02-06 02:37:37 -0300
+++ mozilla/configure.in 2007-03-07 13:59:53 -0300
@@ -2839,11 +2839,12 @@
*-*-freebsd*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
- dnl -pthread links in -lc_r, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
+ dnl use the environment PTHREAD_LIBS
+ if test -n "$PTHREAD_LIBS"; then
+ _PTHREAD_LDFLAGS="$PTHREAD_LIBS"
else
- _PTHREAD_LDFLAGS="-lc_r"
+ _PTHREAD_LDFLAGS="-lpthread"
fi
+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
;;
1.1 src/patchsets/xulrunner/1.9.0.10/063_firefox-rpath-3.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/063_firefox-rpath-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/063_firefox-rpath-3.patch?rev=1.1&content-type=text/plain
Index: 063_firefox-rpath-3.patch
===================================================================
# Gentoo http://bugs.gentoo.org/show_bug.cgi?id=100597
--- mozilla/config/rules.mk.orig 2006-07-07 06:13:36.000000000 +0200
+++ mozilla/config/rules.mk 2006-07-19 13:22:04.000000000 +0200
@@ -510,7 +510,12 @@
#
ifeq ($(OS_ARCH),Linux)
ifdef IS_COMPONENT
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+else
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN'
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
endif
endif
1.1 src/patchsets/xulrunner/1.9.0.10/064_firefox-nsplugins-v3.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/064_firefox-nsplugins-v3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/064_firefox-nsplugins-v3.patch?rev=1.1&content-type=text/plain
Index: 064_firefox-nsplugins-v3.patch
===================================================================
# Gentoo's Add a search path for plugins. by agriffis
--- xpcom/io/nsAppFileLocationProvider.cpp.original 2007-02-14 00:59:21.000000000 +0100
+++ xpcom/io/nsAppFileLocationProvider.cpp 2007-02-14 01:17:35.000000000 +0100
@@ -205,6 +205,14 @@
if (NS_SUCCEEDED(rv))
rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
}
+ else if (nsCRT::strcmp(prop, GENTOO_NSPLUGINS_DIR) == 0)
+ {
+ rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSPLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile));
+ }
+ else if (nsCRT::strcmp(prop, GENTOO_NSBROWSER_PLUGINS_DIR) == 0)
+ {
+ rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSBROWSER_PLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile));
+ }
#ifdef XP_MACOSX
else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0)
{
@@ -592,7 +600,7 @@
*_retval = new nsAppDirectoryEnumerator(this, keys);
#else
- static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
+ static const char* keys[] = { nsnull, GENTOO_NSPLUGINS_DIR, GENTOO_NSBROWSER_PLUGINS_DIR, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
if (!keys[0] && !(keys[0] = PR_GetEnv("MOZ_PLUGIN_PATH"))) {
static const char nullstr = 0;
keys[0] = &nullstr;
1.1 src/patchsets/xulrunner/1.9.0.10/068_firefox-nss-gentoo-fix.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/068_firefox-nss-gentoo-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/068_firefox-nss-gentoo-fix.patch?rev=1.1&content-type=text/plain
Index: 068_firefox-nss-gentoo-fix.patch
===================================================================
--- security/manager/ssl/src/nsNSSComponent.cpp.orig 2007-05-27 21:04:27.000000000 +0200
+++ security/manager/ssl/src/nsNSSComponent.cpp 2007-05-27 21:17:56.000000000 +0200
@@ -130,6 +130,8 @@
#define NS_CRYPTO_HASH_BUFFER_SIZE 4096
+#define GENTOO_NSS_LIBDIR NS_LITERAL_CSTRING ("nss")
+
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
int nsNSSComponent::mInstanceCount = 0;
@@ -708,11 +710,11 @@
return;
const char *possible_ckbi_locations[] = {
- NS_XPCOM_CURRENT_PROCESS_DIR,
- NS_GRE_DIR,
- 0 // This special value means:
+ 0,// This special value means:
// search for ckbi in the directories on the shared
// library/DLL search path
+ NS_XPCOM_CURRENT_PROCESS_DIR,
+ NS_GRE_DIR
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -721,7 +723,16 @@
if (!possible_ckbi_locations[il])
{
- fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
+
+ directoryService->Get( NS_UNIX_LIB_DIR,
+ NS_GET_IID(nsILocalFile),
+ getter_AddRefs(mozFile));
+
+ if (!mozFile) {
+ continue;
+ }
+
+ mozFile->AppendNative(GENTOO_NSS_LIBDIR);
}
else
{
@@ -733,11 +744,12 @@
continue;
}
- nsCAutoString processDir;
- mozFile->GetNativePath(processDir);
- fullLibraryPath = PR_GetLibraryName(processDir.get(), "nssckbi");
}
+ nsCAutoString processDir;
+ mozFile->GetNativePath(processDir);
+ fullLibraryPath = PR_GetLibraryName(processDir.get(), "nssckbi");
+
if (!fullLibraryPath) {
continue;
}
--- config/config.mk.orig 2007-05-27 23:32:35.000000000 +0200
+++ config/config.mk 2007-05-27 23:34:30.000000000 +0200
@@ -778,6 +778,7 @@
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
DEFINES += -DOSARCH=$(OS_ARCH)
+DEFINES += -DGENTOO_LIB_DIR=\"$(libdir)\"
# For profiling
ifdef ENABLE_EAZEL_PROFILER
--- xpcom/io/SpecialSystemDirectory.cpp.orig 2007-05-27 23:36:29.000000000 +0200
+++ xpcom/io/SpecialSystemDirectory.cpp 2007-05-27 23:37:48.000000000 +0200
@@ -560,7 +560,7 @@
PR_TRUE,
aFile);
case Unix_LibDirectory:
- return NS_NewNativeLocalFile(nsDependentCString("/usr/local/lib/netscape/"),
+ return NS_NewNativeLocalFile(nsDependentCString(GENTOO_LIB_DIR),
PR_TRUE,
aFile);
1.1 src/patchsets/xulrunner/1.9.0.10/080_gcc-4.4-elif.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/080_gcc-4.4-elif.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/080_gcc-4.4-elif.patch?rev=1.1&content-type=text/plain
Index: 080_gcc-4.4-elif.patch
===================================================================
diff -Naurp mozilla-orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
--- mozilla-orig/toolkit/xre/nsAppRunner.cpp 2008-11-17 08:36:43.000000000 -0600
+++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-03-01 20:35:11.000000000 -0600
@@ -1459,7 +1459,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
if (NS_FAILED(rv))
return rv;
-#elif
+#else
#error Oops, you need platform-specific code here
#endif
1.1 src/patchsets/xulrunner/1.9.0.10/085-arm-gcc42.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/085-arm-gcc42.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/085-arm-gcc42.patch?rev=1.1&content-type=text/plain
Index: 085-arm-gcc42.patch
===================================================================
diff --git a/configure.in b/configure.in
index d4a74cb..3730f0e 100644
--- a/configure.in
+++ b/configure.in
@@ -2743,7 +2743,7 @@ dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
AC_CACHE_CHECK(for compiler -fshort-wchar option,
ac_cv_have_usable_wchar_option_v2,
- [AC_TRY_COMPILE([#include <stddef.h>
+ [AC_TRY_LINK([#include <stddef.h>
$configure_static_assert_macros],
[CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)],
1.1 src/patchsets/xulrunner/1.9.0.10/090-unaligned.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/090-unaligned.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/090-unaligned.patch?rev=1.1&content-type=text/plain
Index: 090-unaligned.patch
===================================================================
diff -ur mozilla.orig/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
--- mozilla.orig/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp 2009-04-01 12:47:52.000000000 +0000
+++ mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp 2009-04-01 12:48:38.000000000 +0000
@@ -332,7 +332,9 @@
(mHaveComplete && mCompleteHash < entry.mCompleteHash));
}
- PRInt64 mId;
+ char __dummy_to_make_mid_aligned[4];
+
+ PRInt64 mId __attribute__ ((packed));
nsUrlClassifierDomainHash mKey;
@@ -2023,8 +2025,9 @@
return NS_ERROR_FAILURE;
}
const nsCSubstring& str = Substring(chunk, start, 4);
- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
- entry->mAddChunkId = PR_ntohl(*p);
+ PRUint32 p;
+ memcpy(&p, reinterpret_cast<const PRUint32*>(str.BeginReading()), 4);
+ entry->mAddChunkId = PR_ntohl(p);
if (entry->mAddChunkId == 0) {
NS_WARNING("Received invalid chunk number.");
return NS_ERROR_FAILURE;
@@ -2052,8 +2055,9 @@
if (chunkType == CHUNK_SUB) {
const nsCSubstring& str = Substring(chunk, start, 4);
- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
- entry->mAddChunkId = PR_ntohl(*p);
+ PRUint32 p;
+ memcpy(&p, reinterpret_cast<const PRUint32*>(str.BeginReading()), 4);
+ entry->mAddChunkId = PR_ntohl(p);
if (entry->mAddChunkId == 0) {
NS_WARNING("Received invalid chunk number.");
return NS_ERROR_FAILURE;
1.1 src/patchsets/xulrunner/1.9.0.10/095_glibc_maxpathlen.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/095_glibc_maxpathlen.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/095_glibc_maxpathlen.patch?rev=1.1&content-type=text/plain
Index: 095_glibc_maxpathlen.patch
===================================================================
--- toolkit/mozapps/update/src/updater/updater.cpp.old Tue Oct 21 16:36:29 2008 +1300
+++ toolkit/mozapps/update/src/updater/updater.cpp Mon Oct 20 22:55:57 2008 -0500
@@ -118,7 +118,9 @@ void LaunchChild(int argc, char **argv);
#endif
#ifndef MAXPATHLEN
-# ifdef MAX_PATH
+# ifdef PATH_MAX
+# define MAXPATHLEN PATH_MAX
+# elif defined(_MAX_PATH)
# define MAXPATHLEN MAX_PATH
# elif defined(_MAX_PATH)
# define MAXPATHLEN _MAX_PATH
--- toolkit/xre/nsAppRunner.h.old Tue Oct 21 16:36:29 2008 +1300
+++ toolkit/xre/nsAppRunner.h Mon Oct 20 22:55:57 2008 -0500
@@ -40,10 +40,14 @@
#ifdef XP_WIN
#include <windows.h>
+#else
+#include <limits.h>
#endif
#ifndef MAXPATHLEN
-#ifdef _MAX_PATH
+#ifdef PATH_MAX
+#define MAXPATHLEN PATH_MAX
+#elif defined(_MAX_PATH)
#define MAXPATHLEN _MAX_PATH
#elif defined(CCHMAXPATH)
#define MAXPATHLEN CCHMAXPATH
--- xpcom/build/nsXPCOMPrivate.h.old Tue Oct 21 16:36:29 2008 +1300
+++ xpcom/build/nsXPCOMPrivate.h Mon Oct 20 22:55:57 2008 -0500
@@ -231,6 +231,7 @@ NS_GetFrozenFunctions(XPCOMFunctions *en
#define XUL_DLL "libxul"MOZ_DLL_SUFFIX
#else // Unix
+#include <limits.h> // for PATH_MAX
#define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX
1.1 src/patchsets/xulrunner/1.9.0.10/100-system-hunspell-corrections.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/100-system-hunspell-corrections.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/100-system-hunspell-corrections.patch?rev=1.1&content-type=text/plain
Index: 100-system-hunspell-corrections.patch
===================================================================
--- ./extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2008-02-15 19:21:21.000000000 +0000
+++ ./extensions/spellcheck/hunspell/src/mozHunspell.cpp 2008-02-15 19:23:20.000000000 +0000
@@ -63,6 +63,9 @@
#include "nsISimpleEnumerator.h"
#include "nsIDirectoryEnumerator.h"
#include "nsIFile.h"
+#ifdef MOZ_NATIVE_HUNSPELL
+#include "nsILocalFile.h"
+#endif
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "mozISpellI18NManager.h"
@@ -307,7 +310,16 @@
return;
nsCOMPtr<nsIFile> dictDir;
- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
+ #ifdef MOZ_NATIVE_HUNSPELL
+ nsCOMPtr<nsILocalFile> localFile;
+ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile));
+ if (localFile && NS_SUCCEEDED(rv)) {
+ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
+ LoadDictionariesFromDir(dictDir);
+ }
+ else {
+ #endif
+ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
if (NS_SUCCEEDED(rv)) {
LoadDictionariesFromDir(dictDir);
@@ -332,6 +344,9 @@
LoadDictionariesFromDir(appDir);
}
}
+#ifdef MOZ_NATIVE_HUNSPELL
+ }
+#endif
nsCOMPtr<nsISimpleEnumerator> dictDirs;
rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
--- ./extensions/spellcheck/src/Makefile.in.orig 2008-02-15 19:25:58.000000000 +0000
+++ ./extensions/spellcheck/src/Makefile.in 2008-02-15 19:28:36.000000000 +0000
@@ -63,9 +63,16 @@
txtsvc \
uconv \
unicharutil \
+ xulapp \
$(NULL)
-CPPSRCS = \
+ifdef MOZ_NATIVE_HUNSPELL
+CPPSRCS += mozHunspell.cpp
+ifdef MOZ_XUL_APP
+CPPSRCS += mozHunspellDirProvider.cpp
+endif
+endif
+CPPSRCS += \
mozSpellCheckerFactory.cpp \
mozSpellChecker.cpp \
mozPersonalDictionary.cpp \
@@ -80,8 +87,14 @@
SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
else
+ifndef MOZ_NATIVE_HUNSPELL
SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
+else
+LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \
+ -DMOZ_NATIVE_HUNSPELL \
+ $(NULL)
+endif
endif
EXTRA_DSO_LDOPTS = \
@@ -96,3 +112,18 @@
LOCAL_INCLUDES += \
-I$(topsrcdir)/xpcom/io \
$(NULL)
+
+ifdef MOZ_NATIVE_HUNSPELL
+export:: $(srcdir)/../hunspell/src/mozHunspell.cpp
+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* .
+GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp
+clean::
+ rm -f mozHunspell.*
+ifdef MOZ_XUL_APP
+export:: $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp
+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspellDirProvider.* .
+GARBAGE += mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp
+clean::
+ rm -f mozHunspellDirProvider.*
+endif
+endif
--- ./extensions/spellcheck/Makefile.in.orig 2008-02-15 19:23:39.000000000 +0000
+++ ./extensions/spellcheck/Makefile.in 2008-02-15 19:24:34.000000000 +0000
@@ -42,13 +42,19 @@
include $(DEPTH)/config/autoconf.mk
MODULE = spellchecker
-DIRS = idl locales
+ifndef MOZ_NATIVE_HUNSPELL
+DIRS = idl locales
+else
+DIRS = idl
+endif
ifeq (camino,$(MOZ_BUILD_APP))
DIRS += osxspell
else
+ifndef MOZ_NATIVE_HUNSPELL
DIRS += hunspell
endif
+endif
DIRS += src
1.1 src/patchsets/xulrunner/1.9.0.10/800-bsd_include.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/800-bsd_include.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.10/800-bsd_include.patch?rev=1.1&content-type=text/plain
Index: 800-bsd_include.patch
===================================================================
--- configure.in.old 2007-12-10 12:29:54 +0000
+++ configure.in 2007-12-10 12:38:19 +0000
@@ -2862,6 +2862,7 @@
;;
*)
AC_CHECK_LIB(m, atan)
+ AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_DLCNF_H))
AC_CHECK_LIB(dl, dlopen,
AC_CHECK_HEADER(dlfcn.h,
LIBS="-ldl $LIBS"
--- xpcom/base/nsStackWalk.cpp.old 2007-12-10 12:43:02 +0000
+++ xpcom/base/nsStackWalk.cpp 2007-12-10 12:43:51 +0000
@@ -1111,7 +1111,7 @@
#define __USE_GNU
#endif
-#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
+#if defined(HAVE_DLCNF_H) || defined(XP_MACOSX)
#include <dlfcn.h>
#endif
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-28 14:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-28 14:07 [gentoo-commits] gentoo commit in src/patchsets/xulrunner/1.9.0.10: 000_flex-configure-LANG.patch 001-xul_gentoo_install_dirs.patch 002-bzXXX_pc_honour_system_nspr_nss.patch 055_firefox-2.0_gfbsd-pthreads.patch 063_firefox-rpath-3.patch 064_firefox-nsplugins-v3.patch 068_firefox-nss-gentoo-fix.patch 080_gcc-4.4-elif.patch 085-arm-gcc42.patch 090-unaligned.patch 095_glibc_maxpathlen.patch 100-system-hunspell-corrections.patch 800-bsd_include.patch Raul Porcel (armin76)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox