[xulrunner] Update patches to FF26

Martin Stransky stransky at fedoraproject.org
Mon Dec 9 14:21:51 UTC 2013 

commit 4de5e6b42ed9b7824635020d69193b7c707a512e
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Dec 9 15:21:46 2013 +0100

    Update patches to FF26

 mozilla-938730.patch        |   19 +++++--------------
 mozilla-build.patch         |   16 +++++++++-------
 xulrunner-24.0-gcc47.patch  |   12 ++++++------
 xulrunner-install-dir.patch |   19 ++++++++-----------
 xulrunner.spec              |    4 ++--
 5 files changed, 30 insertions(+), 40 deletions(-)
---
diff --git a/mozilla-938730.patch b/mozilla-938730.patch
index 53ff440..3b84553 100644
--- a/mozilla-938730.patch
+++ b/mozilla-938730.patch
@@ -1,12 +1,7 @@
-diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in
---- a/storage/src/Makefile.in
-+++ b/storage/src/Makefile.in
-@@ -11,24 +11,32 @@ VPATH   = @srcdir@
- include $(DEPTH)/config/autoconf.mk
- 
- MODULE_NAME      = mozStorageModule
- LIBXUL_LIBRARY = 1
- 
+diff -up mozilla-release/storage/src/Makefile.in.938730 mozilla-release/storage/src/Makefile.in
+--- mozilla-release/storage/src/Makefile.in.938730	2013-12-09 15:15:44.708527295 +0100
++++ mozilla-release/storage/src/Makefile.in	2013-12-09 15:17:16.119682503 +0100
+@@ -6,14 +6,23 @@
  # Don't use the jemalloc allocator on Android, because we can't guarantee
  # that Gecko will configure sqlite before it is first used (bug 730495).
  #
@@ -26,11 +21,7 @@ diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in
  endif
  endif
 +endif
++
  
  # For nsDependentJSString
  LOCAL_INCLUDES = \
-   $(SQLITE_CFLAGS) \
-   -I$(topsrcdir)/db/sqlite3/src \
-   -I$(topsrcdir)/dom/base \
-   $(NULL)
- 
diff --git a/mozilla-build.patch b/mozilla-build.patch
index 1dd29d0..be73cdf 100644
--- a/mozilla-build.patch
+++ b/mozilla-build.patch
@@ -1,6 +1,7 @@
---- mozilla-release/security/build/Makefile.in.build	2013-06-18 13:01:39.000000000 +0200
-+++ mozilla-release/security/build/Makefile.in	2013-06-18 14:01:41.940378194 +0200
-@@ -133,7 +133,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+diff -up mozilla-release/security/build/Makefile.in.build mozilla-release/security/build/Makefile.in
+--- mozilla-release/security/build/Makefile.in.build	2013-12-05 17:07:53.000000000 +0100
++++ mozilla-release/security/build/Makefile.in	2013-12-09 15:10:17.177970414 +0100
+@@ -128,7 +128,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
  DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
@@ -8,11 +9,12 @@
  DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
  ifeq ($(OS_ARCH),WINNT)
  DEFAULT_GMAKE_FLAGS += INSTALL="$(NSINSTALL) -t"
---- mozilla-release/security/manager/ssl/src/Makefile.in.build	2013-06-18 13:01:39.000000000 +0200
-+++ mozilla-release/security/manager/ssl/src/Makefile.in	2013-06-18 14:01:18.659377663 +0200
-@@ -86,7 +86,6 @@ endif
- CSRCS += md4.c
+diff -up mozilla-release/security/manager/ssl/src/Makefile.in.build mozilla-release/security/manager/ssl/src/Makefile.in
+--- mozilla-release/security/manager/ssl/src/Makefile.in.build	2013-12-09 15:10:17.177970414 +0100
++++ mozilla-release/security/manager/ssl/src/Makefile.in	2013-12-09 15:11:02.282047401 +0100
+@@ -6,7 +6,6 @@
  
+ EXPORT_LIBRARY	= 1
  DEFINES += \
 -  -DNSS_ENABLE_ECC \
    -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
diff --git a/xulrunner-24.0-gcc47.patch b/xulrunner-24.0-gcc47.patch
index a6bff8e..28de75f 100644
--- a/xulrunner-24.0-gcc47.patch
+++ b/xulrunner-24.0-gcc47.patch
@@ -1,9 +1,9 @@
-diff -up xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in
---- xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-09-11 01:15:24.000000000 +0200
-+++ xulrunner-24.0/mozilla-release/toolkit/crashreporter/client/Makefile.in	2013-09-13 13:33:49.866875578 +0200
-@@ -60,6 +60,9 @@ $(DIST)/bin/crashreporter.crt: $(topsrcd
- 	$(PYTHON) $(srcdir)/certdata2pem.py < $< > $@
- endif
+diff -up mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-release/toolkit/crashreporter/client/Makefile.in
+--- mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47	2013-12-09 15:12:50.659231760 +0100
++++ 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
diff --git a/xulrunner-install-dir.patch b/xulrunner-install-dir.patch
index e788fa0..9527700 100644
--- a/xulrunner-install-dir.patch
+++ b/xulrunner-install-dir.patch
@@ -1,8 +1,7 @@
-diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/config/baseconfig.mk	2012-09-26 10:13:45.258240426 +0200
-@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
- 
+diff -up mozilla-release/config/baseconfig.mk.orig mozilla-release/config/baseconfig.mk
+--- mozilla-release/config/baseconfig.mk.orig	2013-12-09 15:07:53.357724904 +0100
++++ mozilla-release/config/baseconfig.mk	2013-12-09 15:08:35.819797392 +0100
+@@ -1,6 +1,6 @@
  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)
@@ -10,12 +9,10 @@ diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-767
  sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
  DIST = $(DEPTH)/dist
  
-diff -up mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk
---- mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk	2012-09-26 10:14:07.353351833 +0200
-@@ -1,6 +1,6 @@
- INCLUDED_AUTOCONF_MK = 1
- 
+diff -up mozilla-release/js/src/config/baseconfig.mk.orig mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release/js/src/config/baseconfig.mk.orig	2013-12-09 15:07:53.357724904 +0100
++++ mozilla-release/js/src/config/baseconfig.mk	2013-12-09 15:09:06.906850462 +0100
+@@ -1,4 +1,4 @@
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +installdir = $(libdir)/$(MOZ_APP_NAME)
  sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
diff --git a/xulrunner.spec b/xulrunner.spec
index e2de779..1e7983b 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -235,10 +235,10 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 cd %{tarballdir}
 
 %patch1  -p1
-%patch2  -p1 -b .build
+%patch2  -p1 -b .bld
 %patch3  -p2 -b .arm
 %patch14 -p2 -b .chromium-types
-%patch17 -p2 -b .gcc47
+%patch17 -p1 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
 %patch19 -p2 -b .s390-inlines
 %patch20 -p1 -b .885002

More information about the scm-commits mailing list