Author: hawk Date: Tue Jun 24 10:15:07 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- taken from thunderbird 2.0.0.14 for iceweasel 2.0.0.14
---- Files affected:
SOURCES:
icedove.desktop (NONE -> 1.1) (NEW), icedove-enigmail.manifest (NONE ->
1.1) (NEW), icedove-enigmail-shared.patch (NONE -> 1.1) (NEW),
icedove-fonts.patch (NONE -> 1.1) (NEW), icedove-gcc.patch (NONE -> 1.1)
(NEW), icedove-lib_path.patch (NONE -> 1.1) (NEW), icedove-myspell.patch (NONE
-> 1.1) (NEW), icedove-regionNames.patch (NONE -> 1.1) (NEW), icedove.sh
(NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/icedove.desktop
diff -u /dev/null SOURCES/icedove.desktop:1.1
--- /dev/null Tue Jun 24 12:15:08 2008
+++ SOURCES/icedove.desktop Tue Jun 24 12:14:57 2008
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Icedove
+Name[ca]=Client de correu Icedove
+Name[pl]=Icedove
+Comment=Email client based on Mozilla technology
+Comment[ca]=Llegiu i escriviu correu
+Comment[de]=Emails lesen und verfassen
+Comment[fr]=Lire et écrire votre mél
+Comment[pl]=Klient poczty oparty na technologii Mozilli
+Exec=icedove
+Icon=icedove
+Terminal=false
+Type=Application
+Categories=GTK;Network;Email;
+# vi: encoding=utf-8
================================================================
Index: SOURCES/icedove-enigmail.manifest
diff -u /dev/null SOURCES/icedove-enigmail.manifest:1.1
--- /dev/null Tue Jun 24 12:15:09 2008
+++ SOURCES/icedove-enigmail.manifest Tue Jun 24 12:14:58 2008
@@ -0,0 +1,17 @@
+content enigmail jar:chrome/enigmail.jar!/content/enigmail/
+locale enigmail en-US jar:chrome/enigmail.jar!/locale/en-US/enigmail/
+skin enigmail classic
jar:chrome/enigmail-skin-tbird.jar!/skin/classic/enigmail/
+overlay chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
+overlay chrome://messenger/content/messengercompose/messengercompose.xul
chrome://enigmail/content/enigmailMsgComposeOverlay.xul
+overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailCheckLanguage.xul
+overlay chrome://messenger/content/mailWindowOverlay.xul
chrome://enigmail/content/enigmailMessengerOverlay.xul
+overlay chrome://messenger/content/msgHdrViewOverlay.xul
chrome://enigmail/content/enigmailMsgHdrViewOverlay.xul
+overlay chrome://messenger/content/msgPrintEngine.xul
chrome://enigmail/content/enigmailMsgPrintOverlay.xul
+overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailAmIdEditOverlay.xul
+overlay chrome://messenger/content/am-identity-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
+overlay chrome://messenger/content/addressbook/addressbook.xul
chrome://enigmail/content/enigmailAbCardViewOverlay.xul
+overlay chrome://messenger/content/addressbook/abContactsPanel.xul
chrome://enigmail/content/enigmailAbContactsPanel.xul
+overlay chrome://global/content/customizeToolbar.xul
chrome://enigmail/content/enigmailCustToolOverlay.xul
+overlay chrome://communicator/content/pref/preftree.xul
chrome://enigmail/content/enigmailPrefsOverlay.xul
+overlay chrome://enigmail/content/am-enigprefs.xul
chrome://enigmail/content/enigmailEditIdentity.xul
+overlay chrome://enigmail/content/am-enigprefs-edit.xul
chrome://enigmail/content/enigmailEditIdentity.xul
================================================================
Index: SOURCES/icedove-enigmail-shared.patch
diff -u /dev/null SOURCES/icedove-enigmail-shared.patch:1.1
--- /dev/null Tue Jun 24 12:15:09 2008
+++ SOURCES/icedove-enigmail-shared.patch Tue Jun 24 12:14:58 2008
@@ -0,0 +1,34 @@
+--- mozilla/mailnews/extensions/enigmail/ipc/src/Makefile.in.orig
2005-06-14 09:19:56.000000000 +0200
++++ mozilla/mailnews/extensions/enigmail/ipc/src/Makefile.in 2005-06-14
09:20:09.000000000 +0200
+@@ -74,6 +74,7 @@ EXPORTS = \
+
+ LOCAL_INCLUDES = \
+ -I$(srcdir)/../build \
++ -fPIC \
+ $(NULL)
+
+ CPPSRCS = \
+--- mozilla/mailnews/extensions/enigmail/build/Makefile.in.orig
2005-10-04 20:12:03.000000000 +0200
++++ mozilla/mailnews/extensions/enigmail/build/Makefile.in 2005-10-04
20:12:35.000000000 +0200
+@@ -51,9 +51,10 @@
+ LIBRARY_NAME = enigmime
+ SHORT_LIBNAME = enigmime
+
+-MODULE_NAME = EnigModule
++#MODULE_NAME = EnigModule
+
+ IS_COMPONENT = 1
++FORCE_SHARED_LIB = 1
+
+ ifdef USE_XPCOM_GLUE
+ # Ensure that the xpcom classes that we build
+--- mozilla/mailnews/extensions/enigmail/src/Makefile.in.orig 2006-01-11
20:54:23.000000000 +0100
++++ mozilla/mailnews/extensions/enigmail/src/Makefile.in 2006-01-11
20:54:43.000000000 +0100
+@@ -94,6 +94,7 @@
+ LOCAL_INCLUDES = \
+ -I$(srcdir)/../build \
+ -I$(srcdir)/../../../mime/src \
++ -fPIC \
+ $(NULL)
+
+ CPPSRCS = \
================================================================
Index: SOURCES/icedove-fonts.patch
diff -u /dev/null SOURCES/icedove-fonts.patch:1.1
--- /dev/null Tue Jun 24 12:15:10 2008
+++ SOURCES/icedove-fonts.patch Tue Jun 24 12:14:59 2008
@@ -0,0 +1,140 @@
+--- mozilla.orig/modules/libpref/src/init/all.js 2006-05-08
22:22:51.000000000 +0200
++++ mozilla/modules/libpref/src/init/all.js 2006-07-25 07:44:06.744790000
+0200
+@@ -1886,33 +1886,33 @@
+
+ // th
+
+-pref("font.name.serif.tr", "Times");
+-pref("font.name.sans-serif.tr", "Helvetica");
+-pref("font.name.monospace.tr", "Courier");
++pref("font.name.serif.tr", "serif");
++pref("font.name.sans-serif.tr", "sans-serif");
++pref("font.name.monospace.tr", "monospace");
+
+ pref("font.name.serif.x-baltic", "serif");
+ pref("font.name.sans-serif.x-baltic", "sans-serif");
+ pref("font.name.monospace.x-baltic", "monospace");
+
+-pref("font.name.serif.x-central-euro", "Times");
+-pref("font.name.sans-serif.x-central-euro", "Helvetica");
+-pref("font.name.monospace.x-central-euro", "Courier");
++pref("font.name.serif.x-central-euro", "serif");
++pref("font.name.sans-serif.x-central-euro", "sans-serif");
++pref("font.name.monospace.x-central-euro", "monospace");
+
+ pref("font.name.serif.x-cyrillic", "serif");
+ pref("font.name.sans-serif.x-cyrillic", "sans-serif");
+ pref("font.name.monospace.x-cyrillic", "monospace");
+
+-pref("font.name.serif.x-unicode", "Times");
+-pref("font.name.sans-serif.x-unicode", "Helvetica");
+-pref("font.name.monospace.x-unicode", "Courier");
+-
+-pref("font.name.serif.x-user-def", "Times");
+-pref("font.name.sans-serif.x-user-def", "Helvetica");
+-pref("font.name.monospace.x-user-def", "Courier");
+-
+-pref("font.name.serif.x-western", "Times");
+-pref("font.name.sans-serif.x-western", "Helvetica");
+-pref("font.name.monospace.x-western", "Courier");
++pref("font.name.serif.x-unicode", "serif");
++pref("font.name.sans-serif.x-unicode", "sans-serif");
++pref("font.name.monospace.x-unicode", "monospace");
++
++pref("font.name.serif.x-user-def", "serif");
++pref("font.name.sans-serif.x-user-def", "sans-serif");
++pref("font.name.monospace.x-user-def", "monospace");
++
++pref("font.name.serif.x-western", "serif");
++pref("font.name.sans-serif.x-western", "sans-serif");
++pref("font.name.monospace.x-western", "monospace");
+
+ pref("font.name.serif.zh-CN", "serif");
+ pref("font.name.sans-serif.zh-CN", "sans-serif");
+@@ -1989,63 +1989,63 @@
+
+ pref("font.default.ar", "sans-serif");
+ pref("font.size.variable.ar", 16);
+-pref("font.size.fixed.ar", 12);
++pref("font.size.fixed.ar", 14);
+
+-pref("font.default.el", "serif");
++pref("font.default.el", "sans-serif");
+ pref("font.size.variable.el", 16);
+-pref("font.size.fixed.el", 12);
++pref("font.size.fixed.el", 14);
+
+ pref("font.default.he", "sans-serif");
+ pref("font.size.variable.he", 16);
+-pref("font.size.fixed.he", 12);
++pref("font.size.fixed.he", 14);
+
+ pref("font.default.ja", "sans-serif");
+ pref("font.size.variable.ja", 16);
+-pref("font.size.fixed.ja", 16);
++pref("font.size.fixed.ja", 14);
+
+ pref("font.default.ko", "sans-serif");
+ pref("font.size.variable.ko", 16);
+-pref("font.size.fixed.ko", 16);
++pref("font.size.fixed.ko", 14);
+
+-pref("font.default.th", "serif");
++pref("font.default.th", "sans-serif");
+ pref("font.size.variable.th", 16);
+-pref("font.size.fixed.th", 12);
++pref("font.size.fixed.th", 14);
+
+-pref("font.default.tr", "serif");
++pref("font.default.tr", "sans-serif");
+ pref("font.size.variable.tr", 16);
+-pref("font.size.fixed.tr", 12);
++pref("font.size.fixed.tr", 14);
+
+-pref("font.default.x-baltic", "serif");
++pref("font.default.x-baltic", "sans-serif");
+ pref("font.size.variable.x-baltic", 16);
+-pref("font.size.fixed.x-baltic", 12);
++pref("font.size.fixed.x-baltic", 14);
+
+-pref("font.default.x-central-euro", "serif");
++pref("font.default.x-central-euro", "sans-serif");
+ pref("font.size.variable.x-central-euro", 16);
+-pref("font.size.fixed.x-central-euro", 12);
++pref("font.size.fixed.x-central-euro", 14);
+
+-pref("font.default.x-cyrillic", "serif");
++pref("font.default.x-cyrillic", "sans-serif");
+ pref("font.size.variable.x-cyrillic", 16);
+-pref("font.size.fixed.x-cyrillic", 12);
++pref("font.size.fixed.x-cyrillic", 14);
+
+-pref("font.default.x-unicode", "serif");
++pref("font.default.x-unicode", "sans-serif");
+ pref("font.size.variable.x-unicode", 16);
+-pref("font.size.fixed.x-unicode", 12);
++pref("font.size.fixed.x-unicode", 14);
+
+-pref("font.default.x-western", "serif");
++pref("font.default.x-western", "sans-serif");
+ pref("font.size.variable.x-western", 16);
+-pref("font.size.fixed.x-western", 12);
++pref("font.size.fixed.x-western", 14);
+
+ pref("font.default.zh-CN", "sans-serif");
+ pref("font.size.variable.zh-CN", 16);
+-pref("font.size.fixed.zh-CN", 16);
++pref("font.size.fixed.zh-CN", 14);
+
+ pref("font.default.zh-TW", "sans-serif");
+ pref("font.size.variable.zh-TW", 16);
+-pref("font.size.fixed.zh-TW", 16);
++pref("font.size.fixed.zh-TW", 14);
+
+ pref("font.default.zh-HK", "sans-serif");
+ pref("font.size.variable.zh-HK", 16);
+-pref("font.size.fixed.zh-HK", 16);
++pref("font.size.fixed.zh-HK", 14);
+
+ // below a certian pixel size outline scaled fonts produce poor results
+ pref("font.scale.outline.min", 6);
================================================================
Index: SOURCES/icedove-gcc.patch
diff -u /dev/null SOURCES/icedove-gcc.patch:1.1
--- /dev/null Tue Jun 24 12:15:10 2008
+++ SOURCES/icedove-gcc.patch Tue Jun 24 12:15:00 2008
@@ -0,0 +1,22 @@
+--- mozilla/mailnews/mime/src/mimeeobj.h.old 2006-07-08 18:15:56.999551250
+0200
++++ mozilla/mailnews/mime/src/mimeeobj.h 2006-07-08 18:01:07.000000000
+0200
+@@ -40,6 +40,10 @@
+
+ #include "mimeleaf.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ /* The MimeExternalObject class represents MIME parts which contain data
+ which cannot be displayed inline -- application/octet-stream and any
+ other type that is not otherwise specially handled. (This is not to
+@@ -60,4 +64,8 @@
+ MimeLeaf leaf;
+ };
+
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
+ #endif /* _MIMEEOBJ_H_ */
================================================================
Index: SOURCES/icedove-lib_path.patch
diff -u /dev/null SOURCES/icedove-lib_path.patch:1.1
--- /dev/null Tue Jun 24 12:15:11 2008
+++ SOURCES/icedove-lib_path.patch Tue Jun 24 12:15:00 2008
@@ -0,0 +1,12 @@
+diff -ur firefox.orig/config/autoconf.mk.in firefox/config/autoconf.mk.in
+--- firefox.orig/config/autoconf.mk.in 2004-03-21 03:31:17.000000000 +0100
++++ firefox/config/autoconf.mk.in 2004-06-17 09:50:30.000000000 +0200
+@@ -37,7 +37,7 @@
+ mandir = @mandir@
+ idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir = $(libdir)/$(MOZ_APP_NAME)
+ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir = $(mredir)/lib
+
================================================================
Index: SOURCES/icedove-myspell.patch
diff -u /dev/null SOURCES/icedove-myspell.patch:1.1
--- /dev/null Tue Jun 24 12:15:11 2008
+++ SOURCES/icedove-myspell.patch Tue Jun 24 12:15:01 2008
@@ -0,0 +1,248 @@
+--- firefox-2.0+0dfsg.orig/extensions/spellcheck/myspell/src/Makefile.in
++++ firefox-2.0+0dfsg/extensions/spellcheck/myspell/src/Makefile.in
+@@ -60,15 +60,18 @@
+ xulapp \
+ $(NULL)
+
+-CPPSRCS = affentry.cpp \
++CPPSRCS = mozMySpell.cpp \
++ mozMySpellFactory.cpp \
++ $(NULL)
++ifndef MOZ_NATIVE_MYSPELL
++CPPSRCS += affentry.cpp \
+ affixmgr.cpp \
+ hashmgr.cpp \
+ suggestmgr.cpp \
+ csutil.cpp \
+ myspell.cpp \
+- mozMySpell.cpp \
+- mozMySpellFactory.cpp \
+ $(NULL)
++endif
+
+ ifdef MOZ_XUL_APP
+ CPPSRCS += mozMySpellDirProvider.cpp
+@@ -79,6 +82,7 @@
+ $(XPCOM_LIBS) \
+ $(NSPR_LIBS) \
+ $(MOZ_UNICHARUTIL_LIBS) \
++ $(MOZ_MYSPELL_LIBS) \
+ $(NULL)
+
+ include $(topsrcdir)/config/rules.mk
+--- firefox-2.0+0dfsg.orig/configure
++++ firefox-2.0+0dfsg/configure
+@@ -60,6 +60,8 @@
+ --with-system-png[=PFX]
+ Use system libpng [installed at prefix PFX]"
+ ac_help="$ac_help
++ --enable-system-myspell Use system myspell (located with pkgconfig)"
++ac_help="$ac_help
+ --with-java-include-path=dir Location of Java SDK headers"
+ ac_help="$ac_help
+ --with-java-bin-path=dir Location of Java binaries (java, javac, jar)"
+@@ -12011,6 +11953,116 @@
+
+ fi # SKIP_LIBRARY_CHECKS
+
++# Check whether --enable-system-myspell or --disable-system-myspell was given.
++if test "${enable_system_myspell+set}" = set; then
++ enableval="$enable_system_myspell"
++ if test "$enableval" = "yes"; then
++ SYSTEM_MYSPELL=1
++ elif test "$enableval" = "no"; then
++ :
++ else
++ { echo "configure: error: Option, system-myspell, does not take an
argument ($enableval)." 1>&2; exit 1; }
++ fi
++fi
++
++
++if test -n "$SYSTEM_MYSPELL"; then
++
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name
with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:11978: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ case "$PKG_CONFIG" in
++ /*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
++ ;;
++ ?:/*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
dos path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++ echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo $ac_n "checking for myspell""... $ac_c" 1>&6
++echo "configure:12022: checking for myspell" >&5
++
++ if $PKG_CONFIG --exists "myspell" ; then
++ echo "$ac_t""yes" 1>&6
++ succeeded=yes
++
++ echo $ac_n "checking MOZ_MYSPELL_CFLAGS""... $ac_c" 1>&6
++echo "configure:12029: checking MOZ_MYSPELL_CFLAGS" >&5
++ MOZ_MYSPELL_CFLAGS=`$PKG_CONFIG --cflags "myspell"`
++ echo "$ac_t""$MOZ_MYSPELL_CFLAGS" 1>&6
++
++ echo $ac_n "checking MOZ_MYSPELL_LIBS""... $ac_c" 1>&6
++echo "configure:12034: checking MOZ_MYSPELL_LIBS" >&5
++ ## don't use --libs since that can do evil things like add
++ ## -Wl,--export-dynamic
++ MOZ_MYSPELL_LIBS="`$PKG_CONFIG --libs-only-L \"myspell\"`
`$PKG_CONFIG --libs-only-l \"myspell\"`"
++ echo "$ac_t""$MOZ_MYSPELL_LIBS" 1>&6
++ else
++ MOZ_MYSPELL_CFLAGS=""
++ MOZ_MYSPELL_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ MOZ_MYSPELL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "myspell"`
++ echo $MOZ_MYSPELL_PKG_ERRORS
++ fi
++
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version
$PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig";
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ { echo "configure: error: Library requirements (myspell) not met;
consider adjusting the PKG_CONFIG_PATH environment variable if your libraries
are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
++ fi
++
++fi
++
++
++
++
+ JAVA_INCLUDE_PATH=
+ # Check whether --with-java-include-path or --without-java-include-path was
given.
+ if test "${with_java_include_path+set}" = set; then
+@@ -20291,10 +20347,13 @@
+ [EMAIL PROTECTED]@%$NSS_CONFIG%g
+ [EMAIL PROTECTED]@%$NSS_CFLAGS%g
+ [EMAIL PROTECTED]@%$NSS_LIBS%g
[EMAIL PROTECTED]@%$PKG_CONFIG%g
[EMAIL PROTECTED]@%$MOZ_MYSPELL_CFLAGS%g
[EMAIL PROTECTED]@%$MOZ_MYSPELL_LIBS%g
[EMAIL PROTECTED]@%$SYSTEM_MYSPELL%g
+ [EMAIL PROTECTED]@%$GTK_CONFIG%g
+ [EMAIL PROTECTED]@%$GTK_CFLAGS%g
+ [EMAIL PROTECTED]@%$GTK_LIBS%g
[EMAIL PROTECTED]@%$PKG_CONFIG%g
+ [EMAIL PROTECTED]@%$MOZ_GTK2_CFLAGS%g
+ [EMAIL PROTECTED]@%$MOZ_GTK2_LIBS%g
+ [EMAIL PROTECTED]@%$HOST_MOC%g
+--- firefox-2.0+0dfsg.orig/configure.in
++++ firefox-2.0+0dfsg/configure.in
+@@ -3840,6 +3870,19 @@
+
+ fi # SKIP_LIBRARY_CHECKS
+
++dnl system MySpell Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-myspell,
++[ --enable-system-myspell Use system myspell (located with pkgconfig)],
++ SYSTEM_MYSPELL=1 )
++
++if test -n "$SYSTEM_MYSPELL"; then
++ PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
++fi
++
++AC_SUBST(SYSTEM_MYSPELL)
++AC_SUBST(MOZ_MYSPELL_LIBS)
++
+ dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+--- firefox-2.0+0dfsg.orig/config/autoconf.mk.in
++++ firefox-2.0+0dfsg/config/autoconf.mk.in
+@@ -190,6 +190,9 @@
+ NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
+ NECKO_COOKIES = @NECKO_COOKIES@
+
++MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
++MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
++
+ MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
+ MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
+ MOZ_NATIVE_PNG = @SYSTEM_PNG@
+--- mozilla/mailnews/compose/resources/content/MsgComposeCommands.js~
2006-12-31 00:16:49.000000000 +0200
++++ mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
2007-03-05 04:35:59.280678222 +0200
+@@ -2154,6 +2154,10 @@
+ {
+ langId = dictList[i];
+ isoStrArray = dictList[i].split("-");
++ // if we can't split by Mozilla locale names (en-US), try system
separator (en_US)
++ if (isoStrArray.length < 2) {
++ isoStrArray = dictList[i].split("_");
++ }
+
+ if (languageBundle && isoStrArray[0])
+ langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
+--- mozilla/mail/components/compose/content/MsgComposeCommands.js~
2007-01-16 02:37:55.000000000 +0200
++++ mozilla/mail/components/compose/content/MsgComposeCommands.js
2007-03-05 04:37:41.320669980 +0200
+@@ -2235,6 +2235,10 @@
+ {
+ langId = dictList[i];
+ isoStrArray = dictList[i].split("-");
++ // if we can't split by Mozilla locale names (en-US), try system
separator (en_US)
++ if (isoStrArray.length < 2) {
++ isoStrArray = dictList[i].split("_");
++ }
+
+ if (languageBundle && isoStrArray[0])
+ langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
+--- mozilla/mail/components/preferences/compose.js~ 2006-11-28
03:06:50.000000000 +0200
++++ mozilla/mail/components/preferences/compose.js 2007-03-05
04:39:00.815779020 +0200
+@@ -337,6 +337,10 @@
+ try {
+ langId = dictList[i];
+ isoStrArray = dictList[i].split("-");
++ // if we can't split by Mozilla locale names (en-US), try system
separator (en_US)
++ if (isoStrArray.length < 2) {
++ isoStrArray = dictList[i].split("_");
++ }
+
+ if (languageBundle && isoStrArray[0])
+ langLabel = languageBundle.getString(isoStrArray[0].toLowerCase());
================================================================
Index: SOURCES/icedove-regionNames.patch
diff -u /dev/null SOURCES/icedove-regionNames.patch:1.1
--- /dev/null Tue Jun 24 12:15:12 2008
+++ SOURCES/icedove-regionNames.patch Tue Jun 24 12:15:02 2008
@@ -0,0 +1,301 @@
+update from
http://bonsai.mozilla.org/cvslog.cgi?file=mozilla/toolkit/locales/en-US/chrome/global/regionNames.properties&rev=HEAD&mark=1.7
+
+--- mozilla/toolkit/locales/en-US/chrome/global/regionNames.properties~
2005-05-01 10:43:49.000000000 +0300
++++ mozilla/toolkit/locales/en-US/chrome/global/regionNames.properties
2007-03-06 02:32:05.707859066 +0200
+@@ -1,75 +1,243 @@
++ad = Andorra
+ ae = U.A.E.
+-bh = Bahrain
+-dz = Algeria
+-eg = Egypt
+-iq = Iraq
+-jo = Jordan
+-kw = Kuwait
+-lb = Lebanon
+-ly = Libya
+-ma = Morocco
+-om = Oman
+-qa = Qatar
+-sa = Saudi Arabia
+-sy = Syria
+-tn = Tunisia
+-ye = Yemen
++af = Afghanistan
++ag = Antigua and Barbuda
++ai = Anguilla
++al = Albania
++am = Armenia
++an = Netherlands Antilles
++ao = Angola
++aq = Antarctica
++ar = Argentina
++as = American Samoa
+ at = Austria
+-de = Germany
+-lu = Luxembourg
+-li = Liechtenstein
+ au = Australia
++aw = Aruba
++ax = \u00c5land Islands
++az = Azerbaijan
++ba = Bosnia and Herzegovina
++bb = Barbados
++bd = Bangladesh
++be = Belgium
++bf = Burkina Faso
++bg = Bulgaria
++bh = Bahrain
++bi = Burundi
++bj = Benin
++bm = Bermuda
++bn = Brunei Darussalam
++bo = Bolivia
++br = Brazil
++bs = Bahamas
++bt = Bhutan
++bv = Bouvet Island
++bw = Botswana
++by = Belarus
+ bz = Belize
+ ca = Canada
+-gb = United Kingdom
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
