[seamonkey/f20] update to 2.23

Dmitry Butskoy buc at fedoraproject.org
Wed Dec 18 23:55:30 UTC 2013 

commit 28add4180e512937ef8bdd1425e3ca50ba5c47e9
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Dec 19 03:55:17 2013 +0400

    update to 2.23

 seamonkey-2.22-elfhack.patch                       |   12 -------
 seamonkey-2.22.1-nspr_4_10_1.patch                 |   12 -------
 seamonkey-2.23-elfhack.patch                       |   12 +++++++
 ...alldir.patch => seamonkey-2.23-installdir.patch |   30 +++++++----------
 seamonkey-idl-parser-cachepath.patch               |   26 --------------
 seamonkey.spec                                     |   26 ++++++++-------
 sources                                            |    4 +-
 xulrunner-24.0-gcc47.patch                         |   13 -------
 xulrunner-25.0-build-arm.patch                     |   12 -------
 xulrunner-26.0-build-arm.patch                     |   35 ++++++++++++++++++++
 xulrunner-26.0-gcc47.patch                         |   13 +++++++
 11 files changed, 88 insertions(+), 107 deletions(-)
---
diff --git a/seamonkey-2.23-elfhack.patch b/seamonkey-2.23-elfhack.patch
new file mode 100644
index 0000000..d7834c0
--- /dev/null
+++ b/seamonkey-2.23-elfhack.patch
@@ -0,0 +1,12 @@
+diff -Nrbu seamonkey-2.23/comm-release/mozilla/build/unix/elfhack/Makefile.in seamonkey-2.23-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in
+--- seamonkey-2.23/comm-release/mozilla/build/unix/elfhack/Makefile.in	2013-12-11 08:28:28.000000000 +0400
++++ seamonkey-2.23-OK/comm-release/mozilla/build/unix/elfhack/Makefile.in	2013-12-18 19:50:23.834795002 +0400
+@@ -10,7 +10,7 @@
+ 
+ VPATH += $(topsrcdir)/build
+ 
+-OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
++HOST_CXXFLAGS := $(filter-out -fno-exceptions,$(HOST_CXXFLAGS)) -fexceptions
+ 
+ ifndef CROSS_COMPILE
+ CSRCS += dummy.c
diff --git a/seamonkey-2.14-installdir.patch b/seamonkey-2.23-installdir.patch
similarity index 54%
rename from seamonkey-2.14-installdir.patch
rename to seamonkey-2.23-installdir.patch
index 27c1227..6a6cf1a 100644
--- a/seamonkey-2.14-installdir.patch
+++ b/seamonkey-2.23-installdir.patch
@@ -1,9 +1,7 @@
-diff -Nrbu seamonkey-2.14/comm-release/config/baseconfig.mk seamonkey-2.14-OK/comm-release/config/baseconfig.mk
---- seamonkey-2.14/comm-release/config/baseconfig.mk	2012-11-18 14:14:23.000000000 +0400
-+++ seamonkey-2.14-OK/comm-release/config/baseconfig.mk	2012-11-21 20:14:59.094241643 +0400
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
+diff -Nrbu seamonkey-2.23/comm-release/config/baseconfig.mk seamonkey-2.23-OK/comm-release/config/baseconfig.mk
+--- seamonkey-2.23/comm-release/config/baseconfig.mk	2013-12-11 08:19:54.000000000 +0400
++++ seamonkey-2.23-OK/comm-release/config/baseconfig.mk	2013-12-18 19:44:54.168667293 +0400
+@@ -1,7 +1,7 @@
 -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)
@@ -15,12 +13,10 @@ diff -Nrbu seamonkey-2.14/comm-release/config/baseconfig.mk seamonkey-2.14-OK/co
  MOZILLA_SRCDIR = $(topsrcdir)/mozilla
  MOZDEPTH = $(DEPTH)/mozilla
  DIST = $(MOZDEPTH)/dist
-diff -Nrbu seamonkey-2.14/comm-release/mozilla/config/baseconfig.mk seamonkey-2.14-OK/comm-release/mozilla/config/baseconfig.mk
---- seamonkey-2.14/comm-release/mozilla/config/baseconfig.mk	2012-11-18 14:19:31.000000000 +0400
-+++ seamonkey-2.14-OK/comm-release/mozilla/config/baseconfig.mk	2012-11-21 20:13:11.324981221 +0400
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
+diff -Nrbu seamonkey-2.23/comm-release/mozilla/config/baseconfig.mk seamonkey-2.23-OK/comm-release/mozilla/config/baseconfig.mk
+--- seamonkey-2.23/comm-release/mozilla/config/baseconfig.mk	2013-12-11 08:28:28.000000000 +0400
++++ seamonkey-2.23-OK/comm-release/mozilla/config/baseconfig.mk	2013-12-18 19:45:12.560460604 +0400
+@@ -1,7 +1,7 @@
 -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)
@@ -32,12 +28,10 @@ diff -Nrbu seamonkey-2.14/comm-release/mozilla/config/baseconfig.mk seamonkey-2.
  DIST = $(DEPTH)/dist
  
  # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nrbu seamonkey-2.14/comm-release/mozilla/js/src/config/baseconfig.mk seamonkey-2.14-OK/comm-release/mozilla/js/src/config/baseconfig.mk
---- seamonkey-2.14/comm-release/mozilla/js/src/config/baseconfig.mk	2012-11-18 14:19:38.000000000 +0400
-+++ seamonkey-2.14-OK/comm-release/mozilla/js/src/config/baseconfig.mk	2012-11-21 20:13:11.358854418 +0400
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
+diff -Nrbu seamonkey-2.23/comm-release/mozilla/js/src/config/baseconfig.mk seamonkey-2.23-OK/comm-release/mozilla/js/src/config/baseconfig.mk
+--- seamonkey-2.23/comm-release/mozilla/js/src/config/baseconfig.mk	2013-12-11 08:28:40.000000000 +0400
++++ seamonkey-2.23-OK/comm-release/mozilla/js/src/config/baseconfig.mk	2013-12-18 19:46:14.990947060 +0400
+@@ -1,5 +1,5 @@
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 +installdir = $(libdir)/$(MOZ_APP_NAME)
diff --git a/seamonkey.spec b/seamonkey.spec
index 7f22fec..6dbfd6f 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -6,7 +6,7 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define cairo_version 0.5
 
-%global minimum_build_nspr_version 4.10.1
+%global minimum_build_nspr_version 4.10.2
 %global minimum_build_nss_version 3.15.0
 %global minimum_build_vpx_version 1.0.0
 
@@ -22,13 +22,13 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        2.22.1
+Version:        2.23
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv2.0
 Group:          Applications/Internet
 
-Source0:        http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
+Source0:        ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}%{?prerelease_tag}.source.tar.bz2
 
 #  Generate it by moz-grab-langpacks script, which can be obtained from
 #  http://fedorapeople.org/cgit/caillon/public_git/gecko-maint.git/
@@ -36,7 +36,7 @@ Source0:        http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/%
 #
 #   Run script as  ./moz-grab-langpacks --app seamonkey %{version}
 #
-Source1:        seamonkey-langpacks-%{version}-20131119.tar.xz
+Source1:        seamonkey-langpacks-%{version}-20131218.tar.xz
 
 Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
@@ -49,14 +49,12 @@ Source18:       mozilla-xpcom-exclude-list
 Source20:       seamonkey-fedora-default-prefs.js
 Source100:      find-external-requires
 
-Patch1:         xulrunner-24.0-gcc47.patch
+Patch1:         xulrunner-26.0-gcc47.patch
 Patch2:         xulrunner-24.0-jemalloc-ppc.patch
-Patch3:         xulrunner-25.0-build-arm.patch
+Patch3:         xulrunner-26.0-build-arm.patch
 Patch5:         seamonkey-8.0-enable-addons.patch
-Patch10:        seamonkey-idl-parser-cachepath.patch
-Patch22:        seamonkey-2.14-installdir.patch
-Patch23:        seamonkey-2.22-elfhack.patch
-Patch24:	seamonkey-2.22.1-nspr_4_10_1.patch
+Patch22:        seamonkey-2.23-installdir.patch
+Patch23:        seamonkey-2.23-elfhack.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with system_nspr}
@@ -143,11 +141,9 @@ pushd mozilla
 popd
 
 %patch5 -p2 -b .addons
-%patch10 -p2 -b .idl-parser-cachepath
 
 %patch22 -p2 -b .installdir
 %patch23 -p2 -b .elfhack
-%patch24 -p2 -b .nspr_4_10_1
 
 # fix obsoleted modifier in inspector
 sed -i -e 's/ *xpcnativewrappers=no//' mozilla/extensions/inspector/jar.mn
@@ -181,6 +177,9 @@ cd %{sources_subdir}
 #
 MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \
                      %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+#  needed for -Werror=format-security
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat"
+
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
 
@@ -471,6 +470,9 @@ fi
 
 
 %changelog
+* Wed Dec 18 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.23-1
+- update to 2.23
+
 * Wed Nov 27 2013 Dmitry Butskoy <Dmitry at Butskoy.name> 2.22.1-1
 - update to 2.22.1
 - don't build for armv7hl (seems not enough memory on the build system, #1035485)
diff --git a/sources b/sources
index 85f21fa..42873fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3f848db22d23aed2cd03d37bdc5fb256  seamonkey-2.22.1.source.tar.bz2
-a607f071c4371a083bc8024f5740ac56  seamonkey-langpacks-2.22.1-20131119.tar.xz
+74116d6a9b646fab7b8995f6c3339be0  seamonkey-2.23.source.tar.bz2
+136f1ca695deaef4b74297b81f54bc6b  seamonkey-langpacks-2.23-20131218.tar.xz
diff --git a/xulrunner-26.0-build-arm.patch b/xulrunner-26.0-build-arm.patch
new file mode 100644
index 0000000..16561b3
--- /dev/null
+++ b/xulrunner-26.0-build-arm.patch
@@ -0,0 +1,35 @@
+diff -up xulrunner-26.0/mozilla-release/gfx/layers/BufferUnrotate.cpp.arm xulrunner-26.0/mozilla-release/gfx/layers/BufferUnrotate.cpp
+--- xulrunner-26.0/mozilla-release/gfx/layers/BufferUnrotate.cpp.arm	2013-12-05 17:07:31.000000000 +0100
++++ xulrunner-26.0/mozilla-release/gfx/layers/BufferUnrotate.cpp	2013-12-10 14:47:43.234182482 +0100
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
+                     int aByteStride, int aXBoundary, int aYBoundary)
+diff -up xulrunner-26.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-26.0/mozilla-release/gfx/ycbcr/moz.build
+--- xulrunner-26.0/mozilla-release/gfx/ycbcr/moz.build.arm	2013-12-05 17:07:32.000000000 +0100
++++ xulrunner-26.0/mozilla-release/gfx/ycbcr/moz.build	2013-12-10 14:47:43.235182479 +0100
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     ASFILES += [
+         'yuv_row_arm.s',
+     ]
+diff -up xulrunner-26.0/mozilla-release/media/libtheora/lib/moz.build.arm xulrunner-26.0/mozilla-release/media/libtheora/lib/moz.build
+--- xulrunner-26.0/mozilla-release/media/libtheora/lib/moz.build.arm	2013-12-05 17:07:48.000000000 +0100
++++ xulrunner-26.0/mozilla-release/media/libtheora/lib/moz.build	2013-12-12 11:45:41.882119059 +0100
+@@ -8,7 +8,7 @@ MODULE = 'theora'
+ 
+ LIBRARY_NAME = 'theora'
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
++if CONFIG['HAVE_ARM_NEON'] and CONFIG['GNU_AS']:
+     asm_suffix = CONFIG['ASM_SUFFIX']
+     ASFILES += [
+         'armbits-gnu.%s' % asm_suffix,
diff --git a/xulrunner-26.0-gcc47.patch b/xulrunner-26.0-gcc47.patch
new file mode 100644
index 0000000..9338049
--- /dev/null
+++ b/xulrunner-26.0-gcc47.patch
@@ -0,0 +1,13 @@
+diff -up xulrunner-26.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-26.0/mozilla-release/toolkit/crashreporter/client/Makefile.in
+--- xulrunner-26.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-12-09 15:12:50.659231760 +0100
++++ xulrunner-26.0/mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-12-09 15:13:45.448324783 +0100
+@@ -42,6 +42,9 @@ endif
+ 
+ ifdef MOZ_WIDGET_GTK
+ 
++# Needed for moz_free
++LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
++
+ LIBS += \
+   $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \
+   $(NULL)

More information about the scm-commits mailing list