Hello community,
here is the log from the commit of package MozillaThunderbird for
openSUSE:Factory checked in at 2014-08-01 07:07:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old)
and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaThunderbird"
Changes:
--------
--- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes
2014-07-25 12:27:32.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes
2014-08-01 07:07:44.000000000 +0200
@@ -1,0 +2,19 @@
+Sun Jul 27 20:25:46 UTC 2014 - [email protected]
+
+- update to Thunderbird 31.0
+ * based on Gecko 31
+ * Autocompleting email addresses now matches against any part of
+ the name or email
+ * Composing a mail to a newsgroup will now autocomplete newsgroup
+ names
+ * Insecure NTLM (pre-NTLMv2) authentication disabled
+- rebased patches
+- removed enigmail entirely from source package
+- removed obsolete patches
+ * libffi-ppc64le.patch
+ * ppc64le-support.patch
+ * xpcom-ppc64le.patch
+- use GStreamer 1.0 after 13.1
+- switched source archives to use xz instead of bz2
+
+-------------------------------------------------------------------
Old:
----
compare-locales.tar.bz2
enigmail-1.7.tar.gz
l10n-24.7.0.tar.bz2
libffi-ppc64le.patch
ppc64le-support.patch
thunderbird-24.7.0-source.tar.bz2
xpcom-ppc64le.patch
New:
----
compare-locales.tar.xz
l10n-31.0.tar.xz
thunderbird-31.0-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaThunderbird.spec ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -17,9 +17,18 @@
#
-%define mainversion 24.7.0
+%define mainversion 31.0
%define update_channel release
+
+%if %suse_version > 1210
+%if %suse_version > 1310
+%define gstreamer_ver 1.0
+%define gstreamer 1
+%else
%define gstreamer_ver 0.10
+%endif
+%endif
+
%define with_kde 1
Name: MozillaThunderbird
@@ -41,16 +50,27 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel
+BuildRequires: xz
BuildRequires: yasm
BuildRequires: zip
+BuildRequires: pkgconfig(libpulse)
%if %suse_version > 1210
BuildRequires: pkgconfig(gstreamer-%gstreamer_ver)
BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver)
BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
+%if 0%{?gstreamer} == 1
+Requires: libgstreamer-1_0-0
+Recommends: gstreamer-fluendo-mp3
+Recommends: gstreamer-plugin-libav
+%else
+Requires: libgstreamer-0_10-0
+Recommends: gstreamer-0_10-fluendo-mp3
+Recommends: gstreamer-0_10-plugins-ffmpeg
+%endif
%endif
Version: %{mainversion}
Release: 0
-%define releasedate 2014072000
+%define releasedate 2014072100
Provides: thunderbird = %{version}
%if %{with_kde}
# this is needed to match this package with the kde4 helper package without
the main package
@@ -62,18 +82,17 @@
License: MPL-2.0
Group: Productivity/Networking/Email/Clients
Url: http://www.mozilla.org/products/thunderbird/
-Source: thunderbird-%{version}-source.tar.bz2
+Source: thunderbird-%{version}-source.tar.xz
Source1: thunderbird.desktop
Source2: add-plugins.sh.in
Source3: mozilla.sh.in
-Source4: l10n-%{version}.tar.bz2
+Source4: l10n-%{version}.tar.xz
#Source5: shipped-locales
Source6: suse-default-prefs.js
Source7: find-external-requires.sh
Source8: thunderbird-rpmlintrc
-Source9: enigmail-1.7.tar.gz
Source10: create-tar.sh
-Source11: compare-locales.tar.bz2
+Source11: compare-locales.tar.xz
Source12: kde.js
# Gecko/Toolkit
Patch1: mozilla-shared-nss-db.patch
@@ -82,9 +101,6 @@
Patch4: mozilla-kde.patch
Patch5: mozilla-arm-disable-edsp.patch
Patch7: mozilla-ppc.patch
-Patch8: libffi-ppc64le.patch
-Patch9: xpcom-ppc64le.patch
-Patch10: ppc64le-support.patch
# Thunderbird/mail
Patch20: tb-ssldap.patch
Patch21: tb-develdirs.patch
@@ -93,7 +109,6 @@
PreReq: coreutils fileutils textutils /bin/sh
Recommends: libcanberra0
### build options
-%define build_enigmail 0
%ifnarch ppc ppc64 ppc64le %arm
%define crashreporter 1
%else
@@ -128,7 +143,6 @@
%package translations-common
Summary: Common translations for MozillaThunderbird
-License: MPL-2.0
Group: System/Localization
Provides:
locale(%{name}:ar;ca;cs;da;de;el;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
PreReq: %{name} = %{mainversion}
@@ -141,7 +155,6 @@
%package translations-other
Summary: Extra translations for MozillaThunderbird
-License: MPL-2.0
Group: System/Localization
Provides:
locale(%{name}:ast;be;bg;bn_BD;br;et;eu;fy_NL;ga_IE;gd;gl;he;hr;hy_AM;id;is;lt;nn_NO;pa_IN;rm;ro;si;sk;sl;sq;sr;ta_LK;tr;uk;vi)
PreReq: %{name} = %{mainversion}
@@ -154,7 +167,6 @@
%package devel
Summary: Mozilla Thunderbird SDK
-License: MPL-2.0
Group: Development/Libraries/Other
Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}'
mozilla-nspr-devel)
PreReq: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}'
mozilla-nss-devel)
@@ -168,7 +180,6 @@
%package buildsymbols
Summary: Breakpad buildsymbols for %{name}
-License: MPL-2.0
Group: Development/Debug
%description buildsymbols
@@ -176,32 +187,8 @@
symbols meant for upload to Mozilla's crash collector database.
%endif
-%if %build_enigmail
-%package -n enigmail
-Version: 1.7.0+%{mainversion}
-Release: 0
-Summary: OpenPGP addon for Thunderbird and SeaMonkey
-License: MPL-1.1 or GPL-2.0+
-Group: Productivity/Networking/Email/Clients
-Url: http://www.enigmail.net/
-Requires: /usr/bin/gpg
-%if %suse_version > 1110
-Requires: pinentry-gui
-%else
-Requires: pinentry-dialog
-%endif
-Conflicts: thunderbird-esr
-
-%description -n enigmail
-This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey.
-%endif
-
%prep
-%if %build_enigmail
-%setup -n thunderbird -q -b 4 -b 11 -b 9
-%else
%setup -n thunderbird -q -b 4 -b 11
-%endif
# xulrunner patches
pushd mozilla
%patch1 -p1
@@ -212,9 +199,6 @@
%endif
%patch5 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
popd
# comm-central patches
%patch20 -p1
@@ -254,7 +238,7 @@
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZ_MILESTONE_RELEASE=1
mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+mk_add_options MOZ_OBJDIR=$RPM_BUILD_DIR/obj
ac_add_options --enable-application=mail
ac_add_options --prefix=%{_prefix}
ac_add_options --libdir=%{progdir}
@@ -276,51 +260,31 @@
ac_add_options --enable-official-branding
ac_add_options --disable-necko-wifi
ac_add_options --enable-update-channel=%{update_channel}
-EOF
+%if 0%{?gstreamer} == 1
+ac_add_options --enable-gstreamer=1.0
+%endif
%if %suse_version > 1130
-cat << EOF >> $MOZCONFIG
ac_add_options --disable-gnomevfs
ac_add_options --enable-gio
-EOF
%endif
%if %suse_version < 1220
-cat << EOF >> $MOZCONFIG
ac_add_options --disable-gstreamer
-EOF
%endif
%if %has_system_cairo
-cat << EOF >> $MOZCONFIG
ac_add_options --enable-system-cairo
-EOF
%endif
%if ! %crashreporter
-cat << EOF >> $MOZCONFIG
ac_add_options --disable-crashreporter
-EOF
%endif
# Disable neon for arm as it does not build correctly
%ifarch %arm
-cat << EOF >> $MOZCONFIG
ac_add_options --disable-neon
-EOF
%endif
+EOF
make -f client.mk build
-#
-### enigmail build
-%if %build_enigmail
-cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/
-
-pushd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail
- ./makemake -r -o '../../../../obj'
-popd
-pushd $RPM_BUILD_DIR/obj/mailnews/extensions/enigmail
-make
-make xpi
-popd
-%endif
%install
-cd ../obj
+cd $RPM_BUILD_DIR/obj
make -C mail/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
# copy tree into RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{progdir}
@@ -409,37 +373,7 @@
# $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
#rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc
#ln -sf nss.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc
-##########
-# ADDONS
#
-# install enigmail to extension dir
-%if %build_enigmail
-cp -L mozilla/dist/bin/enigmail-*.xpi $RPM_BUILD_ROOT%{progdir}
-# Thunderbird location
-_enig_dir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-mkdir -p $_enig_dir
-(cd $_enig_dir; unzip $RPM_BUILD_ROOT%{progdir}/enigmail-*.xpi)
-# SeaMonkey location
-mkdir -p
$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
-(cd
$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\};
\
- ln -s
../\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
)
-# remove unwanted build artifacts
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail.jar
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-locale.jar
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-en-US.jar
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-skin.jar
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/installed-chrome.txt
-rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmime.jar
-rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so
-rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt
-rm -f $RPM_BUILD_ROOT%{progdir}/components/enig*
-rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so
-rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt
-rm -rf $RPM_BUILD_ROOT%{progdir}/defaults/preferences/
-rm -rf $RPM_BUILD_ROOT%{progdir}/platform/
-rm -rf $RPM_BUILD_ROOT%{progdir}/wrappers/
-rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi
-%endif
#
# remove spurious executable bits
find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \;
@@ -503,10 +437,6 @@
%if %suse_version > 1130
%icon_theme_cache_post
%endif
-# remove enigmail on updates
-if [ -e %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} ]; then
- rm -rf %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-fi
exit 0
%posttrans
@@ -581,16 +511,7 @@
#%{_libdir}/pkgconfig/*.pc
%{_includedir}/%{progname}/
-%if %build_enigmail
-
-%files -n enigmail
-%defattr(-,root,root)
-%dir %{_libdir}/mozilla
-%{_libdir}/mozilla/extensions/
-%endif
-
%if %crashreporter
-
%files buildsymbols
%defattr(-,root,root)
%{_datadir}/mozilla/
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="esr24"
+CHANNEL="esr31"
BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_24_7_0_RELEASE"
-VERSION="24.7.0"
+RELEASE_TAG="THUNDERBIRD_31_0_RELEASE"
+VERSION="31.0"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird
@@ -16,7 +16,7 @@
python client.py checkout --skip-chatzilla --skip-venkman $_extra
popd
echo "creating archive..."
-tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags
--exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird
+tar cJf thunderbird-$VERSION-source.tar.xz --exclude=.hgtags
--exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird
# l10n
# http://l10n.mozilla.org/dashboard/?tree=tb30x -> shipped-locales
@@ -39,12 +39,12 @@
esac
done
echo "creating l10n archive..."
-tar cjf l10n-$VERSION.tar.bz2 \
+tar cJf l10n-$VERSION.tar.xz \
--exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=browser
--exclude=calendar \
--exclude=suite \
l10n
# compare-locales
hg clone http://hg.mozilla.org/build/compare-locales
-tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore
--exclude=.hg compare-locales
+tar cJf compare-locales.tar.xz --exclude=.hgtags --exclude=.hgignore
--exclude=.hg compare-locales
++++++ mozilla-arm-disable-edsp.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -1,13 +1,13 @@
# HG changeset patch
# User Adrian Schröter <[email protected]>
-# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f
+# Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759
disable ESDP support (no BNC or BMO reference yet :-()
-diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h
---- a/xpcom/glue/arm.h
-+++ b/xpcom/glue/arm.h
-@@ -143,17 +143,17 @@ namespace mozilla {
- extern bool NS_COM_GLUE neon_enabled;
+diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
+--- a/mozglue/build/arm.h
++++ b/mozglue/build/arm.h
+@@ -116,17 +116,17 @@ namespace mozilla {
+ extern bool MFBT_DATA neon_enabled;
#endif
#endif
}
++++++ mozilla-kde.patch ++++++
++++ 946 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/MozillaThunderbird/mozilla-kde.patch
++++ and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/mozilla-kde.patch
++++++ mozilla-language.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
# User Wolfgang Rosenauer <[email protected]>
-# Parent df748bfc0eaca6dedf086cfd7167392416bfae27
+# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c
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
-@@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void)
+@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
nsRefPtr<nsLocale> resultLocale(new nsLocale());
NS_ENSURE_TRUE_VOID(resultLocale);
@@ -24,7 +24,7 @@
for( i = 0; i < LocaleListLength; i++ ) {
nsresult result;
-@@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void)
+@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void)
} else {
CopyASCIItoUTF16(lang, platformLocale);
result = nsPosixLocale::GetXPLocale(lang, xpLocale);
@@ -45,4 +45,4 @@
mApplicationLocale = do_QueryInterface(resultLocale);
#endif // XP_UNIX
- #ifdef XP_OS2
+
++++++ mozilla-nongnome-proxies.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -9,7 +9,7 @@
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -50,24 +50,28 @@ nsUnixSystemProxySettings::GetMainThread
+@@ -53,23 +53,27 @@ nsUnixSystemProxySettings::GetMainThread
// dbus prevents us from being threadsafe, but this routine should not
block anyhow
*aMainThreadOnly = true;
return NS_OK;
@@ -18,7 +18,6 @@
nsresult
nsUnixSystemProxySettings::Init()
{
-- mSchemeProxySettings.Init(5);
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
- if (mGSettings) {
-
mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
@@ -29,7 +28,6 @@
+ // only use GSettings if that is a GNOME session
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
+ if (sessionType && !strcmp(sessionType, "gnome")) {
-+ mSchemeProxySettings.Init(5);
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
+ if (mGSettings) {
+
mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
++++++ mozilla-ppc.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -2,7 +2,6 @@
# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
# User Wolfgang Rosenauer <[email protected]>
Bug 746112 - RegExp hang on ppc64 in execute.
-Bug 750620 - Make double-conversion portable to exotic architectures. TM:
mozilla15
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
--- a/js/src/yarr/YarrInterpreter.h
@@ -89,25 +88,3 @@
/*
* VM page size. It must divide the runtime CPU page size or the code
* will abort.
-diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
---- a/mfbt/double-conversion/utils.h
-+++ b/mfbt/double-conversion/utils.h
-@@ -50,17 +50,17 @@
- // the result is equal to 89255e-22.
- // The best way to test this, is to create a division-function and to compare
- // the output of the division with the expected result. (Inlining must be
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
- #if defined(_M_X64) || defined(__x86_64__) || \
- defined(__ARMEL__) || defined(__avr32__) || \
- defined(__hppa__) || defined(__ia64__) || \
-- defined(__mips__) || defined(__powerpc__) || \
-+ defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \
- defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -7,13 +7,13 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS)
-
- dnl ========================================================
- dnl HarfBuzz
- dnl ========================================================
-
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_HARFBUZZ_LIBS)
+@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+ MOZ_ENABLE_SKIA_GPU=1
+ AC_DEFINE(USE_SKIA_GPU)
+ AC_SUBST(MOZ_ENABLE_SKIA_GPU)
+ fi
+ fi
+ AC_SUBST(MOZ_ENABLE_SKIA)
dnl ========================================================
+dnl Check for nss-shared-helper
@@ -31,31 +31,27 @@
+AC_SUBST(NSSHELPER_LIBS)
+
+dnl ========================================================
- dnl SIL Graphite
- dnl ========================================================
-
MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_GRAPHITE_LIBS)
-
- dnl ========================================================
- dnl OTS
+ dnl disable xul
dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [ --disable-xul Disable XUL],
+ MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+ AC_DEFINE(MOZ_XUL)
+ else
diff --git a/security/manager/ssl/src/Makefile.in
b/security/manager/ssl/src/Makefile.in
---- a/security/manager/ssl/src/Makefile.in
+new file mode 100644
+--- /dev/null
+++ b/security/manager/ssl/src/Makefile.in
-@@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1
- CSRCS += md4.c
-
- DEFINES += \
- -DNSS_ENABLE_ECC \
- -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
- -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
- $(NULL)
-
+@@ -0,0 +1,8 @@
++#! gmake
++#
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
-+
- include $(topsrcdir)/config/rules.mk
-
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp
b/security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -77,68 +73,64 @@
+
#include "nsNSSComponent.h"
- #include "CertVerifier.h"
+ #include "ExtendedValidation.h"
+ #include "NSSCertDBTrustDomain.h"
+ #include "mozilla/Telemetry.h"
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
- #include "nsDirectoryServiceDefs.h"
- #include "nsICertOverrideService.h"
-@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW
- ConfigureInternalPKCS11Token();
-
- // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
- // module by NSS_Initialize because we will load it in
InstallLoadableRoots
- // later. It also allows us to work around a bug in the system NSS in
- // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
- // "/usr/lib/nss/libnssckbi.so".
- uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
-- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-- SECMOD_DB, init_flags);
-+ SECStatus init_rv = SECFailure;
+@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS()
+ if (NS_FAILED(rv)) {
+ nsPSMInitPanic::SetPanic();
+ return NS_ERROR_NOT_AVAILABLE;
+ }
+
+ SECStatus init_rv = SECFailure;
+ if (!profileStr.IsEmpty()) {
+ // First try to initialize the NSS DB in read/write mode.
+- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(),
false);
+#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_TB_NO_NSSHELPER")) {
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ } else {
-+ init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(),
init_flags);
++ uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
++ init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(), flags);
+
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using
nsshelp_open_db in %s\n", profileStr.get()));
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ }
+ }
+#else
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#endif
-
+ // If that fails, attempt read-only mode.
if (init_rv != SECSuccess) {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n",
profileStr.get()));
-
- if (supress_warning_preference) {
- which_nss_problem = problem_none;
- }
- else {
-diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
---- a/toolkit/library/Makefile.in
-+++ b/toolkit/library/Makefile.in
-@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
- endif
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n",
profileStr.get()));
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true);
+ }
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
+ }
+diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
+--- a/toolkit/library/libxul.mk
++++ b/toolkit/library/libxul.mk
+@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid
endif
+
+ ifdef MOZ_DIRECTSHOW
+ OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
endif
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
- DEFINES += -DIMPL_XREAPI
-
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CXXFLAGS += $(TK_CFLAGS)
OS_LIBS += \
- -framework SystemConfiguration \
- -framework QTKit \
- -framework IOKit \
- -F/System/Library/PrivateFrameworks -framework CoreUI \
+ $(TK_LIBS) \
+ $(NULL)
+ endif
+
+ ifeq (OpenBSD,$(OS_ARCH))
++++++ tb-develdirs.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -1,10 +1,7 @@
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
-index 636b9aa..b350c75 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
-
+@@ -1,10 +1,10 @@
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir := $(includedir)/$(MOZ_APP_NAME)
@@ -12,3 +9,8 @@
installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+ # manually use it before config.mk inclusion
++++++ thunderbird-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.spqwpy/_old 2014-08-01 07:07:57.000000000 +0200
+++ /var/tmp/diff_new_pack.spqwpy/_new 2014-08-01 07:07:57.000000000 +0200
@@ -7,14 +7,14 @@
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
-@@ -61,16 +61,17 @@ LOCAL_INCLUDES += \
+@@ -54,16 +54,17 @@ LOCAL_INCLUDES += \
+ -I$(MOZILLA_SRCDIR)/xpcom/build \
$(NULL)
DEFINES += -DXPCOM_GLUE
STL_FLAGS=
LIBS += \
- $(EXTRA_DSO_LIBS) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
+ $(NSSHELPER_LIBS) \
$(NULL)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
