Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv16268 Modified Files: .cvsignore sources thunderbird-enigmail.spec thunderbird-mozconfig Added Files: crashreporter-remove-static.patch enigmail-rdf.patch mozilla-build-s390.patch Removed Files: enigmail-1.1.2-perm.patch mozilla-jemalloc.patch remove-static.patch thunderbird-shared-error.patch xulrunner-1.9.2.1-build.patch xulrunner-missing-headers.patch Log Message: Update to Enigmail 1.2 for Thunderbird 5.0 crashreporter-remove-static.patch: Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE crashreporter-remove-static.patch --- Remove static build option from crashreporter to remove dependency on static libraries diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in --- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200 +++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200 @@ -64,6 +64,6 @@ FORCE_USE_PIC = 1 #XXX: bug 554854 causes us to be unable to run binaries on the build slaves # due to them having an older libstdc++ -HOST_LDFLAGS += -static +#HOST_LDFLAGS += -static include $(topsrcdir)/config/rules.mk enigmail-rdf.patch: install.rdf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- NEW FILE enigmail-rdf.patch --- --- enigmail/package/install.rdf.orig 2011-07-17 20:18:23.000000000 +0200 +++ enigmail/package/install.rdf 2011-07-17 20:18:32.000000000 +0200 @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id> - <em:version>1.2pre</em:version> + <em:version>1.2</em:version> <em:type>2</em:type> <!-- type = extension --> <em:unpack>true</em:unpack> @@ -27,14 +27,6 @@ <em:maxVersion>2.1.*</em:maxVersion> </Description> </em:targetApplication> - <!-- em:targetApplication> - < ! -- Spicebird -- > - <Description> - <em:id>{ee53ece0-255c-4cc6-8a7e-81a8b6e5ba2c}</em:id> - <em:minVersion>0.7</em:minVersion> - <em:maxVersion>0.8</em:maxVersion> - </Description> - </em:targetApplication --> <!-- targetPlatform placeholder --> mozilla-build-s390.patch: jstl.h | 1 - 1 file changed, 1 deletion(-) --- NEW FILE mozilla-build-s390.patch --- diff -up mozilla-1.9.2/js/src/jstl.h.s390 mozilla-1.9.2/js/src/jstl.h --- mozilla-1.9.2/js/src/jstl.h.s390 2011-02-18 19:33:24.000000000 +0100 +++ mozilla-1.9.2/js/src/jstl.h 2011-03-07 08:41:29.000000000 +0100 @@ -195,7 +195,6 @@ class ReentrancyGuard JS_ALWAYS_INLINE size_t RoundUpPow2(size_t x) { - typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _; size_t log2 = JS_CEILING_LOG2W(x); JS_ASSERT(log2 < tl::BitSize<size_t>::result); size_t result = size_t(1) << log2; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jul 2010 07:08:48 -0000 1.8 +++ .cvsignore 17 Jul 2011 20:43:46 -0000 1.9 @@ -1,2 +1,2 @@ -thunderbird-3.1.1.source.tar.bz2 -enigmail-1.1.2.tar.gz +thunderbird-5.0.source.tar.bz2 +enigmail-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2010 07:08:48 -0000 1.9 +++ sources 17 Jul 2011 20:43:47 -0000 1.10 @@ -1,2 +1,2 @@ -3a8479252bb9a0c534870896fc10e2ff thunderbird-3.1.1.source.tar.bz2 -7d329d5e8afbbb28214ca1995beb09c9 enigmail-1.1.2.tar.gz +0bbacea54b4b8fc4ff20e73b3278c1ba thunderbird-5.0.source.tar.bz2 +f8ba15164adc1c0e8328582146461aec enigmail-1.2.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thunderbird-enigmail.spec 22 Jul 2010 07:08:48 -0000 1.9 +++ thunderbird-enigmail.spec 17 Jul 2011 20:43:47 -0000 1.10 @@ -1,12 +1,13 @@ -%global nspr_version 4.8 -%global nss_version 3.12.3.99 -%global cairo_version 1.8.8 -%global freetype_version 2.1.9 -%global sqlite_version 3.6.22 -%global libnotify_version 0.4 -%global moz_objdir objdir-tb +%define nspr_version 4.8 +%define nss_version 3.12.8 +%define cairo_version 1.8.8 +%define freetype_version 2.1.9 +%define sqlite_version 3.6.14 +%define libnotify_version 0.4 +%define build_langpacks 1 +%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} -%global thunver 3.1.1 +%global thunver 5.0 # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. @@ -14,18 +15,18 @@ # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' #%define tarballdir . -%global tarballdir comm-1.9.2 +%define tarballdir comm-miramar -%global official_branding 1 +%define official_branding 1 -%global version_internal 3.1 -%global mozappdir %{_libdir}/thunderbird-%{version_internal} +%define version_internal 5.0 +%define mozappdir %{_libdir}/thunderbird-%{version_internal} %global enigmail_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5} Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.1.2 +Version: 1.2 %if 0%{?prever:1} Release: 0.1.%{prever}%{?dist} %else @@ -51,22 +52,16 @@ %endif # http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html -Source101: enigmail-fixlang.php +Source101: enigmail-fixlang.php + -# Fix for version issues Patch0: thunderbird-version.patch -# Fix for jemalloc -Patch1: mozilla-jemalloc.patch -# Fix for installation fail when building with dynamic linked libraries -Patch2: thunderbird-shared-error.patch -# Fixes gcc complain that nsFrame::delete is protected -Patch4: xulrunner-1.9.2.1-build.patch -# Fix missing includes for crash reporter, remove in 3.1 final -Patch5: xulrunner-missing-headers.patch -Patch6: remove-static.patch +Patch6: mozilla-build-s390.patch +Patch7: crashreporter-remove-static.patch # Enigmail patch -Patch101: enigmail-1.1.2-perm.patch +Patch100: enigmail-rdf.patch + %if %{official_branding} # Required by Mozilla Corporation @@ -102,6 +97,9 @@ BuildRequires: alsa-lib-devel BuildRequires: autoconf213 BuildRequires: desktop-file-utils +BuildRequires: libcurl-devel +BuildRequires: yasm +BuildRequires: mesa-libGL-devel BuildRequires: GConf2-devel @@ -115,7 +113,7 @@ # because provided by xulrunner). AutoReq: 0 # All others deps already required by thunderbird -Requires: gnupg, thunderbird >= %{version_internal} +Requires: gnupg, thunderbird >= %{thunver} # Nothing usefull provided AutoProv: 0 @@ -136,11 +134,13 @@ %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch -%patch1 -p0 -b .jemalloc -%patch2 -p1 -b .shared-error -%patch4 -p1 -b .protected -%patch5 -p0 -b .stat -%patch6 -p1 -b .static +# Mozilla (XULRunner) patches +cd mozilla +%ifarch s390 +%patch6 -p1 -b .s390 +%endif +%patch7 -p2 -b .static +cd .. %if %{official_branding} # Required by Mozilla Corporation @@ -158,11 +158,19 @@ %endif # ===== Enigmail work ===== -# ===== Fixing langpack %if 0%{?CVS} mkdir mailnews/extensions/enigmail tar xzf %{SOURCE100} -C mailnews/extensions/enigmail +%else +tar xzf %{SOURCE100} -C mailnews/extensions +pushd mailnews/extensions/enigmail +# Apply Enigmail patch here +%patch100 -p1 -b .orig +popd +%endif + +# ===== Fixing langpack pushd mailnews/extensions/enigmail for rep in $(cat lang/current-languages.txt) do @@ -171,12 +179,6 @@ php %{SOURCE101} ui/locale/en-US lang/$rep done popd -%else -tar xzf %{SOURCE100} -C mailnews/extensions -pushd mailnews/extensions/enigmail -%patch101 -p1 -popd -%endif #=============================================================================== @@ -186,11 +188,18 @@ INTERNAL_GECKO=%{version_internal} MOZ_APP_DIR=%{mozappdir} -# Build with -Os as it helps the browser; also, don't override mozilla's warning -# level; they use -Wall but disable a few warnings that show up _everywhere_ -MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//') +# -fpermissive is needed to build with gcc 4.6+ which has become stricter +# +# Mozilla builds with -Wall with exception of a few warnings which show up +# everywhere in the code; so, don't override that. +# +# Disable C++ exceptions since Mozilla code is not exception-safe +# +MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ + %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') +export CFLAGS=$MOZ_OPT_FLAGS +export CXXFLAGS=$MOZ_OPT_FLAGS -export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS export PREFIX='%{_prefix}' export LIBDIR='%{_libdir}' @@ -204,25 +213,21 @@ export LDFLAGS="-Wl,-rpath,%{mozappdir}" export MAKE="gmake %{moz_make_flags}" -# ===== Minimal build ===== -make -f client.mk export -pushd %{moz_objdir}/mozilla/modules/libreg -make -cd ../../xpcom/string -make -cd .. -make -cd obsolete -make -popd +# ===== Thunderbird build ===== +# http://enigmail.mozdev.org/download/source.php.html +make -f client.mk build # ===== Enigmail work ===== pushd mailnews/extensions/enigmail ./makemake -r +make popd -pushd %{moz_objdir}/mailnews/extensions/enigmail -make +pushd mozilla/dist/bin/chrome/enigmail +zip ../enigmail.jar -r content locale skin +popd + +pushd mailnews/extensions/enigmail make xpi popd @@ -235,7 +240,7 @@ %{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname} -%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} +%{__unzip} -q mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname} %{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh @@ -251,6 +256,9 @@ #=============================================================================== %changelog +* Sun Jul 17 2011 Remi Collet <remi(a)fedoraproject.org&gt; 1.2-1 +- Enigmail 1.2 for Thunderbird 5.0 + * Thu Jul 22 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.1.2-1 - Enigmail 1.1.2 (against thunderbird 3.1.1) - move to /usr/lib/mozilla/extensions (as lightning) Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thunderbird-mozconfig 26 Jun 2010 08:09:53 -0000 1.4 +++ thunderbird-mozconfig 17 Jul 2011 20:43:47 -0000 1.5 @@ -1,6 +1,6 @@ mk_add_options MOZ_CO_PROJECT=mail ac_add_options --enable-application=mail -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@ mk_add_options AUTOCONF=autoconf-2.13 #ac_add_options --with-system-png @@ -15,7 +15,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-installer -ac_add_options --enable-optimize="$RPM_OPT_FLAGS" +ac_add_options --enable-optimize ac_add_options --enable-xinerama ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --disable-xprint @@ -28,6 +28,9 @@ ac_add_options --enable-system-hunspell ac_add_options --disable-crashreporter ac_add_options --disable-necko-wifi +ac_add_options --disable-updater +#ac_add_options --enable-static +ac_add_options --enable-startup-notification export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 --- enigmail-1.1.2-perm.patch DELETED --- --- mozilla-jemalloc.patch DELETED --- --- remove-static.patch DELETED --- --- thunderbird-shared-error.patch DELETED --- --- xulrunner-1.9.2.1-build.patch DELETED --- --- xulrunner-missing-headers.patch DELETED ---