Hello community,
here is the log from the commit of package MozillaThunderbird for
openSUSE:Factory
checked in at Wed Sep 28 14:02:00 CEST 2011.
--------
--- MozillaThunderbird/MozillaThunderbird.changes 2011-09-14
09:06:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/MozillaThunderbird/MozillaThunderbird.changes
2011-09-26 15:42:23.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 26 09:18:56 UTC 2011 - wolfg...@rosenauer.org
+
+- update to version 7.0 (bnc#720264)
+- removed obsolete mozilla-cairo-lcd.patch
+- rebased patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
l10n-6.0.2.tar.bz2
mozilla-cairo-lcd.patch
thunderbird-6.0.2-source.tar.bz2
New:
----
l10n-7.0.tar.bz2
thunderbird-7.0-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaThunderbird.spec ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:48.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:48.000000000 +0200
@@ -21,13 +21,14 @@
Name: MozillaThunderbird
BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++
hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel
python startup-notification-devel unzip update-desktop-files yasm zip
-BuildRequires: mozilla-nss-devel >= 3.12.8
+BuildRequires: mozilla-nspr-devel >= 4.8.8
+BuildRequires: mozilla-nss-devel >= 3.12.10
BuildRequires: nss-shared-helper-devel
License: MPLv1.1 or GPLv2+ or LGPLv2+
-%define mainversion 6.0.2
+%define mainversion 7.0
Version: %{mainversion}
-Release: 29
-%define releasedate 2011090700
+Release: 1
+%define releasedate 2011092200
Provides: thunderbird = %{version}
Summary: The Stand-Alone Mozilla Mail Component
Url: http://www.mozilla.org/products/thunderbird/
@@ -46,7 +47,6 @@
Source11: compare-locales.tar.bz2
# Gecko/Toolkit
Patch1: mozilla-shared-nss-db.patch
-Patch2: mozilla-cairo-lcd.patch
Patch3: mozilla-language.patch
Patch4: mozilla-linux3.patch
Patch5: mozilla-cairo-return.patch
@@ -166,7 +166,6 @@
# xulrunner patches
pushd mozilla
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -462,6 +461,7 @@
%dir %{progdir}/chrome/
%{progdir}/chrome/icons/
%dir %{progdir}/dictionaries/
+%{progdir}/hyphenation/
%{progdir}/defaults/
%dir %{progdir}/extensions/
%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200
@@ -2,8 +2,8 @@
BRANCH="releases/comm-release"
-RELEASE_TAG="THUNDERBIRD_6_0_2_RELEASE"
-VERSION="6.0.2"
+RELEASE_TAG="THUNDERBIRD_7_0_RELEASE"
+VERSION="7.0"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird
++++++ l10n-6.0.2.tar.bz2 -> l10n-7.0.tar.bz2 ++++++
MozillaThunderbird/l10n-6.0.2.tar.bz2
/mounts/work_src_done/STABLE/MozillaThunderbird/l10n-7.0.tar.bz2 differ: char
11, line 1
++++++ mozilla-cairo-return.patch ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200
@@ -1,6 +1,6 @@
# HG changeset patch
# User Wolfgang Rosenauer <w...@rosenauer.org>
-# Parent e36e1a20cb5e1ba0e4bc3facac58029544d92e0a
+# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b
Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
++++++ mozilla-language.patch ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200
@@ -1,48 +1,48 @@
# HG changeset patch
# User Wolfgang Rosenauer <w...@rosenauer.org>
-# Parent db620d83124746201970dcf50c661957df979eca
+# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
diff --git a/intl/locale/src/nsLocaleService.cpp
b/intl/locale/src/nsLocaleService.cpp
--- a/intl/locale/src/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp
-@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void)
- }
-
+@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void)
+ nsRefPtr<nsLocale> resultLocale(new nsLocale());
+ NS_ENSURE_TRUE(resultLocale, );
#ifdef MOZ_WIDGET_QT
- const char* lang = QLocale::system().name().toAscii();
+ const char* lang = QLocale::system().name().toAscii();
#else
- // Get system configuration
- const char* lang = getenv("LANG");
-+ const char* language = getenv("LANGUAGE");
+ // Get system configuration
+ const char* lang = getenv("LANG");
++ const char* language = getenv("LANGUAGE");
#endif
- for( i = 0; i < LocaleListLength; i++ ) {
- nsresult result;
- // setlocale( , "") evaluates LC_* and LANG
- char* lc_temp = setlocale(posix_locale_category[i], "");
- CopyASCIItoUTF16(LocaleList[i], category);
- category_platform = category;
-@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void)
- else {
- CopyASCIItoUTF16(lang, platformLocale);
- result = posixConverter->GetXPLocale(lang, xpLocale);
- }
- }
- if (NS_FAILED(result)) {
- return;
+ nsAutoString xpLocale, platformLocale;
+ nsAutoString category, category_platform;
+ int i;
+
+ for( i = 0; i < LocaleListLength; i++ ) {
+ nsresult result;
+@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void)
+ } else {
+ CopyASCIItoUTF16(lang, platformLocale);
+ result = nsPosixLocale::GetXPLocale(lang, xpLocale);
}
-+ // LANGUAGE is overriding LC_MESSAGES
-+ if (i == LC_MESSAGES && language && *language) {
-+ CopyASCIItoUTF16(language, platformLocale);
-+ result = posixConverter->GetXPLocale(language, xpLocale);
-+ }
- resultLocale->AddCategory(category, xpLocale);
- resultLocale->AddCategory(category_platform, platformLocale);
}
- mSystemLocale = do_QueryInterface(resultLocale);
- mApplicationLocale = do_QueryInterface(resultLocale);
- } // if ( NS_SUCCEEDED )...
+ if (NS_FAILED(result)) {
+ return;
+ }
++ // LANGUAGE is overriding LC_MESSAGES
++ if (i == LC_MESSAGES && language && *language) {
++ CopyASCIItoUTF16(language, platformLocale);
++ result = nsPosixLocale::GetXPLocale(language, xpLocale);
++ }
+ resultLocale->AddCategory(category, xpLocale);
+ resultLocale->AddCategory(category_platform, platformLocale);
+ }
+ mSystemLocale = do_QueryInterface(resultLocale);
+ mApplicationLocale = do_QueryInterface(resultLocale);
#endif // XP_UNIX
+ #ifdef XP_OS2
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
+@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@@ -31,7 +31,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -66,7 +66,7 @@
diff --git a/security/manager/ssl/src/Makefile.in
b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
-@@ -114,19 +114,20 @@ CSRCS += md4.c
+@@ -114,12 +114,14 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -77,14 +77,8 @@
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
-
- EXTRA_DSO_LDOPTS += \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ $(NSSHELPER_LIBS) \
- $(NSS_LIBS) \
- $(NULL)
++
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
include $(topsrcdir)/config/rules.mk
@@ -115,7 +109,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
-@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
++++++ thunderbird-6.0.2-source.tar.bz2 -> thunderbird-7.0-source.tar.bz2 ++++++
MozillaThunderbird/thunderbird-6.0.2-source.tar.bz2
/mounts/work_src_done/STABLE/MozillaThunderbird/thunderbird-7.0-source.tar.bz2
differ: char 11, line 1
++++++ thunderbird-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.3brdN7/_old 2011-09-28 14:01:49.000000000 +0200
+++ /var/tmp/diff_new_pack.3brdN7/_new 2011-09-28 14:01:49.000000000 +0200
@@ -66,7 +66,7 @@
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
-@@ -119,16 +119,17 @@ endif
+@@ -107,16 +107,17 @@ endif
APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
@@ -78,9 +78,9 @@
+ $(NSSHELPER_LIBS) \
$(NULL)
- ifdef BUILD_STATIC_LIBS
- LIBS += \
- $(MOZ_JS_LIBS) \
- $(TK_LIBS) \
- $(NULL)
+ ifdef MOZ_JPROF
+ LIBS += -ljprof
+ endif
+ ifdef MOZ_ENABLE_DBUS
+ LIBS += $(MOZ_DBUS_GLIB_LIBS)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
