[thunderbird-lightning/el6] Update thunderbird/xulrunner patches from EL6 TB
Orion Poplawski
orion at fedoraproject.org
Sat Dec 14 23:27:06 UTC 2013
commit 38ea13b2f41b7b168ad1076cf49a214624bfe752
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Sat Dec 14 16:27:12 2013 -0700
Update thunderbird/xulrunner patches from EL6 TB
mozilla-694594-gcc-4.4.patch | 12 ----
mozilla-abort.patch | 11 ----
mozilla-build.patch | 21 +++----
mozilla-gtk-close.patch | 12 ----
thunderbird-lightning.spec | 15 -----
xulrunner-2.0-chromium-types.patch | 29 ++++-----
xulrunner-nasm-webm.patch | 58 -------------------
xulrunner-pagesize-ia64.patch | 109 ------------------------------------
xulrunner-secarch.patch | 91 ------------------------------
9 files changed, 22 insertions(+), 336 deletions(-)
---
diff --git a/mozilla-build.patch b/mozilla-build.patch
index 9468e02..1dd29d0 100644
--- a/mozilla-build.patch
+++ b/mozilla-build.patch
@@ -1,20 +1,17 @@
-diff -up mozilla-aurora-7676a9a06403/security/build/Makefile.in.build mozilla-aurora-7676a9a06403/security/build/Makefile.in
---- mozilla-aurora-7676a9a06403/security/build/Makefile.in.build 2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/security/build/Makefile.in 2012-09-18 10:58:45.560063613 +0200
-@@ -139,7 +139,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+--- 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=
DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
- ifndef MOZ_NATIVE_SQLITE
- DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
-diff -up mozilla-aurora-7676a9a06403/security/manager/Makefile.in.build mozilla-aurora-7676a9a06403/security/manager/Makefile.in
-diff -up mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in.build mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in
---- mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in.build 2012-09-13 14:18:35.000000000 +0200
-+++ mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in 2012-09-18 10:54:16.310505794 +0200
-@@ -84,7 +84,6 @@ CSRCS += md4.c
- EXTRA_DEPS = $(NSS_DEP_LIBS)
+ 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
DEFINES += \
- -DNSS_ENABLE_ECC \
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 52335b2..792d31e 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -53,16 +53,7 @@ Patch1: mozilla-build-arm.patch
Patch2: xulrunner-10.0-secondary-ipc.patch
Patch099: mozilla-build.patch
Patch100: xulrunner-2.0-chromium-types.patch
-Patch101: mozilla-abort.patch
Patch103: xulrunner-gc-sections-ppc.patch
-Patch104: mozilla-694594-gcc-4.4.patch
-Patch105: mozilla-gtk-close.patch
-Patch106: xulrunner-nasm-webm.patch
-Patch107: xulrunner-secarch.patch
-
-# This is fix for ia64 jemmaloc, ia64 and ppc js
-Patch206: xulrunner-pagesize-ia64.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
@@ -138,13 +129,7 @@ cd mozilla
%patch2 -p3 -b .secondary-ipc
%patch099 -p1 -b .build
%patch100 -p2 -b .chromium-types
-%patch101 -p1 -b .abort
-%patch104 -p1 -b .gcc-4.4
-%patch105 -p1 -b .gtk-close
-%patch106 -p0 -b .nasm
-%patch107 -p2 -b .secarch
-%patch206 -p2 -b .pagesize-ia64
%patch103 -p2 -b .gc-sections
cd ..
diff --git a/xulrunner-2.0-chromium-types.patch b/xulrunner-2.0-chromium-types.patch
index a350b41..2b3db8c 100644
--- a/xulrunner-2.0-chromium-types.patch
+++ b/xulrunner-2.0-chromium-types.patch
@@ -1,34 +1,31 @@
-diff -up xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h
---- xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2011-06-15 23:57:26.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h 2011-06-29 08:23:46.807314175 +0200
-@@ -61,10 +61,14 @@ typedef PRInt16 int16;
+diff -up xulrunner-17.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-17.0/mozilla-release/gfx/ycbcr/chromium_types.h
+--- xulrunner-17.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2012-11-16 20:56:29.000000000 +0100
++++ xulrunner-17.0/mozilla-release/gfx/ycbcr/chromium_types.h 2012-11-20 09:19:14.843448418 +0100
+@@ -30,7 +30,11 @@ typedef int16_t int16;
#define ARCH_CPU_ARM_FAMILY 1
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__)
-+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
+#elif defined(__powerpc64__)
+#define ARCH_CPU_PPC_FAMILY 1
+#define ARCH_CPU_PPC 1
+#define ARCH_CPU_64_BITS 1
- #elif defined(__sparc)
- #define ARCH_CPU_SPARC_FAMILY 1
- #define ARCH_CPU_SPARC 1
-@@ -73,6 +77,14 @@ typedef PRInt16 int16;
++#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
+ #define ARCH_CPU_PPC_FAMILY 1
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
+@@ -42,6 +46,14 @@ typedef int16_t int16;
#define ARCH_CPU_SPARC_FAMILY 1
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_64_BITS 1
-+#elif defined(__s390__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390 1
-+#define ARCH_CPU_32_BITS 1
+#elif defined(__s390x__)
+#define ARCH_CPU_S390_FAMILY 1
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_64_BITS 1
++#elif defined(__s390__)
++#define ARCH_CPU_S390_FAMILY 1
++#define ARCH_CPU_S390 1
++#define ARCH_CPU_32_BITS 1
#else
#warning Please add support for your architecture in chromium_types.h
#endif
More information about the scm-commits
mailing list