From 6d0511395133d85395c786ee650e9840845b87ce Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 14 May 2014 15:22:48 +0200 Subject: [PATCH] - updated to 24.5.0, sync with icedove --- mozilla-thunderbird-crashreporter.patch | 10 -- mozilla-thunderbird-enable-addons.patch | 46 +++++ mozilla-thunderbird-gyp-slashism.patch | 9 - mozilla-thunderbird-hunspell.patch | 10 -- mozilla-thunderbird-install.patch | 98 ---------- mozilla-thunderbird-sh.patch | 12 ++ mozilla-thunderbird-system-cairo.patch | 44 ----- mozilla-thunderbird-system-mozldap.patch | 34 +++- mozilla-thunderbird-system-virtualenv.patch | 36 ++-- mozilla-thunderbird.spec | 188 +++++++------------- 10 files changed, 164 insertions(+), 323 deletions(-) delete mode 100644 mozilla-thunderbird-crashreporter.patch create mode 100644 mozilla-thunderbird-enable-addons.patch delete mode 100644 mozilla-thunderbird-hunspell.patch delete mode 100644 mozilla-thunderbird-install.patch create mode 100644 mozilla-thunderbird-sh.patch delete mode 100644 mozilla-thunderbird-system-cairo.patch diff --git a/mozilla-thunderbird-crashreporter.patch b/mozilla-thunderbird-crashreporter.patch deleted file mode 100644 index df44594..0000000 --- a/mozilla-thunderbird-crashreporter.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- icedove-3.1.2/mozilla/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc~ 2010-08-03 02:28:30.000000000 +0300 -+++ icedove-3.1.2/mozilla/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc 2010-08-17 18:39:51.092556800 +0300 -@@ -43,6 +43,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/mozilla-thunderbird-enable-addons.patch b/mozilla-thunderbird-enable-addons.patch new file mode 100644 index 0000000..daff8d1 --- /dev/null +++ b/mozilla-thunderbird-enable-addons.patch @@ -0,0 +1,46 @@ +--- comm-release/mail/app/profile/all-thunderbird.js.old 2011-11-21 11:20:08.000000000 +0100 ++++ comm-release/mail/app/profile/all-thunderbird.js 2011-12-14 12:40:24.074179826 +0100 +@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul + // Disable add-ons installed into the shared user and shared system areas by + // default. This does not include the application directory. See the SCOPE + // constants in AddonManager.jsm for values to use here +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 0); + + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); +--- comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2011-11-21 11:28:32.000000000 +0100 ++++ comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm 2011-12-14 12:43:42.461184351 +0100 +@@ -1591,8 +1591,8 @@ var XPIProvider = { + this.showUpgradeUI(); + flushCaches = true; + } +- else if (aAppChanged === undefined) { +- // For new profiles we will never need to show the add-on selection UI ++ else { ++ // For all profiles we will never need to show the add-on selection UI + Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); + } + +--- comm-release/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100 ++++ comm-release/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100 +@@ -616,7 +616,7 @@ + // Disable add-ons installed into the shared user and shared system areas by + // default. This does not include the application directory. See the SCOPE + // constants in AddonManager.jsm for values to use here. +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 0); + + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations +--- comm-release/mozilla/browser/app/profile/firefox.js~ 2013-10-29 02:20:40.000000000 +0100 ++++ comm-release/mozilla/browser/app/profile/firefox.js 2013-11-06 20:56:58.633092070 +0100 +@@ -62,7 +62,7 @@ + + // Disable add-ons that are not installed by the user in all scopes by default. + // See the SCOPE constants in AddonManager.jsm for values to use here. +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 0); + + // Dictionary download preference + pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); diff --git a/mozilla-thunderbird-gyp-slashism.patch b/mozilla-thunderbird-gyp-slashism.patch index ccab456..5100011 100644 --- a/mozilla-thunderbird-gyp-slashism.patch +++ b/mozilla-thunderbird-gyp-slashism.patch @@ -34,15 +34,6 @@ if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth): # If WriteTargetMakefile returns True, then this is a useful target dirs.append(rel_path) -@@ -376,7 +382,7 @@ - WriteMakefile(output_file, data, build_file, depth, top, - # we set srcdir up one directory, since the subdir - # doesn't actually exist in the source directory -- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])), -+ swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])), - self.relative_srcdir) - return True - @@ -399,7 +405,7 @@ # The relative path from objdir to gyp_file_dir srcdir = gyp.common.RelativePath(gyp_file_dir, objdir) diff --git a/mozilla-thunderbird-hunspell.patch b/mozilla-thunderbird-hunspell.patch deleted file mode 100644 index 78fc001..0000000 --- a/mozilla-thunderbird-hunspell.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/mail/app/Makefile.in -+++ b/mail/app/Makefile.in -@@ -133,6 +133,7 @@ LIBS += \ - $(APP_XPCOM_LIBS) \ - $(NSPR_LIBS) \ - $(TK_LIBS) \ -+ $(MOZ_HUNSPELL_LIBS) \ - $(NULL) - - # Add explicit X11 dependency when building against X11 toolkits diff --git a/mozilla-thunderbird-install.patch b/mozilla-thunderbird-install.patch deleted file mode 100644 index e819c9c..0000000 --- a/mozilla-thunderbird-install.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- mozilla/mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-03-13 03:43:47.000000000 +0100 -+++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk 2012-03-24 21:50:54.171788606 +0100 -@@ -708,41 +708,41 @@ - endif - - stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack -- @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) -+ @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST) - ifndef MOZ_FAST_PACKAGE -- @rm -rf $(DIST)/$(MOZ_PKG_DIR) -+ @rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) - endif - # NOTE: this must be a tar now that dist links into the tree so that we - # do not strip the binaries actually in the tree. - @echo "Creating package directory..." -- if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \ -- mkdir $(DIST)/$(MOZ_PKG_DIR); \ -+ if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \ -+ mkdir $(DESTDIR)/$(MOZ_PKG_DIR); \ - fi - ifndef UNIVERSAL_BINARY - # If UNIVERSAL_BINARY, the package will be made from an already-prepared - # STAGEPATH - ifdef MOZ_PKG_MANIFEST - ifndef MOZ_FAST_PACKAGE - $(RM) -rf $(DIST)/xpt $(DIST)/manifests - endif - $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\ -- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \ -+ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \ - "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1) -- $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" -+ $(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \ - $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST)) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \ - $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST)) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \ -- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ -+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \ - $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST)) - ifdef MOZ_WEBAPP_RUNTIME -- mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest -- sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest -+ mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest -+ sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest - endif -- printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest -+ printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest - else # !MOZ_PKG_MANIFEST - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) - ifndef STAGE_SDK -@@ -741,10 +741,10 @@ - @$(NSINSTALL) -D $(DIST)/xpt - @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing... - else -- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) -+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) - endif - else -- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -) -+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_DIR) - @echo "Linking XPT files..." - @rm -rf $(DIST)/xpt - @$(NSINSTALL) -D $(DIST)/xpt -@@ -801,7 +801,7 @@ - endif # DMG - endif # MOZ_PKG_MANIFEST - endif # UNIVERSAL_BINARY -- $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome -+ $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DESTDIR)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome - ifndef PKG_SKIP_STRIP - ifeq ($(OS_ARCH),OS2) - @echo "Stripping package directory..." -@@ -830,7 +830,7 @@ - cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR) - endif - $(NSINSTALL) -D $(DESTDIR)$(installdir) -- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ -+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(installdir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(bindir) - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) ---- comm-1.9.1/mail/app/Makefile.in.orig 2009-12-18 14:49:43.990647725 +0100 -+++ comm-1.9.1/mail/app/Makefile.in 2009-12-18 14:49:53.830739781 +0100 -@@ -48,7 +48,7 @@ - DEFINES += \ - -DAB_CD=$(AB_CD) \ - -DAPP_VERSION="$(MOZ_APP_VERSION)" \ -- -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \ -+ -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \ - -DGRE_MILESTONE=$(GRE_MILESTONE) \ - -DGRE_BUILDID=$(GRE_BUILDID) \ - $(NULL) diff --git a/mozilla-thunderbird-sh.patch b/mozilla-thunderbird-sh.patch new file mode 100644 index 0000000..5666d73 --- /dev/null +++ b/mozilla-thunderbird-sh.patch @@ -0,0 +1,12 @@ +--- mozilla/configure.orig 2014-04-24 18:27:27.000000000 +0200 ++++ mozilla/configure 2014-05-11 15:43:20.989605097 +0200 +@@ -1091,9 +1091,6 @@ + files = [ + EOF + +-for out in ; do +- echo " '$out'," >> $CONFIG_STATUS +-done + + cat >> $CONFIG_STATUS <<\EOF + ] diff --git a/mozilla-thunderbird-system-cairo.patch b/mozilla-thunderbird-system-cairo.patch deleted file mode 100644 index d395822..0000000 --- a/mozilla-thunderbird-system-cairo.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp ---- a/mozilla/gfx/thebes/gfxPlatform.cpp Sun Mar 04 00:38:41 2012 +0000 -+++ b/mozilla/gfx/thebes/gfxPlatform.cpp Wed May 16 17:37:10 2012 +0200 -@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface( - - cairo_user_data_key_t kSourceSurface; - - void SourceBufferDestroy(void *srcBuffer) - { - static_cast(srcBuffer)->Release(); - } - --void SourceSnapshotDetached(cairo_surface_t *nullSurf) -+void SourceSnapshotDetached(void *nullSurf) - { -- gfxImageSurface* origSurf = -- static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); -- -+ gfxImageSurface *origSurf = static_cast(nullSurf); - origSurf->SetData(&kSourceSurface, NULL, NULL); - } - - RefPtr - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) - { - void *userData = aSurface->GetData(&kSourceSurface); - -@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface( - - } - -- cairo_surface_t *nullSurf = -- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); -- cairo_surface_set_user_data(nullSurf, -- &kSourceSurface, -- imgSurface, -- NULL); -- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); -- cairo_surface_destroy(nullSurf); -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", -+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get()); - } - - srcBuffer->AddRef(); diff --git a/mozilla-thunderbird-system-mozldap.patch b/mozilla-thunderbird-system-mozldap.patch index 74a57b3..3fe1c4e 100644 --- a/mozilla-thunderbird-system-mozldap.patch +++ b/mozilla-thunderbird-system-mozldap.patch @@ -1,8 +1,8 @@ --- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 +++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200 -@@ -5032,6 +5032,13 @@ - MOZ_LDAP_XPCOM=, - MOZ_LDAP_XPCOM=1) +@@ -134,6 +134,13 @@ + AC_MSG_RESULT([no]) + fi +dnl system LDAP Support +dnl ======================================================== @@ -14,12 +14,28 @@ dnl ======================================================== dnl = Trademarked Branding dnl ======================================================== -@@ -7612,7 +7619,7 @@ +--- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200 ++++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200 +@@ -59,7 +59,12 @@ + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) + +-if test "$MOZ_LDAP_XPCOM"; then ++if test "$MOZ_LDAP_DIR" ; then ++ LDAP_CFLAGS=$(pkg-config --cflags mozldap) ++ LDAP_LIBS=$(pkg-config --libs mozldap) ++ LDAP_COMPONENT=mozldap ++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)" ++elif test "$MOZ_LDAP_XPCOM"; then + MOZ_ARG_ENABLE_BOOL(incomplete-toolkit-ldap-autocomplete, + [ --enable-incomplete-toolkit-ldap-autocomplete Builds a JavaScript component that implements an LDAP autocomplete component using the toolkit interfaces rather than the C++ component using the obsolete XPFE interfaces. ], + MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE=1, +@@ -118,7 +130,7 @@ - # if we're building the LDAP XPCOM component, we need to build - # the c-sdk first. + # if we're building the LDAP XPCOM component, we need to build + # the c-sdk first. -if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then +if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then - # these subdirs may not yet have been created in the build tree. - # don't use the "-p" switch to mkdir, since not all platforms have it - if test ! -d "directory/c-sdk/ldap"; then + # Save configure args so we can restore them after configuring LDAP. + _save_ac_configure_args="$ac_configure_args" + ac_configure_args="$_SUBDIR_CONFIG_ARGS" diff --git a/mozilla-thunderbird-system-virtualenv.patch b/mozilla-thunderbird-system-virtualenv.patch index a69cd1a..a2d150f 100644 --- a/mozilla-thunderbird-system-virtualenv.patch +++ b/mozilla-thunderbird-system-virtualenv.patch @@ -1,24 +1,12 @@ -Restore --system-site-packages when system virtualenv gets 1.7 upgrade - ---- xulrunner-15.0/mozilla/configure.in~ 2012-08-29 11:06:34.517985819 +0200 -+++ xulrunner-15.0/mozilla/configure.in 2012-08-29 11:23:47.234616054 +0200 -@@ -9069,7 +9069,7 @@ - AC_MSG_RESULT([Creating Python virtualenv]) - rm -rf _virtualenv - mkdir -p _virtualenv --MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv -+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv - case "$host_os" in - mingw*) - PYTHON=`pwd`/_virtualenv/Scripts/python.exe ---- xulrunner-15.0/mozilla/configure~ 2012-08-29 11:25:28.121279162 +0200 -+++ xulrunner-15.0/mozilla/configure 2012-08-29 11:27:27.981274936 +0200 -@@ -25468,7 +25468,7 @@ - echo "$ac_t""Creating Python virtualenv" 1>&6 - rm -rf _virtualenv - mkdir -p _virtualenv --MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv -+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv - case "$host_os" in - mingw*) - PYTHON=`pwd`/_virtualenv/Scripts/python.exe +--- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 ++++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py 2013-05-14 22:51:32.136719267 +0200 +@@ -37,8 +37,7 @@ + @property + def virtualenv_script_path(self): + """Path to virtualenv's own populator script.""" +- return os.path.join(self.topsrcdir, 'python', 'virtualenv', +- 'virtualenv.py') ++ return '/usr/bin/virtualenv' + + @property + def python_path(self): diff --git a/mozilla-thunderbird.spec b/mozilla-thunderbird.spec index 04505d2..87bb628 100644 --- a/mozilla-thunderbird.spec +++ b/mozilla-thunderbird.spec @@ -6,26 +6,21 @@ # # Conditional builds %bcond_without enigmail # don't build enigmail - GPG/PGP support -%bcond_without gnomeui # disable gnomeui support -%bcond_without gnome # alias for gnomeui +%bcond_with gtk3 # GTK+ 3.x instead of 2.x %bcond_without ldap # disable e-mail address lookups in LDAP directories %bcond_without lightning # disable Sunbird/Lightning calendar %bcond_with xulrunner # system xulrunner %bcond_with crashreporter # report crashes to crash-stats.mozilla.com -%if %{without gnome} -%undefine with_gnomeui -%endif - %if 0%{?_enable_debug_packages} != 1 %undefine crashreporter %endif -%define enigmail_ver 1.5.1 -%define nspr_ver 4.9.3 -%define nss_ver 3.14.1 +%define enigmail_ver 1.6 +%define nspr_ver 4.10.2 +%define nss_ver 3.15.4 -%define xulrunner_ver 2:17.0 +%define xulrunner_ver 2:24.0 %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): @@ -35,30 +30,28 @@ Summary: Thunderbird Community Edition - email client Summary(pl.UTF-8): Thunderbird Community Edition - klient poczty Name: mozilla-thunderbird -Version: 17.0.3 +Version: 24.5.0 Release: 1 -License: MPL 1.1 or GPL v2+ or LGPL v2.1+ -Group: X11/Applications/Networking +License: MPL v2.0 +Group: X11/Applications/Mail Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 -# Source0-md5: 180f7768f6419182ea78eeb80da7f588 +# Source0-md5: dbe164c48e42c04b4959910eda2e52ca Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz -# Source1-md5: 3e71f84ed2c11471282412ebe4f5eb2d +# Source1-md5: 4a2bbcb020bdb282a660fda8c70d5608 Source2: %{name}.png Source4: %{name}.desktop Source5: %{name}.sh Patch1: %{name}-enigmail-shared.patch +Patch2: %{name}-sh.patch Patch3: %{name}-fonts.patch -Patch4: %{name}-install.patch -Patch5: %{name}-hunspell.patch Patch6: %{name}-prefs.patch Patch7: %{name}-system-mozldap.patch Patch8: %{name}-makefile.patch -Patch9: %{name}-system-cairo.patch -Patch11: %{name}-crashreporter.patch Patch12: %{name}-no-subshell.patch # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade Patch13: %{name}-system-virtualenv.patch Patch14: %{name}-gyp-slashism.patch +Patch15: %{name}-enable-addons.patch URL: http://www.mozilla.org/projects/thunderbird/ BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: alsa-lib-devel @@ -68,28 +61,31 @@ BuildRequires: cairo-devel >= 1.10 BuildRequires: dbus-glib-devel >= 0.60 BuildRequires: freetype-devel >= 1:2.1.8 BuildRequires: glib2-devel >= 2.0 -BuildRequires: gtk+2-devel >= 2:2.10.0 +BuildRequires: gstreamer0.10-devel +BuildRequires: gstreamer0.10-plugins-base-devel +%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.14} +%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0} BuildRequires: hunspell-devel BuildRequires: libIDL-devel >= 0.8.0 -%{?with_gnomeui:BuildRequires: libgnome-devel >= 2.0} -%{?with_gnomeui:BuildRequires: libgnome-keyring-devel} -%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0} +BuildRequires: libevent-devel BuildRequires: libiw-devel # requires libjpeg-turbo implementing at least libjpeg 6b API BuildRequires: libjpeg-devel >= 6b BuildRequires: libjpeg-turbo-devel -BuildRequires: libnotify-devel >= 0.4 BuildRequires: libpng-devel >= 1.4.1 BuildRequires: libstdc++-devel +BuildRequires: mozldap-devel BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} BuildRequires: pango-devel >= 1:1.14.0 BuildRequires: perl-base >= 1:5.6 +BuildRequires: python-virtualenv BuildRequires: pkgconfig BuildRequires: python >= 1:2.5 BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.7.4 +BuildRequires: sqlite3-devel >= 3.7.17 BuildRequires: startup-notification-devel >= 0.8 +BuildRequires: libvpx-devel >= 1.0.0 BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXt-devel @@ -97,8 +93,10 @@ BuildRequires: yasm BuildRequires: zip %if %{with xulrunner} BuildRequires: xulrunner-devel >= %{xulrunner_ver} -BuildRequires: xulrunner-devel < 2:18 +BuildRequires: xulrunner-devel < 2:25 %else +%{!?with_gtk3:Requires: gtk+2 >= 2:2.14} +%{?with_gtk3:Requires: gtk+3 >= 3.0.0} Requires: myspell-common Requires: nspr >= 1:%{nspr_ver} Requires: nss >= 1:%{nss_ver} @@ -153,7 +151,7 @@ dodające funkcjonalność kalendarza. %package addon-enigmail Summary: Extension for the authentication and encryption features provided by GnuPG Summary(pl.UTF-8): Rozszerzenie do uwierzytelniania i szyfrowania zapewnianego przez GnuPG -License: MPL/LGPL +License: MPL v1.1 or GPL v2+ or LGPL v2.1+ Group: Applications/Networking URL: http://enigmail.mozdev.org/ Requires: %{name} = %{version}-%{release} @@ -187,21 +185,20 @@ Główne możliwości: - interfejs do zarządzania kluczami OpenPGP %prep -%setup -q -c -mv comm-esr17 mozilla +%setup -qc +mv comm-esr24 mozilla cd mozilla %{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} xf - -C mailnews/extensions} %{?with_enigmail:%patch1 -p1} +%patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p2 -%patch9 -p1 -%patch11 -p2 %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build cd mozilla @@ -252,71 +249,68 @@ ac_add_options --enable-tests %else ac_add_options --disable-tests %endif -ac_add_options --enable-gio -%if %{with gnomeui} -ac_add_options --enable-gnomeui -%else -ac_add_options --disable-gnomeui -%endif -ac_add_options --disable-gnomevfs -%if %{with ldap} -ac_add_options --enable-ldap -ac_add_options --with-system-ldap +%if %{with lightning} +ac_add_options --enable-calendar %else -ac_add_options --disable-ldap +ac_add_options --disable-calendar %endif %if %{with crashreporter} ac_add_options --enable-crashreporter %else ac_add_options --disable-crashreporter %endif -ac_add_options --disable-xterm-updates -ac_add_options --enable-postscript -%if %{with lightning} -ac_add_options --enable-calendar -%else -ac_add_options --disable-calendar -%endif +ac_add_options --disable-elf-dynstr-gc +ac_add_options --disable-gnomeui +ac_add_options --disable-gnomevfs ac_add_options --disable-installer +ac_add_options --disable-javaxpcom +ac_add_options --disable-profilesharing ac_add_options --disable-updater -ac_add_options --disable-xprint -ac_add_options --disable-permissions -ac_add_options --disable-pref-extensions -ac_add_options --enable-canvas +ac_add_options --disable-xterm-updates +ac_add_options --enable-application=mail ac_add_options --enable-crypto -ac_add_options --enable-mathml +ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2} +ac_add_options --enable-gio +%if %{with ldap} +ac_add_options --enable-ldap +ac_add_options --with-system-ldap +%else +ac_add_options --disable-ldap +%endif +ac_add_options --enable-libxul ac_add_options --enable-pango -ac_add_options --enable-reorder +ac_add_options --enable-postscript +ac_add_options --enable-shared-js +ac_add_options --enable-single-profile ac_add_options --enable-startup-notification -ac_add_options --enable-svg ac_add_options --enable-system-cairo ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite -ac_add_options --enable-xft -ac_add_options --enable-application=mail -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-xinerama +ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} ac_add_options --with-distribution-id=org.pld-linux %if %{with xulrunner} -ac_add_options --enable-shared-js ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul) ac_add_options --with-system-libxul %endif ac_add_options --with-pthreads ac_add_options --with-system-bz2 +ac_add_options --with-system-ffi ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-png ac_add_options --with-system-zlib -ac_add_options --enable-single-profile -ac_add_options --disable-profilesharing -ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} EOF +mkdir -p %{objdir}/config +ln -s %{topdir}/mozilla/config/*.mk %{objdir}/config + %{__make} -j1 -f client.mk build \ STRIP="/bin/true" \ MOZ_MAKE_FLAGS="%{?_smp_mflags}" \ + installdir=%{_libdir}/%{name} \ XLIBS="-lX11 -lXt" \ CC="%{__cc}" \ CXX="%{__cxx}" @@ -329,12 +323,12 @@ EOF %if %{with enigmail} cd mailnews/extensions/enigmail ./makemake -r -o %{objdir} -%{__make} -C %{objdir}/mailnews/extensions/enigmail \ +%{__make} -j1 -C %{objdir}/mailnews/extensions/enigmail \ STRIP="/bin/true" \ CC="%{__cc}" \ CXX="%{__cxx}" -%{__make} -C %{objdir}/mailnews/extensions/enigmail xpi \ +%{__make} -j1 -C %{objdir}/mailnews/extensions/enigmail xpi \ STRIP="/bin/true" \ CC="%{__cc}" \ CXX="%{__cxx}" @@ -347,9 +341,11 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_ cd %{objdir} %{__make} -C mail/installer stage-package \ DESTDIR=$RPM_BUILD_ROOT \ - MOZ_PKG_DIR=%{_libdir}/%{name} \ + installdir=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 +cp -a mozilla/dist/thunderbird/* $RPM_BUILD_ROOT%{_libdir}/%{name}/ + %if %{with xulrunner} # needed to find mozilla runtime ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner @@ -365,25 +361,12 @@ cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $R %endif # copy manually lightning files, somewhy they are not installed by make -cp -a mozilla/dist/bin/extensions/calendar-timezones@mozilla.org \ - mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ +cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions # move arch independant ones to datadir -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins -ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome -ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults -ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp -ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins -%if %{without xulrunner} -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res -ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res -%endif # dir for arch independant extensions besides arch dependant extensions # see mozilla/xpcom/build/nsXULAppAPI.h @@ -393,8 +376,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions %if %{without xulrunner} %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries -%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation -ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation %endif %{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird @@ -425,7 +406,6 @@ install -d $ext_dir/{chrome,components,defaults/preferences,modules} cd mozilla/dist/bin cp -rfLp chrome/enigmail.jar $ext_dir/chrome cp -rfLp components/enig* $ext_dir/components -cp -rfLp components/libenigmime.so $ext_dir/components cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences cp -rfLp modules/{commonFuncs,enigmailCommon,keyManagement,pipeConsole,subprocess}.jsm $ext_dir/modules cp -rfLp modules/{subprocess_worker_unix,subprocess_worker_win}.js $ext_dir/modules @@ -434,15 +414,9 @@ cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/install.rdf $ext_di cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest %endif -# never package these. always remove -# nss -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* -# nspr -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so # mozldap -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so -# testpilot quiz -%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi +%{__sed} -i '/lib\(ldap\|ldif\|prldap\)60.so/d' $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so %clean rm -rf $RPM_BUILD_ROOT @@ -471,21 +445,18 @@ exit 0 %{_libdir}/%{name}/blocklist.xml %{_libdir}/%{name}/chrome.manifest %dir %{_libdir}/%{name}/components -%{_libdir}/%{name}/components/*.js -%{_libdir}/%{name}/components/*.xpt %{_libdir}/%{name}/components/components.manifest -%{_libdir}/%{name}/components/interfaces.manifest %attr(755,root,root) %{_libdir}/%{name}/*.sh %attr(755,root,root) %{_libdir}/%{name}/*-bin %attr(755,root,root) %{_libdir}/%{name}/thunderbird %attr(755,root,root) %{_libdir}/%{name}/register +%{_libdir}/%{name}/omni.ja %if %{without xulrunner} %{_libdir}/%{name}/dependentlibs.list %{_libdir}/%{name}/platform.ini -%{_libdir}/%{name}/greprefs.js %attr(755,root,root) %{_libdir}/%{name}/components/*.so %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so -%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so +%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so %attr(755,root,root) %{_libdir}/%{name}/libxul.so %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client %attr(755,root,root) %{_libdir}/%{name}/plugin-container @@ -495,38 +466,19 @@ exit 0 %{_libdir}/%{name}/chrome %{_libdir}/%{name}/defaults %{_libdir}/%{name}/isp -%{_libdir}/%{name}/modules %{_libdir}/%{name}/searchplugins %if %{with xulrunner} %{_libdir}/%{name}/xulrunner %else %{_libdir}/%{name}/dictionaries -%{_libdir}/%{name}/hyphenation -%{_libdir}/%{name}/res %endif %{_pixmapsdir}/mozilla-thunderbird.png %{_desktopdir}/mozilla-thunderbird.desktop %dir %{_datadir}/%{name} -%{_datadir}/%{name}/chrome -%{_datadir}/%{name}/defaults %{_datadir}/%{name}/extensions -%{_datadir}/%{name}/isp -%{_datadir}/%{name}/modules -%if %{with enigmail} -%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm -%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm -%exclude %{_datadir}/%{name}/modules/keyManagement.jsm -%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm -%exclude %{_datadir}/%{name}/modules/subprocess.jsm -%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js -%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js -%endif %{_datadir}/%{name}/searchplugins -%if %{without xulrunner} -%{_datadir}/%{name}/res -%endif %if %{with crashreporter} %attr(755,root,root) %{_libdir}/%{name}/crashreporter @@ -558,7 +510,6 @@ exit 0 %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite -%{_libdir}/%{name}/extensions/calendar-timezones@mozilla.org %endif %if %{with enigmail} @@ -570,7 +521,6 @@ exit 0 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf %dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components -%attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js %dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules -- 2.44.0