[seamonkey/f15] Update to SeaMonkey 2.3
Kai Engert
kengert at fedoraproject.org
Sun Aug 21 17:50:10 UTC 2011
commit 1dde8fe83145e0dd0279f5b1b4092bc7a7d39582
Author: Kai Engert <kaie at redhat.com>
Date: Sun Aug 21 19:49:14 2011 +0200
Update to SeaMonkey 2.3
.gitignore | 2 +
cstddef.patch | 18 -----
mozilla-191-path.patch | 162 -------------------------------------------
mozilla-23-path.patch | 150 +++++++++++++++++++++++++++++++++++++++
mozilla-comodo-646460.patch | 24 -------
seamonkey-mozconfig | 22 ++++--
seamonkey.spec | 106 ++++++++++++++--------------
sources | 4 +-
8 files changed, 220 insertions(+), 268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbae4ae..81844be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.0.13-20110409.tar.xz
/seamonkey-2.0.14.source.tar.bz2
/seamonkey-langpacks-2.0.14-20110429.tar.xz
+/seamonkey-2.3.source.tar.bz2
+/seamonkey-langpacks-2.3-20110820.tar.xz
diff --git a/mozilla-23-path.patch b/mozilla-23-path.patch
new file mode 100644
index 0000000..976d8bc
--- /dev/null
+++ b/mozilla-23-path.patch
@@ -0,0 +1,150 @@
+diff -up ./mozilla/config/pathsub.h.path ./mozilla/config/pathsub.h
+--- ./mozilla/config/pathsub.h.path 2011-08-20 15:18:11.249950156 +0200
++++ ./mozilla/config/pathsub.h 2011-08-20 15:20:25.212730253 +0200
+@@ -46,7 +46,7 @@
+ #include <sys/types.h>
+
+ #ifndef PATH_MAX
+-#define PATH_MAX 1024
++#error "PATH_MAX is not defined!"
+ #endif
+
+ /*
+diff -up ./mozilla/dbm/include/mcom_db.h.path ./mozilla/dbm/include/mcom_db.h
+--- ./mozilla/dbm/include/mcom_db.h.path 2011-08-20 15:18:11.236950273 +0200
++++ ./mozilla/dbm/include/mcom_db.h 2011-08-20 15:20:25.203730334 +0200
+@@ -175,7 +175,8 @@
+ #endif /* __DBINTERFACE_PRIVATE */
+
+ #ifdef SCO
+-#define MAXPATHLEN 1024
++#include <limits.h>
++#define MAXPATHLEN PATH_MAX
+ #endif
+
+ #include <fcntl.h>
+diff -up ./mozilla/modules/libjar/nsZipArchive.cpp.path ./mozilla/modules/libjar/nsZipArchive.cpp
+--- ./mozilla/modules/libjar/nsZipArchive.cpp.path 2011-08-20 15:18:11.251950138 +0200
++++ ./mozilla/modules/libjar/nsZipArchive.cpp 2011-08-20 15:20:25.220730178 +0200
+@@ -98,7 +98,7 @@ nsRecyclingAllocator *gZlibAllocator = N
+ # define S_IFLNK 0120000
+ # endif
+ # ifndef PATH_MAX
+-# define PATH_MAX 1024
++# include <limits.h>
+ # endif
+ #endif /* XP_UNIX */
+
+diff -up ./mozilla/modules/libreg/src/reg.c.path ./mozilla/modules/libreg/src/reg.c
+--- ./mozilla/modules/libreg/src/reg.c.path 2011-08-14 03:20:29.000000000 +0200
++++ ./mozilla/modules/libreg/src/reg.c 2011-08-20 15:22:14.417736987 +0200
+@@ -94,7 +94,8 @@
+ #ifdef PATH_MAX
+ #define MAX_PATH PATH_MAX
+ #else
+-#define MAX_PATH 1024
++#include <limits.h>
++#define MAX_PATH PATH_MAX
+ #endif
+ #endif
+ #elif defined(XP_OS2)
+diff -up ./mozilla/nsprpub/config/pathsub.h.path ./mozilla/nsprpub/config/pathsub.h
+--- ./mozilla/nsprpub/config/pathsub.h.path 2011-08-20 15:18:11.251950138 +0200
++++ ./mozilla/nsprpub/config/pathsub.h 2011-08-20 15:20:25.221730169 +0200
+@@ -50,7 +50,7 @@
+ #endif
+
+ #ifndef PATH_MAX
+-#define PATH_MAX 1024
++#error "PATH_MAX is not defined!"
+ #endif
+
+ /*
+diff -up ./mozilla/security/coreconf/nsinstall/pathsub.h.path ./mozilla/security/coreconf/nsinstall/pathsub.h
+--- ./mozilla/security/coreconf/nsinstall/pathsub.h.path 2011-08-20 15:18:11.252950129 +0200
++++ ./mozilla/security/coreconf/nsinstall/pathsub.h 2011-08-20 15:20:25.222730160 +0200
+@@ -49,7 +49,7 @@
+ #endif
+
+ #ifndef PATH_MAX
+-#define PATH_MAX 1024
++#error "PATH_MAX is not defined!"
+ #endif
+
+ /*
+diff -up ./mozilla/toolkit/mozapps/update/updater/updater.cpp.path ./mozilla/toolkit/mozapps/update/updater/updater.cpp
+--- ./mozilla/toolkit/mozapps/update/updater/updater.cpp.path 2011-08-20 15:18:11.233950300 +0200
++++ ./mozilla/toolkit/mozapps/update/updater/updater.cpp 2011-08-20 15:20:25.200730361 +0200
+@@ -206,7 +206,8 @@ void LaunchMacPostProcess(const char* aA
+ # elif defined(CCHMAXPATH)
+ # define MAXPATHLEN CCHMAXPATH
+ # else
+-# define MAXPATHLEN 1024
++# include <limits.h>
++# define MAXPATHLEN PATH_MAX
+ # endif
+ #endif
+
+diff -up ./mozilla/toolkit/xre/nsAppRunner.h.path ./mozilla/toolkit/xre/nsAppRunner.h
+--- ./mozilla/toolkit/xre/nsAppRunner.h.path 2011-08-20 15:18:11.229950336 +0200
++++ ./mozilla/toolkit/xre/nsAppRunner.h 2011-08-20 15:20:25.196730397 +0200
+@@ -52,7 +52,8 @@
+ #elif defined(CCHMAXPATH)
+ #define MAXPATHLEN CCHMAXPATH
+ #else
+-#define MAXPATHLEN 1024
++#include <limits.h>
++#define MAXPATHLEN PATH_MAX
+ #endif
+ #endif
+
+diff -up ./mozilla/widget/src/xremoteclient/XRemoteClient.cpp.path ./mozilla/widget/src/xremoteclient/XRemoteClient.cpp
+--- ./mozilla/widget/src/xremoteclient/XRemoteClient.cpp.path 2011-08-20 15:17:55.000000000 +0200
++++ ./mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2011-08-20 15:21:38.289065478 +0200
+@@ -77,7 +77,8 @@
+ #ifdef PATH_MAX
+ #define MAX_PATH PATH_MAX
+ #else
+-#define MAX_PATH 1024
++#include <limits.h>
++#define MAX_PATH PATH_MAX
+ #endif
+ #endif
+
+diff -up ./mozilla/xpcom/build/nsXPCOMPrivate.h.path ./mozilla/xpcom/build/nsXPCOMPrivate.h
+--- ./mozilla/xpcom/build/nsXPCOMPrivate.h.path 2011-08-20 15:18:11.236950273 +0200
++++ ./mozilla/xpcom/build/nsXPCOMPrivate.h 2011-08-20 15:20:25.202730343 +0200
+@@ -297,7 +297,8 @@ void LogTerm();
+ #elif defined(CCHMAXPATH)
+ #define MAXPATHLEN CCHMAXPATH
+ #else
+-#define MAXPATHLEN 1024
++#include <limits.h>
++#define MAXPATHLEN PATH_MAX
+ #endif
+ #endif
+
+diff -up ./mozilla/xpcom/io/SpecialSystemDirectory.cpp.path ./mozilla/xpcom/io/SpecialSystemDirectory.cpp
+--- ./mozilla/xpcom/io/SpecialSystemDirectory.cpp.path 2011-08-20 15:18:11.235950282 +0200
++++ ./mozilla/xpcom/io/SpecialSystemDirectory.cpp 2011-08-20 15:20:25.201730352 +0200
+@@ -90,7 +90,8 @@
+ #elif defined(CCHMAXPATH)
+ #define MAXPATHLEN CCHMAXPATH
+ #else
+-#define MAXPATHLEN 1024
++#include <limits.h>
++#define MAXPATHLEN PATH_MAX
+ #endif
+ #endif
+
+diff -up ./mozilla/xpcom/typelib/xpidl/xpidl_java.c.path ./mozilla/xpcom/typelib/xpidl/xpidl_java.c
+--- ./mozilla/xpcom/typelib/xpidl/xpidl_java.c.path 2011-08-20 15:18:11.238950255 +0200
++++ ./mozilla/xpcom/typelib/xpidl/xpidl_java.c 2011-08-20 15:20:25.204730325 +0200
+@@ -44,6 +44,7 @@
+ #include "xpidl.h"
+ #include <ctype.h>
+ #include <glib.h>
++#include <limits.h>
+
+ #ifdef XP_WIN
+ #include <windef.h>
diff --git a/seamonkey-mozconfig b/seamonkey-mozconfig
index 31fa801..f979d98 100644
--- a/seamonkey-mozconfig
+++ b/seamonkey-mozconfig
@@ -9,28 +9,34 @@ ac_add_options --with-system-zlib
#ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-tests
-ac_add_options --disable-installer
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
ac_add_options --disable-debug
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+#ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-optimize
+ac_add_options --disable-installer
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
+ac_add_options --enable-system-cairo
ac_add_options --enable-pango
-# disabled because of rhbz#628331
-ac_add_options --disable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-extensions=default,irc
ac_add_options --enable-crypto
-ac_add_options --enable-safe-browsing
+ac_add_options --enable-libxul
ac_add_options --disable-crashreporter
-ac_add_options --enable-static
+ac_add_options --enable-safe-browsing
ac_add_options --enable-system-hunspell
+ac_add_options --disable-cpp-exceptions
+ac_add_options --disable-updater
+#ac_add_options --enable-url-classifier
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
+ac_add_options --enable-chrome-format=omni
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
+
diff --git a/seamonkey.spec b/seamonkey.spec
index c3a48a8..f37dc2c 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -2,27 +2,27 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define cairo_version 0.5
-%define minimum_build_nspr_version 4.7.2
-%define minimum_build_nss_version 3.12
+%define minimum_build_nspr_version 4.8.8
+%define minimum_build_nss_version 3.12.10
%define build_langpacks 1
%define _unpackaged_files_terminate_build 0
%define builddir %{_builddir}/%{name}-%{version}
%define mozdir %{_libdir}/seamonkey-%{version}
-%define sources_subdir comm-1.9.1
+%define sources_subdir comm-release
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.0.14
+Version: 2.3
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv1.1
Group: Applications/Internet
Source0: seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
-Source1: seamonkey-langpacks-%{version}-20110429.tar.xz
+Source1: seamonkey-langpacks-%{version}-20110820.tar.xz
Source2: seamonkey-icon.png
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -35,10 +35,7 @@ Source18: mozilla-xpcom-exclude-list
Source20: seamonkey-fedora-default-prefs.js
Source100: find-external-requires
-Patch0: mozilla-jemalloc.patch
-Patch1: mozilla-191-path.patch
-Patch2: cstddef.patch
-Patch3: mozilla-comodo-646460.patch
+Patch1: mozilla-23-path.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -96,10 +93,7 @@ application formerly known as Mozilla Application Suite.
%setup -q -c
cd %{sources_subdir}
-%patch0 -p0 -b .jemalloc
%patch1 -p0 -b .path
-%patch2 -p1 -b .cstddef
-%patch3 -p1 -b .646460
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -107,9 +101,13 @@ cd %{sources_subdir}
%build
cd %{sources_subdir}
-# Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | %{__sed} -e 's/-Wall//')
+# 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 | \
+ %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
@@ -131,6 +129,12 @@ cd %{sources_subdir}
DESTDIR=$RPM_BUILD_ROOT make install
+# fix omni.jar to actually work
+pushd mozilla/dist/bin
+zip -d $RPM_BUILD_ROOT/%{mozdir}/omni.jar components/browser.xpt components/mail.xpt components/components.manifest chrome/localized.manifest chrome/nonlocalized.manifest
+zip -9r $RPM_BUILD_ROOT/%{mozdir}/omni.jar chrome.manifest components/*.xpt chrome/*.manifest components/*.manifest components/*.js
+popd
+
# create a list of all of the different package and the files that
# will hold them
@@ -148,51 +152,51 @@ echo %defattr\(-,root,root\) > %{builddir}/seamonkey.list
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.src
-# Copy over missing components
-install -c -m 644 mozilla/dist/bin/components/*.xpt \
- $RPM_BUILD_ROOT/%{mozdir}/components
+## Copy over missing components
+#install -c -m 644 mozilla/dist/bin/components/*.xpt \
+# $RPM_BUILD_ROOT/%{mozdir}/components
# build all of the default browser components
# base Seamonkey package (seamonkey.list)
%{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir} \
--exclude-file=%{SOURCE18}
%{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
%{SOURCE7} --package spellcheck --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
%{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir} \
--exclude-file=%{SOURCE17}
%{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
%{SOURCE7} --package chatzilla --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
%{SOURCE7} --package venkman --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
%{SOURCE7} --package inspector --output-file %{builddir}/seamonkey.list \
- --package-file suite/installer/packages \
+ --package-file suite/installer/package-manifest \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
--install-root %{mozdir}
@@ -202,27 +206,30 @@ echo > ../%{name}.lang
%{__mkdir_p} $RPM_BUILD_ROOT/%{mozdir}/extensions
%{__tar} xf %{SOURCE1}
for langpack in `ls seamonkey-langpacks/*.xpi`; do
- language=$(basename $langpack .xpi | cut -d '.' -f 4)
+ language=$(basename $langpack .xpi | cut -d '.' -f 3)
extensiondir=$RPM_BUILD_ROOT/%{mozdir}/extensions/langpack-$language at seamonkey.mozilla.org
%{__mkdir_p} $extensiondir
unzip $langpack -d $extensiondir
find $extensiondir -type f | xargs chmod 644
- tmpdir=`mktemp -d %{name}.XXXXXXXX`
- langtmp=$tmpdir/%{name}/langpack-$language
- %{__mkdir_p} $langtmp
+# tmpdir=`mktemp -d %{name}.XXXXXXXX`
+# langtmp=$tmpdir/%{name}/langpack-$language
+# %{__mkdir_p} $langtmp
jarfile=$extensiondir/chrome/$language.jar
- unzip $jarfile -d $langtmp
+# unzip $jarfile -d $langtmp
+# sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
+# $langtmp/locale/$language/navigator-region/region.properties
sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
- $langtmp/locale/$language/navigator-region/region.properties
+ $extensiondir/chrome/$language/locale/$language/navigator-region/region.properties
- find $langtmp -type f | xargs chmod 644
- %{__rm} -rf $jarfile
- cd $langtmp
+# find $langtmp -type f | xargs chmod 644
+# %{__rm} -rf $jarfile
+# cd $langtmp
+ cd $extensiondir/chrome/$language
zip -r -D $jarfile locale
cd -
- %{__rm} -rf $tmpdir
+# %{__rm} -rf $tmpdir
language=`echo $language | sed -e 's/-/_/g'`
extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
@@ -291,8 +298,7 @@ update-desktop-database %{_datadir}/applications
%{_datadir}/pixmaps/seamonkey-mail-icon.png
# search engines
-%{mozdir}/searchplugins/*.png
-%{mozdir}/searchplugins/*.src
+%{mozdir}/searchplugins/*.xml
# dictionaries
%{mozdir}/dictionaries/*
@@ -301,11 +307,11 @@ update-desktop-database %{_datadir}/applications
%{mozdir}/defaults/profile/*
# some rest
-%{mozdir}/chrome/en-US.jar
-%{mozdir}/chrome/en-US.manifest
-%{mozdir}/chrome/reporter.jar
-%{mozdir}/chrome/reporter.manifest
-%{mozdir}/components/*.xpt
+%{mozdir}/omni.jar
+%{mozdir}/chrome.manifest
+%{mozdir}/components/binary.manifest
+#%{mozdir}/components/*.xpt
+%{mozdir}/components/*.so
%{mozdir}/defaults/messenger/mailViews.dat
%{mozdir}/extensions/*
@@ -314,7 +320,6 @@ update-desktop-database %{_datadir}/applications
%dir %{mozdir}
%dir %{mozdir}/defaults/pref
%dir %{mozdir}/defaults/profile
-%dir %{mozdir}/defaults/autoconfig
%dir %{mozdir}/defaults/messenger
%dir %{mozdir}/defaults
@@ -322,9 +327,6 @@ update-desktop-database %{_datadir}/applications
%dir %{mozdir}/chrome/icons
%dir %{mozdir}/chrome
-%dir %{mozdir}/res/dtd
-%dir %{mozdir}/res/fonts
-%dir %{mozdir}/res
%dir %{mozdir}/components
%dir %{mozdir}/searchplugins
@@ -333,23 +335,19 @@ update-desktop-database %{_datadir}/applications
%dir %{mozdir}/dictionaries
%dir %{mozdir}/plugins
-%dir %{mozdir}/res/html
-%dir %{mozdir}/res/entityTables
%{mozdir}/defaults/pref/all-fedora.js
-%dir %{mozdir}/greprefs
-
%{_datadir}/applications/mozilla-%{name}.desktop
%{_datadir}/applications/mozilla-%{name}-mail.desktop
-%ghost %{mozdir}/.autoreg
-%ghost %{mozdir}/update.locale
-%ghost %{mozdir}/updater.ini
%ghost %{mozdir}/removed-files
%changelog
+* Sun Aug 21 2011 Kai Engert <kaie at redhat.com> - 2.3-1
+- Update to 2.3
+
* Fri Apr 29 2011 Jan Horak <jhorak at redhat.com> - 2.0.14-1
- Update to 2.0.14
diff --git a/sources b/sources
index 4976c48..3e3f0df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2099ec0b71f950faad297a140b2702bc seamonkey-2.0.14.source.tar.bz2
-9e98b4c90e8bf705d80f4a99aee44e84 seamonkey-langpacks-2.0.14-20110429.tar.xz
+86caf64b1a0cee27f39c375bbf05223d seamonkey-2.3.source.tar.bz2
+34bdceabe5a23586df44293a79928c12 seamonkey-langpacks-2.3-20110820.tar.xz
More information about the scm-commits
mailing list