[seamonkey/f20] Update to 2.32

Dmitry Butskoy buc at fedoraproject.org
Wed Jan 21 01:42:10 UTC 2015 

commit d2d72a468cca35b72f9b98469e45e4a2c154d2a8
Author: buc <buc at grad.stu.neva.ru>
Date:   Wed Jan 21 04:46:09 2015 +0300

    Update to 2.32

 firefox-34-baseline-disable.patch                  |   12 ------
 firefox-35-rhbz-1014858.patch                      |   16 +++++++++
 firefox-35-rhbz-1173156.patch                      |   12 ++++++
 seamonkey-2.31-installdir.patch                    |   36 --------------------
 ...ons.patch => seamonkey-2.32-enable-addons.patch |   20 +++++-----
 seamonkey-2.32-installdir.patch                    |   18 ++++++++++
 seamonkey.sh.in => seamonkey.sh.in-2.32            |    5 +++
 seamonkey.spec                                     |   36 ++++++++++++++------
 sources                                            |    4 +-
 9 files changed, 88 insertions(+), 71 deletions(-)
---
diff --git a/firefox-35-rhbz-1014858.patch b/firefox-35-rhbz-1014858.patch
new file mode 100644
index 0000000..c953b33
--- /dev/null
+++ b/firefox-35-rhbz-1014858.patch
@@ -0,0 +1,16 @@
+diff -up mozilla-release/toolkit/xre/nsAppRunner.cpp.old mozilla-release/toolkit/xre/nsAppRunner.cpp
+--- mozilla-release/toolkit/xre/nsAppRunner.cpp.old	2014-11-26 03:17:40.000000000 +0100
++++ mozilla-release/toolkit/xre/nsAppRunner.cpp	2015-01-05 14:23:05.977933308 +0100
+@@ -4168,10 +4168,8 @@ XREMain::XRE_main(int argc, char* argv[]
+ 
+ #if defined(MOZ_WIDGET_GTK)
+ #if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
+-  // Disable the slice allocator, since jemalloc already uses similar layout
+-  // algorithms, and using a sub-allocator tends to increase fragmentation.
+-  // This must be done before g_thread_init() is called.
+-  g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
++  // rhbz#1014858 - enable slice allocator for child processes
++  unsetenv("G_SLICE");
+ #endif
+   g_thread_init(nullptr);
+ #endif
diff --git a/firefox-35-rhbz-1173156.patch b/firefox-35-rhbz-1173156.patch
new file mode 100644
index 0000000..9855710
--- /dev/null
+++ b/firefox-35-rhbz-1173156.patch
@@ -0,0 +1,12 @@
+diff -up firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp
+--- firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old	2014-11-25 12:23:22.000000000 +0100
++++ firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp	2014-12-23 15:26:36.606674625 +0100
+@@ -174,7 +174,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper()
+         return NS_ERROR_FAILURE;
+ 
+     const char* const args[] = {
+-        "ntlm_auth",
++        "/usr/bin/ntlm_auth",
+         "--helper-protocol", "ntlmssp-client-1",
+         "--use-cached-creds",
+         "--username", username,
diff --git a/seamonkey-2.29-enable-addons.patch b/seamonkey-2.32-enable-addons.patch
similarity index 59%
rename from seamonkey-2.29-enable-addons.patch
rename to seamonkey-2.32-enable-addons.patch
index d7ece59..16302a2 100644
--- a/seamonkey-2.29-enable-addons.patch
+++ b/seamonkey-2.32-enable-addons.patch
@@ -1,6 +1,6 @@
-diff -Nrbu seamonkey-2.29/comm-release/mail/app/profile/all-thunderbird.js seamonkey-2.29-OK/comm-release/mail/app/profile/all-thunderbird.js
---- seamonkey-2.29/comm-release/mail/app/profile/all-thunderbird.js	2014-09-05 09:30:37.000000000 +0400
-+++ seamonkey-2.29-OK/comm-release/mail/app/profile/all-thunderbird.js	2014-09-20 21:58:30.849935519 +0400
+diff -Nrbu seamonkey-2.32/comm-release/mail/app/profile/all-thunderbird.js seamonkey-2.32-OK/comm-release/mail/app/profile/all-thunderbird.js
+--- seamonkey-2.32/comm-release/mail/app/profile/all-thunderbird.js	2015-01-13 07:25:42.000000000 +0300
++++ seamonkey-2.32-OK/comm-release/mail/app/profile/all-thunderbird.js	2015-01-21 00:11:56.545827322 +0300
 @@ -174,7 +174,8 @@
  // Disable add-ons installed into the shared user and shared system areas by
  // default. This does not include the application directory. See the SCOPE
@@ -11,10 +11,10 @@ diff -Nrbu seamonkey-2.29/comm-release/mail/app/profile/all-thunderbird.js seamo
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
-diff -Nrbu seamonkey-2.29/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm seamonkey-2.29-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
---- seamonkey-2.29/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-09-05 09:37:10.000000000 +0400
-+++ seamonkey-2.29-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-09-20 22:01:03.526931450 +0400
-@@ -1888,11 +1888,7 @@
+diff -Nrbu seamonkey-2.32/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm seamonkey-2.32-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- seamonkey-2.32/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2015-01-13 07:35:13.000000000 +0300
++++ seamonkey-2.32-OK/comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2015-01-21 00:16:10.854827053 +0300
+@@ -2093,11 +2093,7 @@
        // Changes to installed extensions may have changed which theme is selected
        this.applyThemeChange();
  
@@ -24,10 +24,10 @@ diff -Nrbu seamonkey-2.29/comm-release/mozilla/toolkit/mozapps/extensions/intern
 -      }
 -      else if (aAppChanged && !this.allAppGlobal &&
 +      if (aAppChanged && !this.allAppGlobal &&
-                Prefs.getBoolPref(PREF_EM_SHOW_MISMATCH_UI, true)) {
-         if (!Prefs.getBoolPref(PREF_SHOWN_SELECTION_UI, false)) {
+                Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
+         if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
            // Flip a flag to indicate that we interrupted startup with an interactive prompt
-@@ -1913,6 +1909,10 @@
+@@ -2118,6 +2114,10 @@
            }
          }
        }
diff --git a/seamonkey-2.32-installdir.patch b/seamonkey-2.32-installdir.patch
new file mode 100644
index 0000000..5909e0b
--- /dev/null
+++ b/seamonkey-2.32-installdir.patch
@@ -0,0 +1,18 @@
+diff -Nrbu seamonkey-2.30/comm-release/mozilla/config/baseconfig.mk seamonkey-2.30-OK/comm-release/mozilla/config/baseconfig.mk
+--- seamonkey-2.30/comm-release/mozilla/config/baseconfig.mk	2014-10-14 10:36:04.000000000 +0400
++++ seamonkey-2.30-OK/comm-release/mozilla/config/baseconfig.mk	2014-10-25 01:30:53.446516035 +0400
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/seamonkey.sh.in b/seamonkey.sh.in-2.32
similarity index 98%
rename from seamonkey.sh.in
rename to seamonkey.sh.in-2.32
index b1d26ef..02a88fd 100755
--- a/seamonkey.sh.in
+++ b/seamonkey.sh.in-2.32
@@ -103,6 +103,11 @@ export MOZ_APP_LAUNCHER="/usr/bin/seamonkey"
 GNOME_DISABLE_CRASH_DIALOG=1
 export GNOME_DISABLE_CRASH_DIALOG
 
+##
+## Disable the SLICE allocator (rhbz#1014858)
+##
+export G_SLICE=always-malloc
+
 # BEAST fix (rhbz#838879)
 NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
 export NSS_SSL_CBC_RANDOM_IV
diff --git a/seamonkey.spec b/seamonkey.spec
index 31a048a..6050577 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -2,6 +2,8 @@
 %bcond_without	system_nss
 %bcond_without	system_libvpx
 
+%bcond_without	gstreamer
+
 %define homepage http://start.fedoraproject.org/
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
@@ -22,7 +24,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.31
+Version:        2.32
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
@@ -36,9 +38,9 @@ Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20141215.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20150120.tar.xz
 
-Source3:        seamonkey.sh.in
+Source3:        seamonkey.sh.in-2.32
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
 Source10:       seamonkey-mozconfig
@@ -53,10 +55,11 @@ Patch2:         xulrunner-24.0-jemalloc-ppc.patch
 Patch3:         xulrunner-27.0-build-arm.patch
 Patch4:         firefox-33-rhbz-966424.patch
 Patch5:         firefox-34-mozilla-858919.patch
-Patch9:         firefox-34-baseline-disable.patch
+Patch7:                firefox-35-rhbz-1173156.patch
+Patch8:                firefox-35-rhbz-1014858.patch
 Patch10:        firefox-33-build-prbool.patch
-Patch15:        seamonkey-2.29-enable-addons.patch
-Patch22:        seamonkey-2.31-installdir.patch
+Patch15:        seamonkey-2.32-enable-addons.patch
+Patch22:        seamonkey-2.32-installdir.patch
 Patch23:        seamonkey-2.25-elfhack.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,7 +100,11 @@ BuildRequires:  libvpx-devel >= %{minimum_build_vpx_version}
 BuildRequires:  yasm >= 1.1
 %endif
 BuildRequires:  mesa-libGL-devel
-Buildrequires:  pulseaudio-libs-devel
+BuildRequires:  pulseaudio-libs-devel
+%if %{with gstreamer}
+BuildRequires:  gstreamer1-devel
+BuildRequires:  gstreamer1-plugins-base-devel
+%endif
 BuildRequires:  python >= 2.7
 
 Requires:       system-bookmarks
@@ -143,9 +150,8 @@ pushd mozilla
 %patch3 -p2 -b .build-arm
 %patch4 -p2 -b .966424
 %patch5 -p1 -b .858919
-%ifarch %{ix86}
-%patch9 -p2 -b .baseline
-%endif
+%patch7 -p2 -b .1173156
+%patch8 -p1 -b .1014858
 %patch10 -p1 -b .prbool
 popd
 
@@ -172,8 +178,11 @@ echo "ac_add_options --with%{!?with_system_libvpx:out}-system-libvpx" >> .mozcon
 echo "ac_add_options --disable-webrtc" >> .mozconfig
 %endif
 
-#  enabled by default since 2.21
+%if %{with gstreamer}
+echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
+%else
 echo "ac_add_options --disable-gstreamer" >> .mozconfig
+%endif
 
 
 %build
@@ -489,6 +498,11 @@ fi
 
 
 %changelog
+* Tue Jan 20 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.32-1
+- update to 2.32
+- apply some patches from firefox-35 package
+- enable gstreamer-1.0 support
+
 * Mon Dec 15 2014 Dmitry Butskoy <Dmitry at Butskoy.name> 2.31-1
 - update to 2.31
 - apply some patches from firefox-34 package
diff --git a/sources b/sources
index df1f32e..241ea22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-44b6f9cfc2a95fd08dba35ff236d306e  seamonkey-2.31.source.tar.bz2
-f8bdb838f38e2f7ba6fe0f3e2a2f60cb  seamonkey-langpacks-2.31-20141215.tar.xz
+52302e4ce4599c8ab5eb8d4f9a78e7bd  seamonkey-2.32.source.tar.bz2
+abb42f50b63433c860516df5b6d765a2  seamonkey-langpacks-2.32-20150120.tar.xz

More information about the scm-commits mailing list