diff --git a/crashreporter-remove-static.patch b/crashreporter-remove-static.patch index 9cc94fb..330ab1a 100644 --- a/crashreporter-remove-static.patch +++ b/crashreporter-remove-static.patch @@ -1,3 +1,5 @@ +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 diff --git a/thunderbird-shared-error.patch b/thunderbird-shared-error.patch index 2869fd8..5673228 100644 --- a/thunderbird-shared-error.patch +++ b/thunderbird-shared-error.patch @@ -1,3 +1,5 @@ +Our build ends up in this path and fails otherwise... + diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in --- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 +++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 diff --git a/thunderbird.spec b/thunderbird.spec index 9eeb38a..4c404e3 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -46,38 +46,24 @@ Group: Applications/Internet %endif Source0: %{tarball} %if %{build_langpacks} -# Language package archive is build by RH Source1: thunderbird-langpacks-%{version}-20101209.tar.bz2 %endif -# Config file for compilation Source10: thunderbird-mozconfig -# Config file for branded compilation Source11: thunderbird-mozconfig-branded -# Default preferences for Thunderbird Source12: thunderbird-redhat-default-prefs.js -# Config file for debug builds Source13: thunderbird-mozconfig-debuginfo -# Desktop file Source20: thunderbird.desktop -# TB execute script Source21: thunderbird.sh.in -# Script called when user click on link in message Source30: thunderbird-open-browser.sh -# Finds requirements provided outside of the current file set Source100: find-external-requires -# 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 Patch6: mozilla-libjpeg-turbo.patch Patch7: mozilla-missing-cflags.patch Patch8: mozilla-build-s390.patch -# Remove static build option from crashreporter to remove dependency on static libraries Patch9: crashreporter-remove-static.patch Patch10: mozilla-notify.patch diff --git a/xulrunner-1.9.2.1-build.patch b/xulrunner-1.9.2.1-build.patch index 4d9ee43..1d32a0c 100644 --- a/xulrunner-1.9.2.1-build.patch +++ b/xulrunner-1.9.2.1-build.patch @@ -1,3 +1,7 @@ +XXX FIXME +GCC complains that nsFrame::delete is protected +..but this really needs to get solved a better way... + diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h --- xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h.old 2009-11-11 15:34:51.000000000 +0100 +++ xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h 2009-11-11 15:33:09.000000000 +0100