[seamonkey/f15] Update to 2.8
Martin Stransky
stransky at fedoraproject.org
Thu Mar 15 22:09:13 UTC 2012
commit 269781769a6674592ffed39823dca9b3c2a67e97
Author: Martin Stransky <stransky at anakreon.cz>
Date: Thu Mar 15 23:08:51 2012 +0100
Update to 2.8
.gitignore | 2 +
mozilla-722127.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
mozilla-727401.patch | 38 -------------------------
seamonkey-mozconfig | 1 +
seamonkey.spec | 20 ++++++++-----
sources | 4 +-
6 files changed, 91 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d491cb5..f5658ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ seamonkey-2.0.6.source.tar.bz2
/seamonkey-langpacks-2.7-20120202.tar.xz
/seamonkey-2.7.1.source.tar.bz2
/seamonkey-langpacks-2.7.1-20120214.tar.xz
+/seamonkey-2.8.source.tar.bz2
+/seamonkey-langpacks-2.8-20120315.tar.xz
diff --git a/mozilla-722127.patch b/mozilla-722127.patch
new file mode 100644
index 0000000..f86fcae
--- /dev/null
+++ b/mozilla-722127.patch
@@ -0,0 +1,74 @@
+diff -up xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure.in
+--- xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 2012-03-09 01:39:31.000000000 +0100
++++ xulrunner-11.0/mozilla-beta/configure.in 2012-03-09 15:03:51.246031329 +0100
+@@ -5710,20 +5710,20 @@ if test -n "$MOZ_WEBM"; then
+ [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
+ ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
+ if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
+- AC_MSG_CHECKING([for libvpx version >= v0.9.7])
+- dnl We need at least v0.9.7 to fix several crash bugs (for which we
+- dnl had local patches prior to v0.9.7).
++ AC_MSG_CHECKING([for libvpx version >= v1.0.0])
++ dnl We need at least v1.0.0 to fix several crash bugs (for which we
++ dnl had local patches prior to v1.0.0).
+ dnl
+ dnl This is a terrible test for the library version, but we don't
+ dnl have a good one. There is no version number in a public header,
+ dnl and testing the headers still doesn't guarantee we link against
+ dnl the right version. While we could call vpx_codec_version() at
+ dnl run-time, that would break cross-compiling. There are no
+- dnl additional exported symbols between the v0.9.7 release and the
+- dnl v0.9.6 one to check for.
++ dnl additional exported decoder symbols between the v1.0.0 release
++ dnl and the v0.9.7 one to check for.
+ AC_TRY_COMPILE([
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+ ],
+@@ -5734,7 +5734,7 @@ if test -n "$MOZ_WEBM"; then
+ MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
+ MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
+ [AC_MSG_RESULT([no])
+- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
++ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
+ fi
+ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+diff -up xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure
+--- xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 2012-03-09 01:58:50.000000000 +0100
++++ xulrunner-11.0/mozilla-beta/configure 2012-03-09 15:15:42.537585632 +0100
+@@ -17761,14 +17761,14 @@ else
+ fi
+
+ if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
+- echo $ac_n "checking for libvpx version >= v0.9.7""... $ac_c" 1>&6
+-echo "configure:17766: checking for libvpx version >= v0.9.7" >&5
++ echo $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6
++echo "configure:17766: checking for libvpx version >= v1.0.0" >&5
+ cat > conftest.$ac_ext <<EOF
+ #line 17768 "configure"
+ #include "confdefs.h"
+
+ #include <vpx/vpx_decoder.h>
+- #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+ #error "test failed."
+ #endif
+
+@@ -17791,7 +17791,7 @@ else
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ echo "$ac_t""no" 1>&6
+- { echo "configure: error: --with-system-libvpx requested but it is not v0.9.7 or later" 1>&2; exit 1; }
++ { echo "configure: error: --with-system-libvpx requested but it is not v1.0.0 or later" 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+ fi
+@@ -25794,4 +25794,3 @@ if cmp -s config/autoconf.mk config/auto
+ else
+ rm -f config/autoconf.mk.orig 2> /dev/null
+ fi
+-
diff --git a/seamonkey-mozconfig b/seamonkey-mozconfig
index e03b2f6..d1b3602 100644
--- a/seamonkey-mozconfig
+++ b/seamonkey-mozconfig
@@ -7,6 +7,7 @@ ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
#ac_add_options --with-system-png
+ac_add_options --with-system-libvpx
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-debug
diff --git a/seamonkey.spec b/seamonkey.spec
index 228d63d..0823282 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -2,8 +2,8 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define cairo_version 0.5
-%define minimum_build_nspr_version 4.8.9
-%define minimum_build_nss_version 3.13.1
+%define minimum_build_nspr_version 4.9
+%define minimum_build_nss_version 3.13.3
%define build_langpacks 1
@@ -15,14 +15,14 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 2.7.1
-Release: 2%{?dist}
+Version: 2.8
+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}-20120214.tar.xz
+Source1: seamonkey-langpacks-%{version}-20120315.tar.xz
Source2: seamonkey-icon.png
Source3: seamonkey.sh.in
Source4: seamonkey.desktop
@@ -37,7 +37,7 @@ Source100: find-external-requires
Patch1: xulrunner-10.0-gcc47.patch
Patch5: seamonkey-8.0-enable-addons.patch
-Patch6: mozilla-727401.patch
+Patch7: mozilla-722127.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{minimum_build_nspr_version}
@@ -66,10 +66,11 @@ BuildRequires: alsa-lib-devel
BuildRequires: hunspell-devel
BuildRequires: system-bookmarks
BuildRequires: libnotify-devel
-BuildRequires: yasm
+BuildRequires: libvpx-devel
BuildRequires: mesa-libGL-devel
Requires: system-bookmarks
Requires: mozilla-filesystem
+Requires: libvpx
Requires: nspr >= %{minimum_build_nspr_version}
Requires: nss >= %{minimum_build_nss_version}
@@ -107,7 +108,7 @@ cd ..
%patch5 -p2 -b .addons
pushd mozilla
-%patch6 -p1 -b .727401
+%patch7 -p2 -b .722127
popd
%{__rm} -f .mozconfig
@@ -360,6 +361,9 @@ update-desktop-database %{_datadir}/applications
%changelog
+* Thu Mar 15 2012 Martin Stransky <stransky at redhat.com> 2.8-1
+- Update to 2.8
+
* Fri Feb 24 2012 Martin Stransky <stransky at redhat.com> 2.7.1-2
- Added fix for mozbz#727401 - libpng crash
diff --git a/sources b/sources
index 1c07b92..4f2028f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a16764e55ef8e59c469dc44b63459ad6 seamonkey-2.7.1.source.tar.bz2
-1691f86effd4fe82053fc52f40d40520 seamonkey-langpacks-2.7.1-20120214.tar.xz
+a7128f6bcd16bebed4a7c3487b69c38f seamonkey-2.8.source.tar.bz2
+ed305938f77dfc26a700b972d15a1624 seamonkey-langpacks-2.8-20120315.tar.xz
More information about the scm-commits
mailing list