[seamonkey/f19] .

Dmitry Butskoy buc at fedoraproject.org
Wed Dec 18 23:59:21 UTC 2013


commit e398eb05f925d10ad02c43494d9475975f8bcc04
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Dec 19 03:59:05 2013 +0400

    .

 seamonkey-2.23-elfhack.patch    |   12 +++++++++++
 seamonkey-2.23-installdir.patch |   41 +++++++++++++++++++++++++++++++++++++++
 xulrunner-26.0-build-arm.patch  |   35 +++++++++++++++++++++++++++++++++
 xulrunner-26.0-gcc47.patch      |   13 ++++++++++++
 4 files changed, 101 insertions(+), 0 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.23-installdir.patch b/seamonkey-2.23-installdir.patch
new file mode 100644
index 0000000..6a6cf1a
--- /dev/null
+++ b/seamonkey-2.23-installdir.patch
@@ -0,0 +1,41 @@
+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)
+-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
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
+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)
+-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
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+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)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
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