diff --git a/.gitignore b/.gitignore
index 18efdd7..8b7b44b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-SOURCES/Python-2.7.8.tgz
-SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
-SOURCES/gcc48-4.8.2-16.el5.src.rpm
-SOURCES/l10n-lightning-52.9.1.tar.xz
-SOURCES/thunderbird-52.9.1.source.tar.xz
-SOURCES/thunderbird-langpacks-52.9.1-20180710.tar.xz
+SOURCES/Python-2.7.13.tar.xz
+SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
+SOURCES/libffi-3.0.13-18.el7_3.src.rpm
+SOURCES/lightning-langpacks-60.3.0.tar.xz
+SOURCES/thunderbird-60.3.0.source.tar.xz
+SOURCES/thunderbird-langpacks-60.3.0-20181031.tar.xz
SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 3032f1c..a884d86 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,7 +1,7 @@
-511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz
-467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
-e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm
-ed6d0db71651bbeea5b0f1f38f1b9e131c3c2f04 SOURCES/l10n-lightning-52.9.1.tar.xz
-9970d78084fe979f568ea00bf06b8e81a738e630 SOURCES/thunderbird-52.9.1.source.tar.xz
-92d894048ee4f8c9998af04f73e0d2cad27df00a SOURCES/thunderbird-langpacks-52.9.1-20180710.tar.xz
+18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
+0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
+e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
+b2961b9976d2970e3149f22bfeabd7437ecce3d4 SOURCES/lightning-langpacks-60.3.0.tar.xz
+3cfe85983a12f347d98407df3fdf2a13fa829bcd SOURCES/thunderbird-60.3.0.source.tar.xz
+3e12fbb6b37a8c14ee341ddc29ac3fb182d3aef2 SOURCES/thunderbird-langpacks-60.3.0-20181031.tar.xz
77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/build-aarch64-skia.patch b/SOURCES/build-aarch64-skia.patch
new file mode 100644
index 0000000..1ecad24
--- /dev/null
+++ b/SOURCES/build-aarch64-skia.patch
@@ -0,0 +1,12 @@
+diff -up firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp
+--- firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-06-20 09:19:11.411939714 +0200
++++ firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-06-20 09:23:36.831919894 +0200
+@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/SOURCES/build-big-endian.patch b/SOURCES/build-big-endian.patch
new file mode 100644
index 0000000..e8ec439
--- /dev/null
+++ b/SOURCES/build-big-endian.patch
@@ -0,0 +1,84 @@
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h 2018-04-18 11:51:38.748680174 +0200
+@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
+ *
+ * Here we enforce this constraint.
+ */
+-
++/*
+ #ifdef SK_CPU_BENDIAN
+ #define SK_RGBA_R32_SHIFT 24
+ #define SK_RGBA_G32_SHIFT 16
+ #define SK_RGBA_B32_SHIFT 8
+ #define SK_RGBA_A32_SHIFT 0
+ #else
++*/
+ #define SK_RGBA_R32_SHIFT 0
+ #define SK_RGBA_G32_SHIFT 8
+ #define SK_RGBA_B32_SHIFT 16
+ #define SK_RGBA_A32_SHIFT 24
+-#endif
++/*#endif*/
+
+ #define SkGetPackedA32(packed) ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
+ #define SkGetPackedR32(packed) ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h 2018-04-18 11:51:38.748680174 +0200
+@@ -84,7 +84,8 @@ enum SkColorType {
+ #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+ kN32_SkColorType = kRGBA_8888_SkColorType,
+ #else
+- #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
++ //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
++ kN32_SkColorType = kBGRA_8888_SkColorType
+ #endif
+ };
+
+diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
+--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h 2018-04-18 11:51:38.748680174 +0200
+@@ -344,15 +344,13 @@ enum GrPixelConfig {
+ static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
+
+ // Aliases for pixel configs that match skia's byte order.
+-#ifndef SK_CPU_LENDIAN
+- #error "Skia gpu currently assumes little endian"
+-#endif
+ #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
+ #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+ static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
+ #else
+- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
++ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
++ static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
+ #endif
+
+ /**
+diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
+--- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian 2018-04-18 13:42:06.980476156 +0200
++++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h 2018-04-18 13:42:50.493520552 +0200
+@@ -31,18 +31,19 @@
+ *
+ * Here we enforce this constraint.
+ */
+-
++/*
+ #ifdef SK_CPU_BENDIAN
+ #define SK_BGRA_B32_SHIFT 24
+ #define SK_BGRA_G32_SHIFT 16
+ #define SK_BGRA_R32_SHIFT 8
+ #define SK_BGRA_A32_SHIFT 0
+ #else
++*/
+ #define SK_BGRA_B32_SHIFT 0
+ #define SK_BGRA_G32_SHIFT 8
+ #define SK_BGRA_R32_SHIFT 16
+ #define SK_BGRA_A32_SHIFT 24
+-#endif
++//#endif
+
+ #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
+ #error "can't define PMCOLOR to be RGBA and BGRA"
diff --git a/SOURCES/build-debug-qcms.patch b/SOURCES/build-debug-qcms.patch
new file mode 100644
index 0000000..a65223a
--- /dev/null
+++ b/SOURCES/build-debug-qcms.patch
@@ -0,0 +1,12 @@
+diff -up firefox-60.0/gfx/qcms/transform-altivec.c.debug firefox-60.0/gfx/qcms/transform-altivec.c
+--- firefox-60.0/gfx/qcms/transform-altivec.c.debug 2018-05-15 09:26:43.603043100 +0200
++++ firefox-60.0/gfx/qcms/transform-altivec.c 2018-05-15 09:28:57.302385632 +0200
+@@ -30,7 +30,7 @@
+ static const ALIGN float floatScaleX4 = FLOATSCALE;
+ static const ALIGN float clampMaxValueX4 = CLAMPMAXVAL;
+
+-inline vector float load_aligned_float(float *dataPtr)
++static vector float load_aligned_float(float *dataPtr)
+ {
+ vector float data = vec_lde(0, dataPtr);
+ vector unsigned char moveToStart = vec_lvsl(0, dataPtr);
diff --git a/SOURCES/build-disable-elfhack.patch b/SOURCES/build-disable-elfhack.patch
new file mode 100644
index 0000000..11e6a54
--- /dev/null
+++ b/SOURCES/build-disable-elfhack.patch
@@ -0,0 +1,12 @@
+diff -up firefox-62.0.2/toolkit/moz.configure.elfhack firefox-62.0.2/toolkit/moz.configure
+--- firefox-62.0.2/toolkit/moz.configure.elfhack 2018-09-27 14:32:56.549507561 +0200
++++ firefox-62.0.2/toolkit/moz.configure 2018-09-27 14:33:08.219532121 +0200
+@@ -1195,7 +1195,7 @@ with only_when(has_elfhack):
+ option('--disable-elf-hack', help='Disable elf hacks')
+
+ set_config('USE_ELF_HACK',
+- depends_if('--enable-elf-hack')(lambda _: True))
++ depends_if('--enable-elf-hack')(lambda _: False))
+
+
+ @depends(check_build_environment)
diff --git a/SOURCES/build-fix-dupes.patch b/SOURCES/build-fix-dupes.patch
deleted file mode 100644
index 7782dee..0000000
--- a/SOURCES/build-fix-dupes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up thunderbird-52.0/mail/installer/Makefile.in.fix-dupes thunderbird-52.0/mail/installer/Makefile.in
---- thunderbird-52.0/mail/installer/Makefile.in.fix-dupes 2017-04-04 13:06:17.414621079 +0200
-+++ thunderbird-52.0/mail/installer/Makefile.in 2017-04-04 13:06:24.397611123 +0200
-@@ -15,6 +15,7 @@ ifndef SYSTEM_LIBXUL
- MOZ_PKG_FATAL_WARNINGS = 1
- endif
- MOZ_PKG_DUPEFLAGS = \
-+ -w \
- -f $(srcdir)/allowed-dupes.mn \
- -f $(MOZILLA_DIR)/browser/installer/allowed-dupes.mn \
- $(NULL)
diff --git a/SOURCES/build-gdk-version.patch b/SOURCES/build-gdk-version.patch
new file mode 100644
index 0000000..a25b255
--- /dev/null
+++ b/SOURCES/build-gdk-version.patch
@@ -0,0 +1,19 @@
+diff -up mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/old-configure.in.gdk-version mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/old-configure.in
+--- mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/old-configure.in.gdk-version 2018-03-10 03:54:17.000000000 +0100
++++ mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/old-configure.in 2018-03-28 13:11:06.294873487 +0200
+@@ -61,6 +61,7 @@ CAIRO_VERSION=1.10
+ GTK2_VERSION=2.18.0
+ GTK3_VERSION=3.4.0
+ GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4
++GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4
+ WINDRES_VERSION=2.14.90
+ W32API_VERSION=3.14
+ GCONF_VERSION=1.2.1
+@@ -2173,6 +2174,7 @@ if test "$COMPILE_ENVIRONMENT"; then
+ dnl GDK_VERSION_MIN_REQUIRED is not set here as GDK3 deprecated warnings
+ dnl are suppressed by widget/gtk/compat-gtk3/gdk/gdkversionmacros.h.
+ AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED)
++ AC_DEFINE_UNQUOTED(GDK_VERSION_MIN_REQUIRED,$GDK_VERSION_MIN_REQUIRED)
+ GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32
+ fi
+ if test "$MOZ_WIDGET_TOOLKIT" = gtk2; then
diff --git a/SOURCES/build-icu-big-endian.patch b/SOURCES/build-icu-big-endian.patch
index 68fbea1..c26a4d4 100644
--- a/SOURCES/build-icu-big-endian.patch
+++ b/SOURCES/build-icu-big-endian.patch
@@ -1,6 +1,6 @@
-diff -up mozilla-aurora/build/autoconf/icu.m4.icu-endian mozilla-aurora/build/autoconf/icu.m4
---- mozilla-aurora/build/autoconf/icu.m4.icu-endian 2016-12-09 09:11:01.227317790 +0100
-+++ mozilla-aurora/build/autoconf/icu.m4 2016-12-09 09:18:40.608712247 +0100
+diff -up firefox-60.0/build/autoconf/icu.m4.icu firefox-60.0/build/autoconf/icu.m4
+--- firefox-60.0/build/autoconf/icu.m4.icu 2018-04-17 15:11:54.100644119 +0200
++++ firefox-60.0/build/autoconf/icu.m4 2018-04-17 15:12:50.740686636 +0200
@@ -78,7 +78,7 @@ if test -n "$USE_ICU"; then
# TODO: the l is actually endian-dependent
# We could make this set as 'l' or 'b' for little or big, respectively,
@@ -8,5 +8,5 @@ diff -up mozilla-aurora/build/autoconf/icu.m4.icu-endian mozilla-aurora/build/au
- ICU_DATA_FILE="icudt${version}l.dat"
+ ICU_DATA_FILE="icudt${version}b.dat"
- dnl We won't build ICU data as a separate file when building
- dnl JS standalone so that embedders don't have to deal with it.
+ MOZ_ICU_DATA_ARCHIVE=
+ fi
diff --git a/SOURCES/build-jit-atomic-always-lucky.patch b/SOURCES/build-jit-atomic-always-lucky.patch
new file mode 100644
index 0000000..31bc5ec
--- /dev/null
+++ b/SOURCES/build-jit-atomic-always-lucky.patch
@@ -0,0 +1,30 @@
+diff -up firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky firefox-57.0b5/js/src/jit/AtomicOperations.h
+--- firefox-57.0b5/js/src/jit/AtomicOperations.h.jit-atomic-lucky 2017-10-06 12:34:02.338973607 +0200
++++ firefox-57.0b5/js/src/jit/AtomicOperations.h 2017-10-06 12:38:24.632622215 +0200
+@@ -415,7 +415,7 @@ AtomicOperations::isLockfreeJS(int32_t s
+ #elif defined(__s390__) || defined(__s390x__)
+ # include "jit/none/AtomicOperations-feeling-lucky.h"
+ #else
+-# error "No AtomicOperations support provided for this platform"
++# include "jit/none/AtomicOperations-feeling-lucky.h"
+ #endif
+
+ #endif // jit_AtomicOperations_h
+diff -up firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h
+--- firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h.jit-atomic-lucky 2017-09-19 06:18:28.000000000 +0200
++++ firefox-57.0b5/js/src/jit/none/AtomicOperations-feeling-lucky.h 2017-10-06 12:34:02.338973607 +0200
+@@ -79,6 +79,14 @@
+ # define GNUC_COMPATIBLE
+ #endif
+
++#ifdef __s390__
++# define GNUC_COMPATIBLE
++#endif
++
++#ifdef __s390x__
++# define GNUC_COMPATIBLE
++#endif
++
+ // The default implementation tactic for gcc/clang is to use the newer
+ // __atomic intrinsics added for use in C++11 <atomic>. Where that
+ // isn't available, we use GCC's older __sync functions instead.
diff --git a/SOURCES/build-missing-getrandom.patch b/SOURCES/build-missing-getrandom.patch
deleted file mode 100644
index 3a4adde..0000000
--- a/SOURCES/build-missing-getrandom.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up firefox-52.0b8/js/src/jsmath.cpp.missing-getrandom firefox-52.0b8/js/src/jsmath.cpp
---- firefox-52.0b8/js/src/jsmath.cpp.missing-getrandom 2017-02-22 08:09:21.764353407 +0100
-+++ firefox-52.0b8/js/src/jsmath.cpp 2017-02-22 08:10:36.939330775 +0100
-@@ -78,7 +78,7 @@
- static_assert(GETRANDOM_NR == SYS_getrandom,
- "GETRANDOM_NR should match the actual SYS_getrandom value");
- # endif
--# else
-+# elif defined(GETRANDOM_NR)
- # define SYS_getrandom GETRANDOM_NR
- # endif
-
-@@ -721,7 +721,7 @@ js::GenerateRandomSeed()
- seed = (static_cast<uint64_t>(arc4random()) << 32) | arc4random();
- #elif defined(XP_UNIX)
- bool done = false;
--# if defined(__linux__)
-+# if defined(__linux__) && defined(SYS_getrandom)
- // Try the relatively new getrandom syscall first. It's the preferred way
- // on Linux as /dev/urandom may not work inside chroots and is harder to
- // sandbox (see bug 995069).
diff --git a/SOURCES/build-mozconfig-fix.patch b/SOURCES/build-mozconfig-fix.patch
new file mode 100644
index 0000000..91dffb1
--- /dev/null
+++ b/SOURCES/build-mozconfig-fix.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py.mozconfig-fix mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py
+--- mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py.mozconfig-fix 2018-03-13 17:22:19.018466884 +0100
++++ mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175/python/mozbuild/mozbuild/mozconfig.py 2018-03-13 17:23:57.379559640 +0100
+@@ -446,7 +446,7 @@ class MozconfigLoader(object):
+ value = value[1:]
+
+ # Lines with a quote not ending in a quote are multi-line.
+- if has_quote and not value.endswith("'"):
++ if has_quote and not value.endswith(("'", ";")):
+ in_variable = name
+ current.append(value)
+ continue
diff --git a/SOURCES/build-nss-prbool.patch b/SOURCES/build-nss-prbool.patch
deleted file mode 100644
index 491b2e1..0000000
--- a/SOURCES/build-nss-prbool.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up firefox-52.0esr/security/certverifier/CTLogVerifier.cpp.nss-prbool firefox-52.0esr/security/certverifier/CTLogVerifier.cpp
---- firefox-52.0esr/security/certverifier/CTLogVerifier.cpp.nss-prbool 2017-02-28 02:56:03.000000000 +0100
-+++ firefox-52.0esr/security/certverifier/CTLogVerifier.cpp 2017-03-01 11:34:15.623577628 +0100
-@@ -7,6 +7,7 @@
- #include "CTLogVerifier.h"
-
- #include "CTSerialization.h"
-+#include "prtypes.h"
- #include "hasht.h"
- #include "mozilla/ArrayUtils.h"
- #include "mozilla/Assertions.h"
-diff -up firefox-52.0esr/security/manager/ssl/nsSSLStatus.cpp.nss-prbool firefox-52.0esr/security/manager/ssl/nsSSLStatus.cpp
---- firefox-52.0esr/security/manager/ssl/nsSSLStatus.cpp.nss-prbool 2017-03-01 12:09:16.649945106 +0100
-+++ firefox-52.0esr/security/manager/ssl/nsSSLStatus.cpp 2017-03-01 12:09:35.749939355 +0100
-@@ -4,6 +4,7 @@
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-+#include "prtypes.h"
- #include "mozilla/Casting.h"
- #include "nsSSLStatus.h"
- #include "nsIClassInfoImpl.h"
diff --git a/SOURCES/build-nss-version.patch b/SOURCES/build-nss-version.patch
index 42f375d..734005d 100644
--- a/SOURCES/build-nss-version.patch
+++ b/SOURCES/build-nss-version.patch
@@ -1,12 +1,12 @@
-diff -up firefox-52.0esr/old-configure.in.nss-ver firefox-52.0esr/old-configure.in
---- firefox-52.0esr/old-configure.in.nss-ver 2017-03-01 10:12:54.668047060 +0100
-+++ firefox-52.0esr/old-configure.in 2017-03-01 10:13:01.733044933 +0100
-@@ -2123,7 +2123,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
+diff -up firefox-60.1.0/old-configure.in.nss-version firefox-60.1.0/old-configure.in
+--- firefox-60.1.0/old-configure.in.nss-version 2018-06-20 14:24:55.204158540 +0200
++++ firefox-60.1.0/old-configure.in 2018-06-20 14:30:19.517004230 +0200
+@@ -1768,7 +1768,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
-- AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+ AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+- AM_PATH_NSS(3.36.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
++ AM_PATH_NSS(3.36.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
- if test -n "$MOZ_SYSTEM_NSS"; then
+ if test -z "$MOZ_SYSTEM_NSS"; then
diff --git a/SOURCES/build-s390-atomic.patch b/SOURCES/build-s390-atomic.patch
deleted file mode 100644
index 3624b98..0000000
--- a/SOURCES/build-s390-atomic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up mozilla-aurora/js/src/jit/AtomicOperations.h.s390-atomic mozilla-aurora/js/src/jit/AtomicOperations.h
---- mozilla-aurora/js/src/jit/AtomicOperations.h.s390-atomic 2016-11-15 12:22:38.000000000 +0100
-+++ mozilla-aurora/js/src/jit/AtomicOperations.h 2016-12-08 15:36:11.792439891 +0100
-@@ -341,6 +341,9 @@ AtomicOperations::isLockfree(int32_t siz
- # include "jit/none/AtomicOperations-ppc.h"
- # elif defined(__aarch64__)
- # include "jit/arm64/AtomicOperations-arm64.h"
-+# elif defined(__s390__)
-+ // Also works with ppc atomic operations
-+# include "jit/none/AtomicOperations-ppc.h"
- # else
- # include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
- # endif
diff --git a/SOURCES/build-s390-missing-include.patch b/SOURCES/build-s390-missing-include.patch
deleted file mode 100644
index 59157e6..0000000
--- a/SOURCES/build-s390-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up firefox-52.1.0esr/dom/filesystem/compat/FileSystemDirectoryReader.h.s390-build-includes-fix firefox-52.1.0esr/dom/filesystem/compat/FileSystemDirectoryReader.h
---- firefox-52.1.0esr/dom/filesystem/compat/FileSystemDirectoryReader.h.s390-build-includes-fix 2017-04-12 09:31:39.419402551 +0200
-+++ firefox-52.1.0esr/dom/filesystem/compat/FileSystemDirectoryReader.h 2017-04-12 09:31:53.392340589 +0200
-@@ -11,6 +11,7 @@
- #include "mozilla/ErrorResult.h"
- #include "mozilla/dom/BindingDeclarations.h"
- #include "nsCycleCollectionParticipant.h"
-+#include "mozilla/dom/FileSystemDirectoryEntry.h"
- #include "nsWrapperCache.h"
-
- namespace mozilla {
diff --git a/SOURCES/firefox-disable-dbus-remote.patch b/SOURCES/firefox-disable-dbus-remote.patch
new file mode 100644
index 0000000..33b21cb
--- /dev/null
+++ b/SOURCES/firefox-disable-dbus-remote.patch
@@ -0,0 +1,36 @@
+diff -up firefox-60.1.0/toolkit/components/remote/moz.build.disable-dbus-remote firefox-60.1.0/toolkit/components/remote/moz.build
+--- firefox-60.1.0/toolkit/components/remote/moz.build.disable-dbus-remote 2018-06-21 09:29:35.975729500 +0200
++++ firefox-60.1.0/toolkit/components/remote/moz.build 2018-06-21 09:29:53.863631963 +0200
+@@ -22,11 +22,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']
+ 'nsGTKRemoteService.cpp',
+ 'nsRemoteService.cpp',
+ ]
+- if CONFIG['MOZ_ENABLE_DBUS']:
+- SOURCES += [
+- 'nsDBusRemoteService.cpp',
+- ]
+- CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+
+ FINAL_LIBRARY = 'xul'
+
+diff -up firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp.disable-dbus-remote firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp
+--- firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp.disable-dbus-remote 2018-06-19 22:35:27.000000000 +0200
++++ firefox-60.1.0/toolkit/components/remote/nsRemoteService.cpp 2018-06-21 09:30:24.949462465 +0200
+@@ -6,7 +6,7 @@
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #include "nsGTKRemoteService.h"
+-#ifdef MOZ_ENABLE_DBUS
++#if 0 // Disable DBus remote
+ #include "nsDBusRemoteService.h"
+ #endif
+ #include "nsRemoteService.h"
+@@ -34,7 +34,7 @@ NS_IMPL_ISUPPORTS(nsRemoteService,
+ NS_IMETHODIMP
+ nsRemoteService::Startup(const char* aAppName, const char* aProfileName)
+ {
+-#if defined(MOZ_ENABLE_DBUS)
++#if 0 // Disable DBus remote
+ nsresult rv;
+ mDBusRemoteService = new nsDBusRemoteService();
+ rv = mDBusRemoteService->Startup(aAppName, aProfileName);
diff --git a/SOURCES/firefox-enable-addons.patch b/SOURCES/firefox-enable-addons.patch
new file mode 100644
index 0000000..15d0707
--- /dev/null
+++ b/SOURCES/firefox-enable-addons.patch
@@ -0,0 +1,13 @@
+diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js
+--- firefox-55.0/browser/app/profile/firefox.js.addons 2017-08-02 10:58:30.566363833 +0200
++++ firefox-55.0/browser/app/profile/firefox.js 2017-08-02 10:59:15.377216959 +0200
+@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url"
+
+ // Disable add-ons that are not installed by the user in all scopes by default.
+ // See the SCOPE constants in AddonManager.jsm for values to use here.
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
++pref("extensions.showMismatchUI", false);
+ // Scopes to scan for changes at startup.
+ pref("extensions.startupScanScopes", 0);
+
diff --git a/SOURCES/firefox-install-dir.patch b/SOURCES/firefox-install-dir.patch
deleted file mode 100644
index c962fa5..0000000
--- a/SOURCES/firefox-install-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mozilla-aurora/config/baseconfig.mk.orig mozilla-aurora/config/baseconfig.mk
---- mozilla-aurora/config/baseconfig.mk.orig 2014-05-06 13:17:17.000000000 +0200
-+++ mozilla-aurora/config/baseconfig.mk 2014-05-27 17:13:05.215503107 +0200
-@@ -4,7 +4,7 @@
- # 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)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist
diff --git a/SOURCES/firefox-ppc64le.patch b/SOURCES/firefox-ppc64le.patch
deleted file mode 100644
index 45fe1bc..0000000
--- a/SOURCES/firefox-ppc64le.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h.ppc64le firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h
---- firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h.ppc64le 2015-02-20 03:01:40.000000000 +0100
-+++ firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h 2015-03-06 15:52:58.298050379 +0100
-@@ -90,6 +90,13 @@
- #endif
-
- //////////////////////////////////////////////////////////////////////
-+#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
-+ #if defined(__BIG_ENDIAN__)
-+ #define SK_CPU_BENDIAN
-+ #elif defined(__LITTLE_ENDIAN__)
-+ #define SK_CPU_LENDIAN
-+ #endif
-+#endif
-
- #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
- #if defined(__sparc) || defined(__sparc__) || \
-diff -up firefox-36.0/mozilla-release/js/src/jsdtoa.cpp.ppc64le firefox-36.0/mozilla-release/js/src/jsdtoa.cpp
---- firefox-36.0/mozilla-release/js/src/jsdtoa.cpp.ppc64le 2015-02-20 03:01:49.000000000 +0100
-+++ firefox-36.0/mozilla-release/js/src/jsdtoa.cpp 2015-03-06 15:54:38.348048226 +0100
-@@ -52,6 +52,7 @@ static inline void dtoa_free(void* p) {
- #define MALLOC dtoa_malloc
- #define FREE dtoa_free
- #include "dtoa.c"
-+#undef CONST
-
- /* Mapping of JSDToStrMode -> js_dtoa mode */
- static const uint8_t dtoaModes[] = {
diff --git a/SOURCES/get-calendar-langpacks.sh b/SOURCES/get-calendar-langpacks.sh
new file mode 100755
index 0000000..d3f5e86
--- /dev/null
+++ b/SOURCES/get-calendar-langpacks.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+#set -x
+set -e
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script downloads calendar langpacks for Thunderbird.
+
+OPTIONS:
+ -h Show this message
+ -v Version string (7.0.1)
+ -b Build number (1, 2, 3)
+ -r Reuse downloaded files (when you don't want to redownload)
+EOF
+}
+
+VER=
+BUILDNUM=
+LANG_DATE=`date "+%Y%m%d"`
+while getopts “hv:b:r” OPTION
+do
+ case $OPTION in
+ h)
+ usage
+ exit 1
+ ;;
+ v)
+ VER=$OPTARG
+ ;;
+ b)
+ BUILDNUM=$OPTARG
+ ;;
+ ?)
+ usage
+ exit
+ ;;
+ esac
+done
+
+if [ -z "$VER" -o -z "$BUILDNUM" ]
+then
+ echo "Missing version or build number."
+ usage
+ exit 1
+fi
+
+WHITE='\033[1;33m'
+NC='\033[0m' # No Color
+
+LOCALES=`curl -f https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/ | grep "a href"|sed -e "s|.*/\([^/]*\)/\".*|\1|"|tail -n+2 |grep -v xpi`
+#echo $LOCALES
+rm -rf lightning-langpacks
+mkdir -p lightning-langpacks
+cd lightning-langpacks
+LOCALE_COUNT=`echo $LOCALES| tr ' ' '\n' | wc -l`
+LOCALE_NUM=0
+for lang in $LOCALES; do
+ LOCALE_NUM=$((LOCALE_NUM+1))
+ echo -e "${WHITE}Processing calendar locale: $lang ($LOCALE_NUM/$LOCALE_COUNT)${NC}"
+ mkdir -p extracted_lightning
+ mkdir -p calendar-locales
+ #echo Downloading TB binary for locale: $lang
+ wget --quiet https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/$lang/thunderbird-$VER.tar.bz2
+
+ cd extracted_lightning
+ tar -xf ../thunderbird-$VER.tar.bz2 thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
+ set +e
+ unzip -qq thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
+ set -e
+ LIGHTNING_VERSION=`cat app.ini |grep "^Version="|sed -e 's/Version=//'`
+ BUILD_ID=`cat app.ini |grep "^BuildID="|sed -e 's/BuildID=//'`
+ MAX_VERSION=`cat app.ini |grep MaxVersion|sed -e s/MaxVersion=//`
+ MIN_VERSION=`cat app.ini |grep MinVersion|sed -e s/MinVersion=//`
+ rm -rf thunderbird
+ mkdir -p ../calendar-locales/chrome
+ cp -r chrome/calendar-$lang ../calendar-locales/chrome
+ cp -r chrome/lightning-$lang ../calendar-locales/chrome
+ cd -
+
+ cd calendar-locales
+ # create manifest
+ cat > manifest.json <<EOL
+{
+ "languages": {
+ "$lang": {
+ "chrome_resources": {
+ "calendar": "chrome/calendar-$lang/locale/$lang/calendar/",
+ "lightning": "chrome/lightning-$lang/locale/$lang/lightning/"
+ },
+ "version": "$LIGHTNING_VERSION"
+ }
+ },
+ "applications": {
+ "gecko": {
+ "strict_min_version": "$MIN_VERSION",
+ "id": "langpack-cal-$lang@lightning.mozilla.org",
+ "strict_max_version": "$MAX_VERSION"
+ }
+ },
+ "langpack_id": "$lang",
+ "version": "$LIGHTNING_VERSION$BUILD_ID",
+ "name": "$lang Language Pack Calendar",
+ "manifest_version": 2,
+ "sources": {
+ "browser": {
+ "base_path": "browser/"
+ }
+ },
+ "author": "Mozilla.cz (contributors: Pavel Cvrček, Pavel Franc, Michal Stanke, Michal Vašíček)",
+ "description": "Language pack for Thunderbird for $lang, this was repacked by Fedora/RHEL package maintainer from original binaries."
+}
+
+EOL
+ zip --quiet -r ../langpack-cal-$lang@lightning.mozilla.org.xpi *
+ cd -
+ rm -rf calendar-locales
+ rm -rf extracted_lightning
+
+ rm -f thunderbird-$VER.tar.bz2
+done
+echo "Creating lightning-langpacks-$VER.tar.xz..."
+tar cJf ../lightning-langpacks-$VER.tar.xz *.xpi
+cd ..
+rm -rf lightning-langpacks
diff --git a/SOURCES/google-api-key b/SOURCES/google-api-key
new file mode 100644
index 0000000..b95d189
--- /dev/null
+++ b/SOURCES/google-api-key
@@ -0,0 +1 @@
+AIzaSyBPGXa4AYD4FC3HJK7LnIKxm4fDusVuuco
diff --git a/SOURCES/gtk3-private-3.22.26-1-files.inc b/SOURCES/gtk3-private-3.22.26-1-files.inc
new file mode 100644
index 0000000..8e1e31a
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-files.inc
@@ -0,0 +1,54 @@
+%dir %{gtk3_install_path}/bin
+%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
+%{gtk3_install_path}/bin/gdk-pixbuf-thumbnailer
+%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits}
+%{gtk3_install_path}/bin/glib-compile-schemas
+%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits}
+%{gtk3_install_path}/bin/gtk-update-icon-cache
+%{gtk3_install_path}/bin/fc-cache
+
+%{gtk3_install_path}/etc
+
+%dir %{gtk3_install_path}/%{_lib}
+%{gtk3_install_path}/%{_lib}/libatk-1.0.so.*
+%{gtk3_install_path}/%{_lib}/libatk-bridge-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libatspi.so.*
+%{gtk3_install_path}/%{_lib}/libcairo.so.*
+%{gtk3_install_path}/%{_lib}/libcairo-gobject.so.*
+%{gtk3_install_path}/%{_lib}/libfontconfig.so.*
+%{gtk3_install_path}/%{_lib}/libfreetype.so.*
+%{gtk3_install_path}/%{_lib}/libgdk-3.so.*
+%{gtk3_install_path}/%{_lib}/libgdk_pixbuf-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libgio-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libglib-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libgmodule-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libgobject-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libgthread-2.0.so.*
+%{gtk3_install_path}/%{_lib}/libgtk-3.so.*
+%{gtk3_install_path}/%{_lib}/libharfbuzz.so.*
+%{gtk3_install_path}/%{_lib}/libpango-1.0.so.*
+%{gtk3_install_path}/%{_lib}/libpangocairo-1.0.so.*
+%{gtk3_install_path}/%{_lib}/libpangoft2-1.0.so.*
+%{gtk3_install_path}/%{_lib}/libpcre.so.*
+%{gtk3_install_path}/%{_lib}/librsvg-2.so.*
+%dir %{gtk3_install_path}/%{_lib}/cairo
+%{gtk3_install_path}/%{_lib}/cairo/cairo-fdr.so.*
+%{gtk3_install_path}/%{_lib}/cairo/cairo-sphinx.so.*
+%{gtk3_install_path}/%{_lib}/cairo/libcairo-trace.so.*
+%{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0
+%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+%{gtk3_install_path}/%{_lib}/gio
+%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gio/modules/giomodule.cache
+%{gtk3_install_path}/%{_lib}/gtk-3.0
+%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gtk-3.0/3.0.0/immodules.cache
+
+%{gtk3_install_path}/libexec
+
+%{gtk3_install_path}/share
+%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/Adwaita/icon-theme.cache
+%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/hicolor/icon-theme.cache
+%ghost %attr(644, root, root) %{gtk3_install_path}/share/glib-2.0/schemas/gschemas.compiled
+
+%{gtk3_install_path}/var
+%dir %{gtk3_install_path}/var/cache/fontconfig
+
diff --git a/SOURCES/gtk3-private-3.22.26-1-post.inc b/SOURCES/gtk3-private-3.22.26-1-post.inc
new file mode 100644
index 0000000..04acf06
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-post.inc
@@ -0,0 +1,23 @@
+# adwaita-icon-theme
+touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
+touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
+%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
+
+# glib2
+%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
+
+# gtk3
+%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
+%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :
+
+# fontconfig
+umask 0022
+
+# Force regeneration of all fontconfig cache files
+# The check for existance is needed on dual-arch installs (the second
+# copy of fontconfig might install the binary instead of the first)
+# The HOME setting is to avoid problems if HOME hasn't been reset
+# FIXME hardcoded version !
+if [ -x %{gtk3_install_path}/bin/fc-cache ] && %{gtk3_install_path}/bin/fc-cache --version 2>&1 | grep -q 2.10.95 ; then
+ HOME=/root %{gtk3_install_path}/bin/fc-cache -f
+fi
diff --git a/SOURCES/gtk3-private-3.22.26-1-posttrans.inc b/SOURCES/gtk3-private-3.22.26-1-posttrans.inc
new file mode 100644
index 0000000..8c5f2d7
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-posttrans.inc
@@ -0,0 +1,3 @@
+%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
+# adwaita
+%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
diff --git a/SOURCES/gtk3-private-3.22.26-1-postun.inc b/SOURCES/gtk3-private-3.22.26-1-postun.inc
new file mode 100644
index 0000000..3b5df73
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-postun.inc
@@ -0,0 +1,27 @@
+# adwaita
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null
+ touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null
+ %{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
+ %{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
+fi
+
+# gdk-pixbuf2
+if [ $1 -gt 0 ]; then
+ %{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
+fi
+
+# glib2
+[ ! -x %{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} ] || \
+%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
+
+# gtk3
+if [ $1 -gt 0 ]; then
+ %{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
+fi
+
+if [ $1 -eq 0 ] ; then
+ rm -rf %{gtk3_install_path}/var/cache/fontconfig/* &>/dev/null || :
+fi
+
+%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :
diff --git a/SOURCES/gtk3-private-3.22.26-1-requires-provides-filter.inc b/SOURCES/gtk3-private-3.22.26-1-requires-provides-filter.inc
new file mode 100644
index 0000000..f5fa495
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-requires-provides-filter.inc
@@ -0,0 +1,26 @@
+%filter_provides_in %{gtk3_install_path}/%{_lib}
+%filter_requires_in %{gtk3_install_path}/%{_lib}
+
+%filter_from_requires /libgdk-3.*/d
+%filter_from_requires /libatk-1.0.so.*/d
+%filter_from_requires /libatk-bridge-2.0.so.*/d
+%filter_from_requires /libatspi.so.*/d
+%filter_from_requires /libcairo.so.*/d
+%filter_from_requires /libcairo-gobject.so.*/d
+%filter_from_requires /libfontconfig.so.*/d
+%filter_from_requires /libfreetype.so.*/d
+%filter_from_requires /libgdk-3.so.*/d
+%filter_from_requires /libgdk_pixbuf-2.0.so.*/d
+%filter_from_requires /libgio-2.0.so.*/d
+%filter_from_requires /libglib-2.0.so.*/d
+%filter_from_requires /libgmodule-2.0.so.*/d
+%filter_from_requires /libgobject-2.0.so.*/d
+%filter_from_requires /libgthread-2.0.so.*/d
+%filter_from_requires /libgtk-3.so.*/d
+%filter_from_requires /libharfbuzz.so.*/d
+%filter_from_requires /libpango-1.0.so.*/d
+%filter_from_requires /libpangocairo-1.0.so.*/d
+%filter_from_requires /libpangoft2-1.0.so.*/d
+%filter_from_requires /libpcre.so.*/d
+
+# Don't forget to call %%filter_setup from the consumer!
diff --git a/SOURCES/gtk3-private-3.22.26-1-setup-flags-env.inc b/SOURCES/gtk3-private-3.22.26-1-setup-flags-env.inc
new file mode 100644
index 0000000..eb54164
--- /dev/null
+++ b/SOURCES/gtk3-private-3.22.26-1-setup-flags-env.inc
@@ -0,0 +1,34 @@
+%if "%{name}" == "gtk3-private"
+ function prepend_buildroot_include_path_to_compiler_flags() {
+ export CFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CFLAGS" \
+ export CXXFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CXXFLAGS"
+ }
+
+ prepend_buildroot_include_path_to_compiler_flags include
+ prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
+ prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
+ prepend_buildroot_include_path_to_compiler_flags include/gio-unix-2.0
+ prepend_buildroot_include_path_to_compiler_flags %{_lib}/glib-2.0/include
+ prepend_buildroot_include_path_to_compiler_flags include/freetype2
+ prepend_buildroot_include_path_to_compiler_flags include/fontconfig
+ prepend_buildroot_include_path_to_compiler_flags include/harfbuzz
+ prepend_buildroot_include_path_to_compiler_flags include/gdk-pixbuf-2.0
+ prepend_buildroot_include_path_to_compiler_flags include/atk-1.0
+ prepend_buildroot_include_path_to_compiler_flags include/at-spi-2.0
+ prepend_buildroot_include_path_to_compiler_flags include/at-spi2-atk/2.0
+ prepend_buildroot_include_path_to_compiler_flags include/cairo
+ prepend_buildroot_include_path_to_compiler_flags include/pango-1.0
+ prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
+ prepend_buildroot_include_path_to_compiler_flags include/cairo
+ prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0
+ prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0/unix-print
+ prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
+%else
+ sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/*.pc
+%endif
+
+export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
+
+export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
diff --git a/SOURCES/lightning-bad-langs.patch b/SOURCES/lightning-bad-langs.patch
deleted file mode 100644
index 933b400..0000000
--- a/SOURCES/lightning-bad-langs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up thunderbird-45.0/calendar/locales/shipped-locales.bad-langs thunderbird-45.0/calendar/locales/shipped-locales
---- thunderbird-45.0/calendar/locales/shipped-locales.bad-langs 2016-04-07 23:14:23.000000000 +0200
-+++ thunderbird-45.0/calendar/locales/shipped-locales 2016-04-14 13:14:16.853967318 +0200
-@@ -15,7 +15,6 @@ fy-NL
- ga-IE
- gd
- hu
--id
- is
- it
- ja linux win32
-@@ -24,7 +23,6 @@ lt
- nb-NO
- nl
- nn-NO
--pa-IN
- pl
- pt-PT
- ru
diff --git a/SOURCES/mklangsource.sh b/SOURCES/mklangsource.sh
deleted file mode 100755
index 289cdc0..0000000
--- a/SOURCES/mklangsource.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-# This checks out and builds the language sources. The lightning source needs
-# to already be unpacked
-#lver=`awk '/^%global *lightning_ver/ { print $3; exit }' thunderbird.spec`
-tbver=`awk '/^Version:/ { print $2; exit }' thunderbird.spec`
-#tag=CALENDAR_${lver//./_}_RELEASE
-tag=THUNDERBIRD_${tbver//./_}_RELEASE
-branch=`awk '/^%define *tarballdir/ { print $3; exit }' thunderbird.spec`
-locales=$PWD/thunderbird-${tbver}/${branch}/calendar/locales/shipped-locales
-#locales=$PWD/shipped-locales
-if [ ! -f $locales ]
-then
- echo "ERROR: missing $locales, try fedpkg prep first"
- exit 1
-fi
-[ ! -d l10n ] && mkdir l10n
-cd l10n
-for lang in $(<$locales)
-do
- if [ -d $lang ]
- then
- pushd $lang
- hg pull
- hg update $tag
- #hg update
- popd
- else
- hg clone -u $tag http://hg.mozilla.org/releases/l10n/mozilla-release/$lang
- #hg clone http://hg.mozilla.org/l10n-central/$lang
- fi
-done
-cd ..
-# Need to merge by compare-locale tool
-# More info here: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/compare-locales
-# how to get compare-locales: sudo easy_install -U compare-locales
-
-# Make copy to merge with
-rm -rf l10n-merged
-cp -R l10n l10n-merged
-for lang in $(<$locales)
-do
- compare-locales --merge l10n-merged/$lang $PWD/thunderbird-${tbver}/${branch}/calendar/locales/l10n.ini l10n $lang
-done
-
-
-# Tar up, minus the mercurial files
-rm -f l10n-${lver}.tar.xz
-tar caf l10n-lightning-${tbver}.tar.xz --exclude='.hg*' l10n-merged
diff --git a/SOURCES/mozilla-1005640-accept-lang.patch b/SOURCES/mozilla-1005640-accept-lang.patch
new file mode 100644
index 0000000..29d3833
--- /dev/null
+++ b/SOURCES/mozilla-1005640-accept-lang.patch
@@ -0,0 +1,30 @@
+diff -up firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang 2017-01-16 17:16:52.000000000 +0100
++++ firefox-51.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2017-01-18 12:35:29.380394216 +0100
+@@ -2852,6 +2852,11 @@ this.XPIProvider = {
+ this.addAddonsToCrashReporter();
+ }
+
++ // Save locale settings to compare it later to check whenever some addon
++ // changed it.
++ var previousLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
++ .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
++
+ try {
+ AddonManagerPrivate.recordTimestamp("XPI_bootstrap_addons_begin");
+
+@@ -2880,6 +2885,14 @@ this.XPIProvider = {
+ AddonManagerPrivate.recordException("XPI-BOOTSTRAP", "startup failed", e);
+ }
+
++ var currentLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
++ .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
++ if (currentLocale != previousLocale) {
++ // We have to flush string cache if the locale was changed during loading
++ // of addons
++ Services.obs.notifyObservers(null, "chrome-flush-caches", null);
++ }
++
+ // Let these shutdown a little earlier when they still have access to most
+ // of XPCOM
+ Services.obs.addObserver({
diff --git a/SOURCES/mozilla-1152515.patch b/SOURCES/mozilla-1152515.patch
deleted file mode 100644
index 4be1ca7..0000000
--- a/SOURCES/mozilla-1152515.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/security/pkix/lib/pkixder.cpp b/security/pkix/lib/pkixder.cpp
---- a/security/pkix/lib/pkixder.cpp
-+++ b/security/pkix/lib/pkixder.cpp
-@@ -466,28 +466,63 @@ TimeChoice(Reader& tagged, uint8_t expec
- if (rv != Success) {
- return rv;
- }
-
- uint8_t b;
- if (input.Read(b) != Success) {
- return Result::ERROR_INVALID_DER_TIME;
- }
-- if (b != 'Z') {
-+
-+ unsigned int hourOffset = 0;
-+ unsigned int minuteOffset = 0;
-+ bool allowOffset = false;
-+ bool haveOffset = false;
-+ bool offsetIsPositive = false;
-+
-+ if (getenv("PKIX_ALLOW_CERT_UTCTIME_OFFSET") != 0) {
-+ allowOffset = true;
-+ }
-+
-+ if (allowOffset && (b == '+' || b == '-')) {
-+ haveOffset = true;
-+ rv = ReadTwoDigits(input, 0u, 23u, hourOffset);
-+ if (rv != Success) {
-+ return rv;
-+ }
-+ rv = ReadTwoDigits(input, 0u, 59u, minuteOffset);
-+ if (rv != Success) {
-+ return rv;
-+ }
-+ if (b == '+') {
-+ offsetIsPositive = true;
-+ }
-+ } else if (b != 'Z') {
- return Result::ERROR_INVALID_DER_TIME;
- }
- if (End(input) != Success) {
- return Result::ERROR_INVALID_DER_TIME;
- }
-
- uint64_t totalSeconds = (static_cast<uint64_t>(days) * 24u * 60u * 60u) +
- (static_cast<uint64_t>(hours) * 60u * 60u) +
- (static_cast<uint64_t>(minutes) * 60u) +
- seconds;
-
-+ if (haveOffset) {
-+ uint64_t offsetInSeconds =
-+ (static_cast<uint64_t>(hourOffset) * 60u * 60u) +
-+ (static_cast<uint64_t>(minuteOffset) * 60u);
-+ if (offsetIsPositive) {
-+ totalSeconds -= offsetInSeconds;
-+ } else {
-+ totalSeconds += offsetInSeconds;
-+ }
-+ }
-+
- time = TimeFromElapsedSecondsAD(totalSeconds);
- return Success;
- }
-
- Result
- IntegralBytes(Reader& input, uint8_t tag,
- IntegralValueRestriction valueRestriction,
- /*out*/ Input& value,
diff --git a/SOURCES/mozilla-1170092-etc-conf.patch b/SOURCES/mozilla-1170092-etc-conf.patch
deleted file mode 100644
index 2b10f06..0000000
--- a/SOURCES/mozilla-1170092-etc-conf.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -up firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp
---- firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2016-03-15 23:37:54.000000000 +0100
-+++ firefox-45.0.1/extensions/pref/autoconfig/src/nsReadConfig.cpp 2016-03-21 16:10:42.540417899 +0100
-@@ -245,8 +245,20 @@ nsresult nsReadConfig::openAndEvaluateJS
- return rv;
-
- rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
-- if (NS_FAILED(rv))
-- return rv;
-+ if (NS_FAILED(rv)) {
-+ // Look for cfg file in /etc/<application>/pref
-+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
-+ getter_AddRefs(jsFile));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+
-+ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+
-+ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
-+ NS_ENSURE_SUCCESS(rv, rv);
-+ }
-
- } else {
- nsAutoCString location("resource://gre/defaults/autoconfig/");
-diff -up firefox-45.0.1/modules/libpref/Preferences.cpp.1170092 firefox-45.0.1/modules/libpref/Preferences.cpp
---- firefox-45.0.1/modules/libpref/Preferences.cpp.1170092 2016-03-21 16:10:42.540417899 +0100
-+++ firefox-45.0.1/modules/libpref/Preferences.cpp 2016-03-21 16:13:29.145888710 +0100
-@@ -1214,6 +1214,8 @@ static nsresult pref_InitInitialObjects(
- // - jar:$gre/omni.jar!/defaults/preferences/*.js
- // Thus, in omni.jar case, we always load app-specific default preferences
- // from omni.jar, whether or not $app == $gre.
-+ // At very end load configuration from system config location:
-+ // - /etc/firefox/pref/*.js
-
- nsZipFind *findPtr;
- nsAutoPtr<nsZipFind> find;
-diff -up firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp
---- firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp.1170092 2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/toolkit/xre/nsXREDirProvider.cpp 2016-03-21 16:12:06.498655156 +0100
-@@ -51,6 +51,7 @@
- #endif
- #ifdef XP_UNIX
- #include <ctype.h>
-+#include "nsIXULAppInfo.h"
- #endif
- #ifdef XP_IOS
- #include "UIKitDirProvider.h"
-@@ -457,6 +458,20 @@ nsXREDirProvider::GetFile(const char* aP
- }
- }
- }
-+#if defined(XP_UNIX)
-+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
-+ nsCString sysConfigDir = NS_LITERAL_CSTRING("/etc/");
-+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
-+ if (!appInfo)
-+ return NS_ERROR_NOT_AVAILABLE;
-+ nsCString appName;
-+ appInfo->GetName(appName);
-+ ToLowerCase(appName);
-+ sysConfigDir.Append(appName);
-+ return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
-+ }
-+#endif
-+
- if (NS_FAILED(rv) || !file)
- return NS_ERROR_FAILURE;
-
-@@ -753,6 +768,14 @@ nsXREDirProvider::GetFilesInternal(const
- LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
- LoadDirsIntoArray(mAppBundleDirectories,
- kAppendPrefDir, directories);
-+ // Add /etc/<application>/pref/ directory if it exists
-+ nsCOMPtr<nsIFile> systemPrefDir;
-+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR, getter_AddRefs(systemPrefDir));
-+ if (NS_SUCCEEDED(rv)) {
-+ rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
-+ if (NS_SUCCEEDED(rv))
-+ directories.AppendObject(systemPrefDir);
-+ }
-
- rv = NS_NewArrayEnumerator(aResult, directories);
- }
-diff -up firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h
---- firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2016-03-15 23:37:47.000000000 +0100
-+++ firefox-45.0.1/xpcom/io/nsAppDirectoryServiceDefs.h 2016-03-21 16:10:42.541417902 +0100
-@@ -67,6 +67,7 @@
- #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
- #define NS_EXT_PREFS_DEFAULTS_DIR_LIST "ExtPrefDL"
- #define NS_APP_PREFS_OVERRIDE_DIR "PrefDOverride" // Directory for per-profile defaults
-+#define NS_APP_PREFS_SYSTEM_CONFIG_DIR "PrefSysConf" // Directory with system-wide configuration
-
- #define NS_APP_USER_PROFILE_50_DIR "ProfD"
- #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"
diff --git a/SOURCES/mozilla-1170092.patch b/SOURCES/mozilla-1170092.patch
new file mode 100644
index 0000000..9e8906f
--- /dev/null
+++ b/SOURCES/mozilla-1170092.patch
@@ -0,0 +1,96 @@
+diff -up firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
+--- firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2018-01-11 21:17:03.000000000 +0100
++++ firefox-58.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2018-01-23 13:59:45.446495820 +0100
+@@ -239,9 +239,20 @@ nsresult nsReadConfig::openAndEvaluateJS
+ return rv;
+
+ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
+- if (NS_FAILED(rv))
+- return rv;
++ if (NS_FAILED(rv)) {
++ // Look for cfg file in /etc/<application>/pref
++ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
++ getter_AddRefs(jsFile));
++ NS_ENSURE_SUCCESS(rv, rv);
++
++ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
++ NS_ENSURE_SUCCESS(rv, rv);
++ rv = jsFile->AppendNative(nsDependentCString(aFileName));
++ NS_ENSURE_SUCCESS(rv, rv);
+
++ rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
++ NS_ENSURE_SUCCESS(rv, rv);
++ }
+ } else {
+ nsAutoCString location("resource://gre/defaults/autoconfig/");
+ location += aFileName;
+diff -up firefox-58.0/modules/libpref/Preferences.cpp.1170092 firefox-58.0/modules/libpref/Preferences.cpp
+--- firefox-58.0/modules/libpref/Preferences.cpp.1170092 2018-01-23 13:59:45.447495817 +0100
++++ firefox-58.0/modules/libpref/Preferences.cpp 2018-01-23 14:02:51.456987774 +0100
+@@ -4402,6 +4402,8 @@ pref_InitInitialObjects()
+ //
+ // Thus, in the omni.jar case, we always load app-specific default
+ // preferences from omni.jar, whether or not `$app == $gre`.
++ // At very end load configuration from system config location:
++ // - /etc/firefox/pref/*.js
+
+ nsresult rv;
+ nsZipFind* findPtr;
+diff -up firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-58.0/toolkit/xre/nsXREDirProvider.cpp
+--- firefox-58.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2018-01-11 21:17:06.000000000 +0100
++++ firefox-58.0/toolkit/xre/nsXREDirProvider.cpp 2018-01-23 13:59:45.447495817 +0100
+@@ -59,6 +59,7 @@
+ #endif
+ #ifdef XP_UNIX
+ #include <ctype.h>
++#include "nsIXULAppInfo.h"
+ #endif
+ #ifdef XP_IOS
+ #include "UIKitDirProvider.h"
+@@ -554,6 +555,20 @@ nsXREDirProvider::GetFile(const char* aP
+ }
+ }
+ }
++#if defined(XP_UNIX)
++ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
++ nsCString sysConfigDir = NS_LITERAL_CSTRING("/etc/");
++ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
++ if (!appInfo)
++ return NS_ERROR_NOT_AVAILABLE;
++ nsCString appName;
++ appInfo->GetName(appName);
++ ToLowerCase(appName);
++ sysConfigDir.Append(appName);
++ return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
++ }
++#endif
++
+ if (NS_FAILED(rv) || !file)
+ return NS_ERROR_FAILURE;
+
+@@ -887,6 +902,14 @@ nsXREDirProvider::GetFilesInternal(const
+ LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
+ LoadDirsIntoArray(mAppBundleDirectories,
+ kAppendPrefDir, directories);
++ // Add /etc/<application>/pref/ directory if it exists
++ nsCOMPtr<nsIFile> systemPrefDir;
++ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR, getter_AddRefs(systemPrefDir));
++ if (NS_SUCCEEDED(rv)) {
++ rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
++ if (NS_SUCCEEDED(rv))
++ directories.AppendObject(systemPrefDir);
++ }
+
+ rv = NS_NewArrayEnumerator(aResult, directories);
+ }
+diff -up firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h
+--- firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2018-01-23 13:59:45.447495817 +0100
++++ firefox-58.0/xpcom/io/nsAppDirectoryServiceDefs.h 2018-01-23 14:02:02.871120476 +0100
+@@ -59,6 +59,7 @@
+ #define NS_APP_PREFS_50_FILE "PrefF"
+ #define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
+ #define NS_APP_PREFS_OVERRIDE_DIR "PrefDOverride" // Directory for per-profile defaults
++#define NS_APP_PREFS_SYSTEM_CONFIG_DIR "PrefSysConf" // Directory with system-wide configuration
+
+ #define NS_APP_USER_PROFILE_50_DIR "ProfD"
+ #define NS_APP_USER_PROFILE_LOCAL_50_DIR "ProfLD"
diff --git a/SOURCES/mozilla-1196777.patch b/SOURCES/mozilla-1196777.patch
new file mode 100644
index 0000000..ba5e4b7
--- /dev/null
+++ b/SOURCES/mozilla-1196777.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Martin Stransky <stransky@redhat.com>
+# Parent 4e3ad95d689a5beabf3c1f41d958794fe00e3767
+Bug 1196777 - Ask GDK to receive focus events, r=?karlt
+
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -142,17 +142,18 @@ const gint kEvents = GDK_EXPOSURE_MASK |
+ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+ #if GTK_CHECK_VERSION(3,4,0)
+ GDK_SMOOTH_SCROLL_MASK |
+ GDK_TOUCH_MASK |
+ #endif
+ GDK_SCROLL_MASK |
+ GDK_POINTER_MOTION_MASK |
+- GDK_PROPERTY_CHANGE_MASK;
++ GDK_PROPERTY_CHANGE_MASK |
++ GDK_FOCUS_CHANGE_MASK;
+
+ /* utility functions */
+ static bool is_mouse_in_window(GdkWindow* aWindow,
+ gdouble aMouseX, gdouble aMouseY);
+ static nsWindow *get_window_for_gtk_widget(GtkWidget *widget);
+ static nsWindow *get_window_for_gdk_window(GdkWindow *window);
+ static GtkWidget *get_gtk_widget_for_gdk_window(GdkWindow *window);
+ static GdkCursor *get_gtk_cursor(nsCursor aCursor);
diff --git a/SOURCES/mozilla-1353817.patch b/SOURCES/mozilla-1353817.patch
new file mode 100644
index 0000000..dc8d8f8
--- /dev/null
+++ b/SOURCES/mozilla-1353817.patch
@@ -0,0 +1,27 @@
+From 1cc652f5525f458b0b4ceb12af24bf5a4367db32 Mon Sep 17 00:00:00 2001
+From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
+Date: Tue, 23 May 2017 13:09:48 -0400
+Subject: [PATCH] Bug 1353817: Include SkNx_neon.h for ARM64 too
+
+This fixes build errors as arm_neon.h was missing along with some
+missing converters.
+---
+ gfx/skia/skia/src/core/SkNx.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gfx/skia/skia/src/core/SkNx.h b/gfx/skia/skia/src/core/SkNx.h
+index 6bca856..b0427aa 100644
+--- a/gfx/skia/skia/src/core/SkNx.h
++++ b/gfx/skia/skia/src/core/SkNx.h
+@@ -299,7 +299,7 @@ typedef SkNx<4, uint32_t> Sk4u;
+ // Include platform specific specializations if available.
+ #if !defined(SKNX_NO_SIMD) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+ #include "../opts/SkNx_sse.h"
+-#elif !defined(SKNX_NO_SIMD) && defined(SK_ARM_HAS_NEON)
++#elif !defined(SKNX_NO_SIMD) && (defined(SK_ARM_HAS_NEON) || defined(SK_CPU_ARM64))
+ #include "../opts/SkNx_neon.h"
+ #else
+
+--
+2.9.4
+
diff --git a/SOURCES/mozilla-1436242.patch b/SOURCES/mozilla-1436242.patch
new file mode 100644
index 0000000..570b7c5
--- /dev/null
+++ b/SOURCES/mozilla-1436242.patch
@@ -0,0 +1,56 @@
+
+# HG changeset patch
+# User Jed Davis <jld@mozilla.com>
+# Date 1526943705 21600
+# Node ID 6bb3adfa15c6877f7874429462dad88f8c978c4f
+# Parent 4c71c8454879c841871ecf3afb7dbdc96bad97fc
+Bug 1436242 - Avoid undefined behavior in IPC fd-passing code. r=froydnj
+
+MozReview-Commit-ID: 3szIPUssgF5
+
+diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+--- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
++++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -418,20 +418,37 @@ bool Channel::ChannelImpl::ProcessIncomi
+ const int* fds;
+ unsigned num_fds;
+ unsigned fds_i = 0; // the index of the first unused descriptor
+
+ if (input_overflow_fds_.empty()) {
+ fds = wire_fds;
+ num_fds = num_wire_fds;
+ } else {
+- const size_t prev_size = input_overflow_fds_.size();
+- input_overflow_fds_.resize(prev_size + num_wire_fds);
+- memcpy(&input_overflow_fds_[prev_size], wire_fds,
+- num_wire_fds * sizeof(int));
++ // This code may look like a no-op in the case where
++ // num_wire_fds == 0, but in fact:
++ //
++ // 1. wire_fds will be nullptr, so passing it to memcpy is
++ // undefined behavior according to the C standard, even though
++ // the memcpy length is 0.
++ //
++ // 2. prev_size will be an out-of-bounds index for
++ // input_overflow_fds_; this is undefined behavior according to
++ // the C++ standard, even though the element only has its
++ // pointer taken and isn't accessed (and the corresponding
++ // operation on a C array would be defined).
++ //
++ // UBSan makes #1 a fatal error, and assertions in libstdc++ do
++ // the same for #2 if enabled.
++ if (num_wire_fds > 0) {
++ const size_t prev_size = input_overflow_fds_.size();
++ input_overflow_fds_.resize(prev_size + num_wire_fds);
++ memcpy(&input_overflow_fds_[prev_size], wire_fds,
++ num_wire_fds * sizeof(int));
++ }
+ fds = &input_overflow_fds_[0];
+ num_fds = input_overflow_fds_.size();
+ }
+
+ // The data for the message we're currently reading consists of any data
+ // stored in incoming_message_ followed by data in input_buf_ (followed by
+ // other messages).
+
+
diff --git a/SOURCES/mozilla-1460871-ldap-query.patch b/SOURCES/mozilla-1460871-ldap-query.patch
new file mode 100644
index 0000000..2f9c23d
--- /dev/null
+++ b/SOURCES/mozilla-1460871-ldap-query.patch
@@ -0,0 +1,164 @@
+diff -up thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl
+--- thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl.1460871-ldap-query 2018-10-01 16:52:39.000000000 +0200
++++ thunderbird-60.2.1/comm/ldap/xpcom/public/nsILDAPOperation.idl 2018-10-04 09:40:04.491575949 +0200
+@@ -52,6 +52,10 @@ interface nsILDAPOperation : nsISupports
+ * private parameter (anything caller desires)
+ */
+ attribute nsISupports closure;
++ /**
++ * number of the request for compare that the request is still valid.
++ */
++ attribute unsigned long requestNum;
+
+ /**
+ * No time and/or size limit specified
+diff -up thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp
+--- thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp.1460871-ldap-query 2018-10-01 16:52:39.000000000 +0200
++++ thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.cpp 2018-10-04 09:40:04.491575949 +0200
+@@ -400,6 +400,19 @@ convertControlArray(nsIArray *aXpcomArra
+ return NS_OK;
+ }
+
++ /* attribute unsigned long requestNum; */
++NS_IMETHODIMP nsLDAPOperation::GetRequestNum(uint32_t *aRequestNum)
++{
++ *aRequestNum = mRequestNum;
++ return NS_OK;
++}
++
++NS_IMETHODIMP nsLDAPOperation::SetRequestNum(uint32_t aRequestNum)
++{
++ mRequestNum = aRequestNum;
++ return NS_OK;
++}
++
+ NS_IMETHODIMP
+ nsLDAPOperation::SearchExt(const nsACString& aBaseDn, int32_t aScope,
+ const nsACString& aFilter,
+diff -up thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h.1460871-ldap-query thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h
+--- thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h.1460871-ldap-query 2018-10-01 16:52:39.000000000 +0200
++++ thunderbird-60.2.1/comm/ldap/xpcom/src/nsLDAPOperation.h 2018-10-04 09:40:04.491575949 +0200
+@@ -36,6 +36,8 @@ class nsLDAPOperation : public nsILDAPOp
+ * used to break cycles
+ */
+ void Clear();
++ // Stores the request number for later check of the operation is still valid
++ int32_t mRequestNum;
+
+ private:
+ virtual ~nsLDAPOperation();
+diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
+--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp.1460871-ldap-query 2018-10-01 16:52:43.000000000 +0200
++++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp 2018-10-04 09:40:55.334670404 +0200
+@@ -22,6 +22,8 @@
+
+ using namespace mozilla;
+
++extern mozilla::LazyLogModule gLDAPLogModule; // defined in nsLDAPService.cpp
++
+ // nsAbLDAPListenerBase inherits nsILDAPMessageListener
+ class nsAbQueryLDAPMessageListener : public nsAbLDAPListenerBase
+ {
+@@ -66,7 +68,6 @@ protected:
+
+ bool mFinished;
+ bool mCanceled;
+- bool mWaitingForPrevQueryToFinish;
+
+ nsCOMPtr<nsIMutableArray> mServerSearchControls;
+ nsCOMPtr<nsIMutableArray> mClientSearchControls;
+@@ -94,7 +95,6 @@ nsAbQueryLDAPMessageListener::nsAbQueryL
+ mResultLimit(resultLimit),
+ mFinished(false),
+ mCanceled(false),
+- mWaitingForPrevQueryToFinish(false),
+ mServerSearchControls(serverSearchControls),
+ mClientSearchControls(clientSearchControls)
+ {
+@@ -116,9 +116,6 @@ nsresult nsAbQueryLDAPMessageListener::C
+ return NS_OK;
+
+ mCanceled = true;
+- if (!mFinished)
+- mWaitingForPrevQueryToFinish = true;
+-
+ return NS_OK;
+ }
+
+@@ -129,6 +126,8 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
+
+ int32_t messageType;
+ rv = aMessage->GetType(&messageType);
++ uint32_t requestNum;
++ mOperation->GetRequestNum(&requestNum);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+ bool cancelOperation = false;
+@@ -137,6 +136,14 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
+ {
+ MutexAutoLock lock (mLock);
+
++ if (requestNum != sCurrentRequestNum) {
++ MOZ_LOG(gLDAPLogModule, mozilla::LogLevel::Debug,
++ ("nsAbQueryLDAPMessageListener::OnLDAPMessage: Ignoring message with "
++ "request num %d, current request num is %d.",
++ requestNum, sCurrentRequestNum));
++ return NS_OK;
++ }
++
+ if (mFinished)
+ return NS_OK;
+
+@@ -166,11 +173,10 @@ NS_IMETHODIMP nsAbQueryLDAPMessageListen
+ rv = OnLDAPMessageSearchResult(aMessage);
+ break;
+ case nsILDAPMessage::RES_SEARCH_ENTRY:
+- if (!mFinished && !mWaitingForPrevQueryToFinish)
++ if (!mFinished)
+ rv = OnLDAPMessageSearchEntry(aMessage);
+ break;
+ case nsILDAPMessage::RES_SEARCH_RESULT:
+- mWaitingForPrevQueryToFinish = false;
+ rv = OnLDAPMessageSearchResult(aMessage);
+ NS_ENSURE_SUCCESS(rv, rv);
+ break;
+@@ -207,6 +213,8 @@ nsresult nsAbQueryLDAPMessageListener::D
+ rv = mOperation->Init(mConnection, this, nullptr);
+ NS_ENSURE_SUCCESS(rv, rv);
+
++ mOperation->SetRequestNum(++sCurrentRequestNum);
++
+ nsAutoCString dn;
+ rv = mSearchUrl->GetDn(dn);
+ NS_ENSURE_SUCCESS(rv, rv);
+diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp
+--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp.1460871-ldap-query 2018-10-01 16:52:43.000000000 +0200
++++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.cpp 2018-10-04 09:40:04.492575951 +0200
+@@ -20,6 +20,8 @@
+
+ using namespace mozilla;
+
++uint32_t nsAbLDAPListenerBase::sCurrentRequestNum = 0;
++
+ nsAbLDAPListenerBase::nsAbLDAPListenerBase(nsILDAPURL* url,
+ nsILDAPConnection* connection,
+ const nsACString &login,
+@@ -249,6 +251,7 @@ NS_IMETHODIMP nsAbLDAPListenerBase::OnLD
+ InitFailed();
+ return rv;
+ }
++ mOperation->SetRequestNum(++sCurrentRequestNum);
+
+ // Try non-password mechanisms first
+ if (mSaslMechanism.EqualsLiteral("GSSAPI"))
+diff -up thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h.1460871-ldap-query thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h
+--- thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h.1460871-ldap-query 2018-10-01 16:52:43.000000000 +0200
++++ thunderbird-60.2.1/comm/mailnews/addrbook/src/nsAbLDAPListenerBase.h 2018-10-04 09:40:04.492575951 +0200
+@@ -47,6 +47,7 @@ protected:
+ int32_t mTimeOut;
+ bool mBound;
+ bool mInitialized;
++ static uint32_t sCurrentRequestNum;
+
+ mozilla::Mutex mLock;
+ };
diff --git a/SOURCES/mozilla-1475775-key3-revert.patch b/SOURCES/mozilla-1475775-key3-revert.patch
new file mode 100644
index 0000000..5ab7cbc
--- /dev/null
+++ b/SOURCES/mozilla-1475775-key3-revert.patch
@@ -0,0 +1,66 @@
+diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
+--- a/security/manager/ssl/nsNSSComponent.cpp
++++ b/security/manager/ssl/nsNSSComponent.cpp
+@@ -1654,6 +1654,51 @@
+ }
+ return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename);
+ }
++
++// When we changed from the old dbm database format to the newer sqlite
++// implementation, the upgrade process left behind the existing files. Suppose a
++// user had not set a password for the old key3.db (which is about 99% of
++// users). After upgrading, both the old database and the new database are
++// unprotected. If the user then sets a password for the new database, the old
++// one will not be protected. In this scenario, we should probably just remove
++// the old database (it would only be relevant if the user downgraded to a
++// version of Firefox before 58, but we have to trade this off against the
++// user's old private keys being unexpectedly unprotected after setting a
++// password).
++// This was never an issue on Android because we always used the new
++// implementation.
++static void
++MaybeCleanUpOldNSSFiles(const nsACString& profilePath)
++{
++ UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
++ if (!slot) {
++ return;
++ }
++ // Unfortunately we can't now tell the difference between "there already was a
++ // password when the upgrade happened" and "there was not a password but then
++ // the user added one after upgrading".
++ bool hasPassword = PK11_NeedLogin(slot.get()) &&
++ !PK11_NeedUserInit(slot.get());
++ if (!hasPassword) {
++ return;
++ }
++ nsCOMPtr<nsIFile> dbFile = do_CreateInstance("@mozilla.org/file/local;1");
++ if (!dbFile) {
++ return;
++ }
++ nsresult rv = dbFile->InitWithNativePath(profilePath);
++ if (NS_FAILED(rv)) {
++ return;
++ }
++ NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db");
++ rv = dbFile->AppendNative(keyDBFilename);
++ if (NS_FAILED(rv)) {
++ return;
++ }
++ // Since this isn't a directory, the `recursive` argument to `Remove` is
++ // irrelevant.
++ Unused << dbFile->Remove(false);
++}
+ #endif // ifndef ANDROID
+
+ // Given a profile directory, attempt to initialize NSS. If nocertdb is true,
+@@ -1685,6 +1730,9 @@
+ SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode);
+ if (srv == SECSuccess) {
+ MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode"));
++#ifndef ANDROID
++ MaybeCleanUpOldNSSFiles(profilePath);
++#endif // ifndef ANDROID
+ return NS_OK;
+ }
+ #ifndef ANDROID
+
diff --git a/SOURCES/mozilla-api-key b/SOURCES/mozilla-api-key
new file mode 100644
index 0000000..81877bc
--- /dev/null
+++ b/SOURCES/mozilla-api-key
@@ -0,0 +1 @@
+9008bb7e-1e22-4038-94fe-047dd48ccc0b
diff --git a/SOURCES/mozilla-build-arm.patch b/SOURCES/mozilla-build-arm.patch
new file mode 100644
index 0000000..e390a28
--- /dev/null
+++ b/SOURCES/mozilla-build-arm.patch
@@ -0,0 +1,14 @@
+diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
+--- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm 2017-03-03 13:53:52.480754536 +0100
++++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h 2017-03-03 13:56:01.476018102 +0100
+@@ -203,6 +203,10 @@
+ #define SK_ARM_HAS_CRC32
+ #endif
+
++#if defined(__aarch64__)
++ #undef SK_ARM_HAS_NEON
++#endif
++
+ //////////////////////////////////////////////////////////////////////
+
+ #if !defined(SKIA_IMPLEMENTATION)
diff --git a/SOURCES/rhbz-1354671.patch b/SOURCES/rhbz-1354671.patch
new file mode 100644
index 0000000..6ee89b7
--- /dev/null
+++ b/SOURCES/rhbz-1354671.patch
@@ -0,0 +1,12 @@
+diff -up firefox-53.0/layout/base/nsIPresShell.h.1354671 firefox-53.0/layout/base/nsIPresShell.h
+--- firefox-53.0/layout/base/nsIPresShell.h.1354671 2017-04-27 13:07:43.808653320 +0200
++++ firefox-53.0/layout/base/nsIPresShell.h 2017-04-27 13:09:40.404427641 +0200
+@@ -212,7 +212,7 @@ public:
+ * to the same aSize value. AllocateFrame is infallible and will abort
+ * on out-of-memory.
+ */
+- void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize)
++ void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize)
+ {
+ void* result = mFrameArena.AllocateByFrameID(aID, aSize);
+ RecordAlloc(result);
diff --git a/SOURCES/rhbz-1414535.patch b/SOURCES/rhbz-1414535.patch
deleted file mode 100644
index f9cc7c2..0000000
--- a/SOURCES/rhbz-1414535.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up ./CertVerifier.cpp.ignoreBuiltinStatus ./CertVerifier.cpp
---- ./security/certverifier/CertVerifier.cpp.ignoreBuiltinStatus 2016-10-31 21:15:28.000000000 +0100
-+++ ./security/certverifier/CertVerifier.cpp 2016-12-16 21:35:32.155105623 +0100
-@@ -65,6 +65,9 @@ InitCertVerifierLog()
- Result
- IsCertChainRootBuiltInRoot(const UniqueCERTCertList& chain, bool& result)
- {
-+ result = false;
-+ return Success;
-+#if 0
- if (!chain || CERT_LIST_EMPTY(chain)) {
- return Result::FATAL_ERROR_LIBRARY_FAILURE;
- }
-@@ -77,12 +80,15 @@ IsCertChainRootBuiltInRoot(const UniqueC
- return Result::FATAL_ERROR_LIBRARY_FAILURE;
- }
- return IsCertBuiltInRoot(root, result);
-+#endif
- }
-
- Result
- IsCertBuiltInRoot(CERTCertificate* cert, bool& result)
- {
- result = false;
-+ return Success;
-+#if 0
- #ifdef DEBUG
- nsCOMPtr<nsINSSComponent> component(do_GetService(PSM_COMPONENT_CONTRACTID));
- if (!component) {
-@@ -114,6 +120,7 @@ IsCertBuiltInRoot(CERTCertificate* cert,
- }
- }
- return Success;
-+#endif
- }
-
- static Result
diff --git a/SOURCES/rhbz-1423012.patch b/SOURCES/rhbz-1423012.patch
deleted file mode 100644
index f5344c2..0000000
--- a/SOURCES/rhbz-1423012.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up firefox-52.0b8/gfx/2d/HelpersCairo.h.old firefox-52.0b8/gfx/2d/HelpersCairo.h
---- firefox-52.0b8/gfx/2d/HelpersCairo.h.old 2017-03-02 09:23:01.230766731 -0500
-+++ firefox-52.0b8/gfx/2d/HelpersCairo.h 2017-03-02 09:23:49.711930251 -0500
-@@ -239,9 +239,9 @@ CairoFormatToGfxFormat(cairo_format_t fo
- {
- switch (format) {
- case CAIRO_FORMAT_ARGB32:
-- return SurfaceFormat::A8R8G8B8_UINT32;
-+ return SurfaceFormat::B8G8R8A8;
- case CAIRO_FORMAT_RGB24:
-- return SurfaceFormat::X8R8G8B8_UINT32;
-+ return SurfaceFormat::B8G8R8X8;
- case CAIRO_FORMAT_A8:
- return SurfaceFormat::A8;
- case CAIRO_FORMAT_RGB16_565:
diff --git a/SOURCES/rhbz-1503632-nss.patch b/SOURCES/rhbz-1503632-nss.patch
new file mode 100644
index 0000000..f9f5e4d
--- /dev/null
+++ b/SOURCES/rhbz-1503632-nss.patch
@@ -0,0 +1,28 @@
+diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
+--- a/security/certverifier/NSSCertDBTrustDomain.cpp
++++ b/security/certverifier/NSSCertDBTrustDomain.cpp
+@@ -1057,22 +1057,20 @@ InitializeNSS(const nsACString& dir, boo
+ // "/usr/lib/nss/libnssckbi.so".
+ uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
+ if (readOnly) {
+ flags |= NSS_INIT_READONLY;
+ }
+ if (!loadPKCS11Modules) {
+ flags |= NSS_INIT_NOMODDB;
+ }
+- nsAutoCString dbTypeAndDirectory("sql:");
+- dbTypeAndDirectory.Append(dir);
+ MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
+- ("InitializeNSS(%s, %d, %d)", dbTypeAndDirectory.get(), readOnly,
++ ("InitializeNSS(%s, %d, %d)", PromiseFlatCString(dir).get(), readOnly,
+ loadPKCS11Modules));
+- SECStatus srv = NSS_Initialize(dbTypeAndDirectory.get(), "", "",
++ SECStatus srv = NSS_Initialize(PromiseFlatCString(dir).get(), "", "",
+ SECMOD_DB, flags);
+ if (srv != SECSuccess) {
+ return srv;
+ }
+
+ if (!readOnly) {
+ UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
+ if (!slot) {
diff --git a/SOURCES/rhbz-966424.patch b/SOURCES/rhbz-966424.patch
deleted file mode 100644
index c4c332e..0000000
--- a/SOURCES/rhbz-966424.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
- issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
- var tokenNames = issuerCert.getAllTokenNames({});
-
- if (!tokenNames || !tokenNames.some(isBuiltinToken))
- throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
-
- function isBuiltinToken(tokenName) {
-- return tokenName == "Builtin Object Token";
-+ return tokenName == "Builtin Object Token" ||
-+ tokenName == "Default Trust" ||
-+ tokenName == "System Trust";
- }
-
- /**
- * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
- * security dialogs from being shown to the user. It is better to simply fail
- * if the certificate is bad. See bug 304286.
- *
- * @param aAllowNonBuiltInCerts (optional)
diff --git a/SOURCES/thunderbird-enable-addons.patch b/SOURCES/thunderbird-enable-addons.patch
deleted file mode 100644
index 349438a..0000000
--- a/SOURCES/thunderbird-enable-addons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up comm-esr31/mail/app/profile/all-thunderbird.js.addons comm-esr31/mail/app/profile/all-thunderbird.js
---- comm-esr31/mail/app/profile/all-thunderbird.js.addons 2014-07-18 02:04:05.000000000 +0200
-+++ comm-esr31/mail/app/profile/all-thunderbird.js 2014-07-29 15:29:11.949728141 +0200
-@@ -174,7 +174,7 @@ pref("extensions.update.autoUpdateDefaul
- // Disable add-ons installed into the shared user and shared system areas by
- // default. This does not include the application directory. See the SCOPE
- // constants in AddonManager.jsm for values to use here
--pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
-
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
diff --git a/SOURCES/thunderbird-mozconfig b/SOURCES/thunderbird-mozconfig
index 1b4984c..c304223 100644
--- a/SOURCES/thunderbird-mozconfig
+++ b/SOURCES/thunderbird-mozconfig
@@ -1,5 +1,5 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=comm/mail
+
ac_add_options --disable-crashreporter
ac_add_options --disable-libjpeg-turbo
ac_add_options --disable-necko-wifi
@@ -7,23 +7,22 @@ ac_add_options --disable-strip
ac_add_options --disable-tests
ac_add_options --disable-updater
ac_add_options --enable-calendar
-ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
+ac_add_options --with-google-api-keyfile=../google-api-key
+ac_add_options --enable-pie
+ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --enable-release
-ac_add_options --enable-safe-browsing
ac_add_options --enable-startup-notification
ac_add_options --libdir="$LIBDIR"
ac_add_options --prefix="$PREFIX"
-ac_add_options --with-l10n-base=../../l10n-merged
ac_add_options --without-system-libvpx
ac_add_options --with-pthreads
-ac_add_options --with-system-zlib
-ac_add_options --enable-system-hunspell
ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --enable-update-channel=release
export BUILD_OFFICIAL=1
-export CFLAGS="$CFLAGS -gdwarf-2"
-export CXXFLAGS="$CXXFLAGS -gdwarf-2"
export MOZILLA_OFFICIAL=1
-
mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZ_CO_PROJECT=mail
mk_add_options MOZILLA_OFFICIAL=1
-
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
diff --git a/SOURCES/thunderbird-mozconfig-branded b/SOURCES/thunderbird-mozconfig-branded
deleted file mode 100644
index 53b376d..0000000
--- a/SOURCES/thunderbird-mozconfig-branded
+++ /dev/null
@@ -1 +0,0 @@
-ac_add_options --enable-official-branding
diff --git a/SOURCES/thunderbird-objdir.patch b/SOURCES/thunderbird-objdir.patch
deleted file mode 100644
index f6dcde7..0000000
--- a/SOURCES/thunderbird-objdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up thunderbird-31.0/comm-esr31/client.mk.old thunderbird-31.0/comm-esr31/client.mk
---- thunderbird-31.0/comm-esr31/client.mk.old 2014-07-18 02:04:05.000000000 +0200
-+++ thunderbird-31.0/comm-esr31/client.mk 2014-07-30 10:57:01.177453550 +0200
-@@ -131,7 +131,7 @@ endif
-
-
- ifndef MOZ_OBJDIR
-- MOZ_OBJDIR = obj-$(CONFIG_GUESS)
-+ MOZ_OBJDIR = objdir
- else
- # On Windows Pymake builds check MOZ_OBJDIR doesn't start with "/"
- ifneq (,$(findstring mingw,$(CONFIG_GUESS)))
-diff -up thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile.old thunderbird-31.0/comm-esr31/mozilla/media/webrtc/trunk/Makefile
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
index af23193..c412cb5 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
@@ -13,7 +13,7 @@ pref("offline.autoDetect", true);
pref("mailnews.database.global.indexer.enabled", false);
# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
+pref("mail.folder.views.version", "1");
pref("extensions.shownSelectionUI", true);
pref("extensions.autoDisableScope", 0);
@@ -26,3 +26,5 @@ pref("javascript.options.baselinejit", false);
pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
/* Workaround for mozbz#1063315 */
pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
index af23193..c412cb5 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
@@ -13,7 +13,7 @@ pref("offline.autoDetect", true);
pref("mailnews.database.global.indexer.enabled", false);
# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
+pref("mail.folder.views.version", "1");
pref("extensions.shownSelectionUI", true);
pref("extensions.autoDisableScope", 0);
@@ -26,3 +26,5 @@ pref("javascript.options.baselinejit", false);
pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
/* Workaround for mozbz#1063315 */
pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
diff --git a/SOURCES/thunderbird.sh.in b/SOURCES/thunderbird.sh.in
index 55728e2..c0dc70b 100644
--- a/SOURCES/thunderbird.sh.in
+++ b/SOURCES/thunderbird.sh.in
@@ -34,7 +34,6 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird"
MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
##
## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
@@ -124,33 +123,23 @@ fi
NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
export NSS_SSL_CBC_RANDOM_IV
-# Prepare command line arguments
-script_args=""
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- if [ $# -gt 1 ]; then
- script_args="$script_args -d $2"
- shift 2
- else
- shift
- fi
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
-
-exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
+# Linux version specific environment variables
+%RHEL_ENV_VARS%
+
+# Make sure at-spi-bus is running
+if ! dbus-send --session \
+ --dest=org.freedesktop.DBus \
+ --type=method_call \
+ --print-reply \
+ /org/freedesktop/DBus \
+ org.freedesktop.DBus.ListNames \
+ | grep org.a11y.Bus > /dev/null; then
+ if [ -f "$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher" ]; then
+ echo "Starting a11y dbus service..."
+ $MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher &
+ else
+ echo "Running without a11y support!"
+ fi
+fi
+
+exec $MOZ_PROGRAM "$@"
diff --git a/SOURCES/thunderbird.sh.in.rhel6 b/SOURCES/thunderbird.sh.in.rhel6
deleted file mode 100644
index 55728e2..0000000
--- a/SOURCES/thunderbird.sh.in.rhel6
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-#
-# Startup script for the fedora.us Thunderbird RPM
-# (based on the Mozilla RPM launch script)
-#
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case $MOZ_ARCH in
- x86_64 | s390x | sparc64 )
- MOZ_LIB_DIR="/usr/lib64"
- SECONDARY_LIB_DIR="/usr/lib"
- ;;
- * )
- MOZ_LIB_DIR="/usr/lib"
- SECONDARY_LIB_DIR="/usr/lib64"
- ;;
-esac
-
-if [ ! -x $MOZ_LIB_DIR/thunderbird/thunderbird ]; then
- if [ ! -x $SECONDARY_LIB_DIR/thunderbird/thunderbird ]; then
- echo "Error: $MOZ_LIB_DIR/thunderbird/thunderbird not found"
- if [ -d $SECONDARY_LIB_DIR ]; then
- echo " $SECONDARY_LIB_DIR/thunderbird/thunderbird not found"
- fi
- exit 1
- fi
- MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
-fi
-
-MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird"
-MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
-MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
-MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
-
-##
-## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
-## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
-##
-#MOZ_DISABLE_PANGO=1
-#export MOZ_DISABLE_PANGO
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
-
-##
-## Disable the GNOME crash dialog, Moz has it's own
-##
-GNOME_DISABLE_CRASH_DIALOG=1
-export GNOME_DISABLE_CRASH_DIALOG
-
-##
-## Disable the SLICE allocator (rhbz#1014858)
-##
-export G_SLICE=always-malloc
-
-##
-## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1
-## in your environment before launching Firefox.
-##
-#
-# MOZ_DISABLE_LANGPACKS=1
-# export MOZ_DISABLE_LANGPACKS
-#
-
-##
-## Automatically installed langpacks are tracked by .fedora-langpack-install
-## config file.
-##
-FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
-
-# MOZ_DISABLE_LANGPACKS disables language packs completelly
-MOZILLA_DOWN=0
-if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
- pidof thunderbird > /dev/null 2>&1
- MOZILLA_DOWN=$?
-fi
-
-# Modify language pack configuration only when thunderbird is not running
-# and language packs are not disabled
-if [ $MOZILLA_DOWN -ne 0 ]; then
-
- # Clear already installed langpacks
- mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
- if [ -f $FEDORA_LANGPACK_CONFIG ]; then
- rm `cat $FEDORA_LANGPACK_CONFIG` > /dev/null 2>&1
- rm $FEDORA_LANGPACK_CONFIG > /dev/null 2>&1
- # remove all empty langpacks dirs while they block installation of langpacks
- rmdir $MOZ_EXTENSIONS_PROFILE_DIR/lang* > /dev/null 2>&1
- fi
-
- # Get locale from system
- CURRENT_LOCALE=$LC_ALL
- CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES}
- CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
-
- # Try without a local variant first, then with a local variant
- # So that pt-BR doesn't try to use pt for example
- SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
- MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
-
- function create_langpack_link() {
- local language=$*
- local langpack=langpack-${language}@thunderbird.mozilla.org.xpi
- if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
- rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
- ln -s $MOZ_LANGPACKS_DIR/$langpack \
- $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
- echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $FEDORA_LANGPACK_CONFIG
- return 0
- fi
- return 1
- }
-
- create_langpack_link $SHORTMOZLOCALE || create_langpack_link $MOZLOCALE || true
-fi
-
-# BEAST fix (rhbz#1005611)
-NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
-export NSS_SSL_CBC_RANDOM_IV
-
-# Prepare command line arguments
-script_args=""
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- if [ $# -gt 1 ]; then
- script_args="$script_args -d $2"
- shift 2
- else
- shift
- fi
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
-
-exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
diff --git a/SOURCES/thunderbird.sh.in.rhel7 b/SOURCES/thunderbird.sh.in.rhel7
deleted file mode 100644
index 55728e2..0000000
--- a/SOURCES/thunderbird.sh.in.rhel7
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-#
-# Startup script for the fedora.us Thunderbird RPM
-# (based on the Mozilla RPM launch script)
-#
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case $MOZ_ARCH in
- x86_64 | s390x | sparc64 )
- MOZ_LIB_DIR="/usr/lib64"
- SECONDARY_LIB_DIR="/usr/lib"
- ;;
- * )
- MOZ_LIB_DIR="/usr/lib"
- SECONDARY_LIB_DIR="/usr/lib64"
- ;;
-esac
-
-if [ ! -x $MOZ_LIB_DIR/thunderbird/thunderbird ]; then
- if [ ! -x $SECONDARY_LIB_DIR/thunderbird/thunderbird ]; then
- echo "Error: $MOZ_LIB_DIR/thunderbird/thunderbird not found"
- if [ -d $SECONDARY_LIB_DIR ]; then
- echo " $SECONDARY_LIB_DIR/thunderbird/thunderbird not found"
- fi
- exit 1
- fi
- MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
-fi
-
-MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird"
-MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
-MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
-MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/run-mozilla.sh"
-
-##
-## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
-## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
-##
-#MOZ_DISABLE_PANGO=1
-#export MOZ_DISABLE_PANGO
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="/usr/bin/thunderbird"
-
-##
-## Disable the GNOME crash dialog, Moz has it's own
-##
-GNOME_DISABLE_CRASH_DIALOG=1
-export GNOME_DISABLE_CRASH_DIALOG
-
-##
-## Disable the SLICE allocator (rhbz#1014858)
-##
-export G_SLICE=always-malloc
-
-##
-## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1
-## in your environment before launching Firefox.
-##
-#
-# MOZ_DISABLE_LANGPACKS=1
-# export MOZ_DISABLE_LANGPACKS
-#
-
-##
-## Automatically installed langpacks are tracked by .fedora-langpack-install
-## config file.
-##
-FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
-
-# MOZ_DISABLE_LANGPACKS disables language packs completelly
-MOZILLA_DOWN=0
-if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
- pidof thunderbird > /dev/null 2>&1
- MOZILLA_DOWN=$?
-fi
-
-# Modify language pack configuration only when thunderbird is not running
-# and language packs are not disabled
-if [ $MOZILLA_DOWN -ne 0 ]; then
-
- # Clear already installed langpacks
- mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
- if [ -f $FEDORA_LANGPACK_CONFIG ]; then
- rm `cat $FEDORA_LANGPACK_CONFIG` > /dev/null 2>&1
- rm $FEDORA_LANGPACK_CONFIG > /dev/null 2>&1
- # remove all empty langpacks dirs while they block installation of langpacks
- rmdir $MOZ_EXTENSIONS_PROFILE_DIR/lang* > /dev/null 2>&1
- fi
-
- # Get locale from system
- CURRENT_LOCALE=$LC_ALL
- CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES}
- CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
-
- # Try without a local variant first, then with a local variant
- # So that pt-BR doesn't try to use pt for example
- SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
- MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
-
- function create_langpack_link() {
- local language=$*
- local langpack=langpack-${language}@thunderbird.mozilla.org.xpi
- if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
- rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
- ln -s $MOZ_LANGPACKS_DIR/$langpack \
- $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
- echo $MOZ_EXTENSIONS_PROFILE_DIR/$langpack > $FEDORA_LANGPACK_CONFIG
- return 0
- fi
- return 1
- }
-
- create_langpack_link $SHORTMOZLOCALE || create_langpack_link $MOZLOCALE || true
-fi
-
-# BEAST fix (rhbz#1005611)
-NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
-export NSS_SSL_CBC_RANDOM_IV
-
-# Prepare command line arguments
-script_args=""
-pass_arg_count=0
-while [ $# -gt $pass_arg_count ]
-do
- case "$1" in
- -g | --debug)
- script_args="$script_args -g"
- debugging=1
- shift
- ;;
- -d | --debugger)
- if [ $# -gt 1 ]; then
- script_args="$script_args -d $2"
- shift 2
- else
- shift
- fi
- ;;
- *)
- # Move the unrecognized argument to the end of the list.
- arg="$1"
- shift
- set -- "$@" "$arg"
- pass_arg_count=`expr $pass_arg_count + 1`
- ;;
- esac
-done
-
-exec $MOZ_LAUNCHER $script_args $MOZ_PROGRAM "$@"
diff --git a/SOURCES/webrtc-arch-cpu.patch b/SOURCES/webrtc-arch-cpu.patch
deleted file mode 100644
index 29fd578..0000000
--- a/SOURCES/webrtc-arch-cpu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/media/webrtc/trunk/build/build_config.h
-+++ b/media/webrtc/trunk/build/build_config.h
-@@ -123,7 +123,9 @@
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC64 1
- #define ARCH_CPU_64_BITS 1
-+#ifndef _LITTLE_ENDIAN
- #define ARCH_CPU_BIG_ENDIAN 1
-+#endif
- #elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC 1
-@@ -156,6 +158,9 @@
- #elif defined(__alpha__)
- #define ARCH_CPU_ALPHA 1
- #define ARCH_CPU_64_BITS 1
-+#elif defined(__aarch64__)
-+#define ARCH_CPU_AARCH64 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #error Please add support for your architecture in build/build_config.h
- #endif
diff --git a/SOURCES/xulrunner-24.0-jemalloc-ppc.patch b/SOURCES/xulrunner-24.0-jemalloc-ppc.patch
index d0c3d8c..75aed9a 100644
--- a/SOURCES/xulrunner-24.0-jemalloc-ppc.patch
+++ b/SOURCES/xulrunner-24.0-jemalloc-ppc.patch
@@ -1,12 +1,12 @@
-diff -up mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch mozilla-aurora/memory/mozjemalloc/jemalloc.c
---- mozilla-aurora/memory/mozjemalloc/jemalloc.c.jemalloc-ppc.patch 2016-11-18 08:56:32.242742746 +0100
-+++ mozilla-aurora/memory/mozjemalloc/jemalloc.c 2016-11-18 08:59:51.809071876 +0100
-@@ -1096,7 +1096,7 @@ static const bool config_recycle = false
- * controlling the malloc behavior are defined as compile-time constants
- * for best performance and cannot be altered at runtime.
- */
--#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__)
-+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__powerpc__)
- #define MALLOC_STATIC_SIZES 1
+diff -up firefox-60.0/memory/build/mozjemalloc.cpp.ppc-jemalloc firefox-60.0/memory/build/mozjemalloc.cpp
+--- firefox-60.0/memory/build/mozjemalloc.cpp.ppc-jemalloc 2018-06-06 14:39:28.454371053 +0200
++++ firefox-60.0/memory/build/mozjemalloc.cpp 2018-06-06 14:39:40.242397928 +0200
+@@ -180,7 +180,7 @@ using namespace mozilla;
+ // Debug builds are opted out too, for test coverage.
+ #ifndef MOZ_DEBUG
+ #if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && \
+- !defined(__aarch64__)
++ !defined(__aarch64__) && !defined(__powerpc__)
+ #define MALLOC_STATIC_PAGESIZE 1
+ #endif
#endif
-
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index a373f17..61d6bb4 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -1,389 +1,380 @@
-%define system_nss 1
+%global debug_build 0
+%global official_branding 1
+%global system_ffi 1
+%global system_libicu 0
+%global system_libvpx 0
+%global system_nss 1
+%global system_sqlite 0
+%global use_bundled_python 1
+%define build_langpacks 1
+%define use_bundled_ffi 0
+%define use_bundled_python 1
+%global use_bundled_yasm 1
+%global system_jpeg 1
+%global hardened_build 1
+%global use_dts 1
+
+%define bundled_python_version 2.7.13
+%global cairo_version 1.10.2
+%global ffi_version 3.0.9
+%global freetype_version 2.1.9
+%global gcc_version 4.8.2-16
+%global python_version 2.7.8
+%global sqlite_version 3.8.4.2
%global nspr_version 4.13.1
%global nss_version 3.28.4
-%define system_sqlite 0
-%define sqlite_version 3.8.4.2
-%define system_ffi 1
-%define ffi_version 3.0.9
-%define use_bundled_yasm 1
-%define use_bundled_python 0
-%define python_version 2.7.8
-%define use_bundled_gcc 0
-%define gcc_version 4.8.2-16
-%define system_cairo 0
-%define cairo_version 1.10.2
-%define freetype_version 2.1.9
-%define system_libatomic 0
-%define official_branding 1
-%define libnotify_version 0.4
-%define debug_build 0
-# This is for local builds or builds in mock with --no-clean
-# It skips building of gcc, binutils and yasm rpms when they exists, it just installs
-# them and doesn't delete them to allow recycling them in next build.
-# SHOULD ALWAYS BE 0 WHEN BUILDING IN BREW
-%define do_not_clean_rpms 0
-
-
-# Configure and override build options for various platforms and RHEL versions
-# ============================================================================
-
-# RHEL7
%if 0%{?rhel} == 7
-%ifarch s390x
-%define use_bundled_gcc 1
-%endif
+%define use_bundled_python 0
%endif
-# RHEL6
-%if 0%{?rhel} == 6
-%define use_bundled_python 1
-%define use_bundled_gcc 1
-%define use_bundled_yasm 1
-%define system_ffi 0
-%define use_bundled_binutils 1
+%global use_rustts 1
+%global dts_version 7
+%global rst_version 7
+%global llvm_version 7
+%if 0%{?rhel} == 8
+%global use_dts 0
+%global rst_version 1.26
+%global llvm_version 6.0
%endif
-# Require libatomic for ppc
-%ifarch ppc
-%define system_libatomic 1
-%endif
+%define gtk3_nvr 3.22.26-1
+%define gtk3_install_path %{mozappdir}/bundled
+
+
+
# Big endian platforms
-%ifarch ppc ppc64 s390 s390x
+%ifarch ppc64 s390x
# Javascript Intl API is not supported on big endian platforms right now:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1322212
-%define with_intl_api 1
-%define big_endian 1
+%define big_endian 1
%endif
# ============================================================================
# Avoid patch failures
-%define _default_patch_fuzz 2
+%define _default_patch_fuzz 2
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%define build_langpacks 1
-%define langpackdir %{mozappdir}/langpacks
%if %{?system_sqlite}
# The actual sqlite version (see #480989):
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
%endif
-%define mozappdir %{_libdir}/%{name}
+# GTK3 bundling
+%define avoid_bundled_rebuild 0
+%if 0%{?rhel} == 6
+%define bundle_gtk3 1
+# In-tree libffi is able to build on following platforms, we have to bundle it for the rest
+%global system_ffi 0
+%ifnarch x86_64 i686 aarch64
+%define use_bundled_ffi 1
+%endif
+%endif
+
+
+%if 0%{?bundle_gtk3}
+# We could use %%include, but in %%files, %%post and other sections, but in these
+# sections it could lead to syntax errors about unclosed %%if. Work around it by
+# using the following macro
+%define include_file() %{expand:%(cat '%1')}
+%endif
+
+%global mozappdir %{_libdir}/%{name}
+%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
+%global langpackdir %{mozappdir}/distribution/extensions
+%global tarballdir %{name}-%{version}
+
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 52.9.1
+Version: 60.3.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-%define tarballdir thunderbird-52.9.1
-%define objdir objdir
+%if 0%{?rhel} == 7
+ExcludeArch: s390 ppc
+%endif
+%if 0%{?rhel} == 6
+ExclusiveArch: i686 x86_64 ppc64 s390x
+%endif
# From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}%{?ext_version}-20180710.tar.xz
-%endif
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20181031.tar.xz
# Locales for lightning
-Source2: l10n-lightning-%{version}.tar.xz
-Source3: mklangsource.sh
+Source2: lightning-langpacks-%{version}.tar.xz
+%endif
+Source3: get-calendar-langpacks.sh
Source10: thunderbird-mozconfig
-Source11: thunderbird-mozconfig-branded
Source20: thunderbird.desktop
Source21: thunderbird.sh.in
-Source100: find-external-requires
-Source200: https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
-Source300: gcc48-%{gcc_version}.el5.src.rpm
+Source24: mozilla-api-key
+Source27: google-api-key
+#TODO
+Source101: find-external-requires
+Source200: gtk3-private-%{gtk3_nvr}.el6.src.rpm
+Source201: gtk3-private-%{gtk3_nvr}-post.inc
+Source202: gtk3-private-%{gtk3_nvr}-postun.inc
+Source203: gtk3-private-%{gtk3_nvr}-posttrans.inc
+Source204: gtk3-private-%{gtk3_nvr}-files.inc
+Source205: gtk3-private-%{gtk3_nvr}-setup-flags-env.inc
+Source206: gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc
Source301: yasm-1.2.0-3.el5.src.rpm
-Source302: devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
-Source600: thunderbird.sh.in.rhel6
+Source303: libffi-3.0.13-18.el7_3.src.rpm
Source601: thunderbird-redhat-default-prefs.js.rhel6
-Source700: thunderbird.sh.in.rhel7
Source701: thunderbird-redhat-default-prefs.js.rhel7
+#Python 2.7
+Source100: https://www.python.org/ftp/python/%{bundled_python_version}/Python-%{bundled_python_version}.tar.xz
-# Mozilla (XULRunner) patches
-Patch0: firefox-install-dir.patch
+## Firefox patches
# Build patches
-Patch5: xulrunner-24.0-jemalloc-ppc.patch
-Patch6: webrtc-arch-cpu.patch
-Patch8: firefox-ppc64le.patch
-Patch9: build-s390-missing-include.patch
-Patch20: build-s390-atomic.patch
-Patch21: build-icu-big-endian.patch
-Patch22: build-missing-getrandom.patch
-Patch23: build-nss-version.patch
-Patch24: build-nss-prbool.patch
-
-# RHEL patches
-Patch103: rhbz-966424.patch
-Patch110: mozilla-1170092-etc-conf.patch
-Patch111: rhbz-1173156.patch
-Patch112: mozilla-256180.patch
-Patch113: rhbz-1414535.patch
-Patch114: rhbz-1423012.patch
+Patch3: mozilla-build-arm.patch
+Patch4: build-mozconfig-fix.patch
+Patch5: build-gdk-version.patch
+Patch6: build-nss-version.patch
+Patch26: build-icu-big-endian.patch
+# Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268
+Patch29: build-big-endian.patch
+# Always feel lucky for unsupported platforms:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
+Patch37: build-jit-atomic-always-lucky.patch
+Patch40: build-aarch64-skia.patch
+Patch41: build-debug-qcms.patch
+Patch43: xulrunner-24.0-jemalloc-ppc.patch
+Patch44: firefox-disable-dbus-remote.patch
+Patch45: build-disable-elfhack.patch
+
+# Fedora/RHEL specific patches
+Patch215: firefox-enable-addons.patch
+Patch219: rhbz-1173156.patch
+Patch224: mozilla-1170092.patch
+Patch225: mozilla-1005640-accept-lang.patch
+#ARM run-time patch
+Patch226: rhbz-1354671.patch
+Patch230: rhbz-1503632-nss.patch
# Upstream patches
-# Kaie's patch, we'll most likely need this one
-Patch202: mozilla-1152515.patch
+Patch402: mozilla-1196777.patch
+Patch406: mozilla-256180.patch
+Patch413: mozilla-1353817.patch
+Patch415: mozilla-1436242.patch
+Patch416: mozilla-1460871-ldap-query.patch
+#Removing this patch would lead to losing user saved credentials in profile!
+Patch417: mozilla-1475775-key3-revert.patch
-# Thunderbird patches
-Patch1000: thunderbird-objdir.patch
-Patch1001: lightning-bad-langs.patch
-Patch1002: thunderbird-enable-addons.patch
-Patch1003: build-fix-dupes.patch
+## Thunderbird patches
# ---------------------------------------------------
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: desktop-file-utils
-BuildRequires: mesa-libGL-devel
-BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: zip
+BuildRequires: autoconf213
BuildRequires: bzip2-devel
-BuildRequires: zlib-devel
-BuildRequires: libIDL-devel
-BuildRequires: gtk2-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: libgnome-devel
-BuildRequires: libgnomeui-devel
+BuildRequires: dbus-glib-devel
+BuildRequires: desktop-file-utils
BuildRequires: krb5-devel
-BuildRequires: pango-devel
-BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: libXt-devel
-BuildRequires: libXrender-devel
-BuildRequires: startup-notification-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: libnotify-devel
-BuildRequires: autoconf213
BuildRequires: mesa-libGL-devel
-BuildRequires: autoconf213
+BuildRequires: pkgconfig(dri)
+BuildRequires: pkgconfig(freetype2) >= %{freetype_version}
+BuildRequires: pkgconfig(gconf-2.0)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libIDL-2.0)
+BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xt)
+BuildRequires: pkgconfig(zlib)
BuildRequires: xz
-%if ! %{use_bundled_yasm}0
-BuildRequires: yasm
-%endif
-%if %{?system_sqlite}
-BuildRequires: sqlite-devel >= %{sqlite_version}
-Requires: sqlite >= %{sqlite_build_version}
+BuildRequires: zip
+Requires: liberation-fonts-common
+Requires: liberation-sans-fonts
+Requires: mozilla-filesystem
+Requires: p11-kit-trust
+%if %{?system_jpeg}
+BuildRequires: libjpeg-devel
%endif
%if %{?system_nss}
-BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-devel >= %{nss_version}
-Requires: nspr >= %{nspr_version}
-Requires: nss >= %{nss_version}
+BuildRequires: pkgconfig(nspr) >= %{nspr_version}
+BuildRequires: pkgconfig(nss) >= %{nss_version}
+BuildRequires: nss-static >= %{nss_version}
+%endif
+%if %{?system_libvpx}
+BuildRequires: libvpx-devel >= %{libvpx_version}
+%endif
+
+%if 0%{?use_dts}
+BuildRequires: devtoolset-%{dts_version}-gcc-c++
+BuildRequires: devtoolset-%{dts_version}-gcc
+BuildRequires: devtoolset-%{dts_version}-binutils
+BuildRequires: devtoolset-%{dts_version}-libatomic-devel
+%if 0%{?rhel} == 7
+BuildRequires: llvm-toolset-%{llvm_version}
+BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel
+%endif
%endif
-%if %{?system_cairo}
-BuildRequires: cairo-devel >= %{cairo_version}
+%if ! %{use_bundled_yasm}0
+BuildRequires: yasm
%endif
%if %{?system_sqlite}
BuildRequires: sqlite-devel >= %{sqlite_version}
Requires: sqlite >= %{sqlite_build_version}
%endif
-%if %{?system_ffi}
-BuildRequires: libffi-devel >= %{ffi_version}
-Requires: libffi >= %{ffi_version}
+%if 0%{?use_rustts}
+BuildRequires: rust-toolset-%{rst_version}-cargo
+BuildRequires: rust-toolset-%{rst_version}-rust
%endif
-BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
-BuildRequires: hunspell-devel
-%if %{system_libatomic}
-BuildRequires: libatomic
-Requires: libatomic
+%if 0%{?rhel} == 8
+BuildRequires: llvm-toolset-%{llvm_version}
+BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel
%endif
-
-# RHEL7 requires
-%if 0%{?rhel} == 7
-BuildRequires: pulseaudio-libs-devel
-Requires: mozilla-filesystem
-Requires: liberation-fonts-common
-Requires: liberation-sans-fonts
-BuildRequires: dbus-glib-devel >= 0.60
-%endif
-
-# RHEL6 requires
-%if 0%{?rhel} == 6
-BuildRequires: desktop-file-utils
-Requires: mozilla-filesystem
-Requires: gtk2 >= 2.24
-BuildRequires: pulseaudio-libs-devel
-Requires: liberation-fonts-common
-Requires: liberation-sans-fonts
-%endif
-
-Obsoletes: thunderbird-lightning
-Obsoletes: thunderbird-lightning-gdata
-%if %{use_bundled_python}
+%if 0%{?use_bundled_python}
+#%if 0%{?rhel} == 6
+# Needed for Python in RHEL6
BuildRequires: openssl-devel
+#%endif
%endif
-# GCC 4.8 BuildRequires
-# ==================================================================================
-%if %{use_bundled_gcc}
-%ifarch s390x
-%global multilib_32_arch s390
-%endif
-%ifarch sparc64
-%global multilib_32_arch sparcv9
-%endif
-%ifarch ppc64
-%global multilib_32_arch ppc
-%endif
-%ifarch x86_64
-%if 0%{?rhel} >= 6
-%global multilib_32_arch i686
+%if 0%{?bundle_gtk3}
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: cups-devel
+BuildRequires: dbus-devel
+BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
+BuildRequires: fontpackages-devel
+BuildRequires: gamin-devel
+BuildRequires: gettext-devel
+BuildRequires: git
+BuildRequires: intltool
+BuildRequires: jasper-devel
+BuildRequires: libepoxy-devel
+BuildRequires: libcroco-devel
+BuildRequires: libffi-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: libX11-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXevie-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXtst-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libEGL-devel
+BuildRequires: pixman-devel
+BuildRequires: rest-devel
+BuildRequires: readline-devel
+# TODO: We miss that dependency in our bundled gtk3 package.
+# As a hotfix we put it here and fix gtk3 in next release.
+Requires: mesa-libEGL%{?_isa}
+Requires: libcroco%{?_isa}
+Requires: mesa-libGL%{?_isa}
+Requires: bzip2-libs%{?_isa}
+Requires: libXtst%{?_isa}
%else
-%global multilib_32_arch i386
+BuildRequires: gtk3-devel
+BuildRequires: glib2-devel
%endif
+%if %{?system_nss}
+Requires: nspr >= %{nspr_version}
+Requires: nss >= %{nss_version}
%endif
-%global multilib_64_archs sparc64 ppc64 s390x x86_64
+%if 0%{?rhel} < 8
+BuildRequires: python2-devel
+%endif
-%if 0%{?rhel} >= 6
-# Need binutils which support --build-id >= 2.17.50.0.17-3
-# Need binutils which support %gnu_unique_object >= 2.19.51.0.14
-# Need binutils which support .cfi_sections >= 2.19.51.0.14-33
-BuildRequires: binutils >= 2.19.51.0.14-33
-# While gcc doesn't include statically linked binaries, during testing
-# -static is used several times.
-BuildRequires: glibc-static
-%else
-# Don't have binutils which support --build-id >= 2.17.50.0.17-3
-# Don't have binutils which support %gnu_unique_object >= 2.19.51.0.14
-# Don't have binutils which support .cfi_sections >= 2.19.51.0.14-33
-BuildRequires: binutils >= 2.17.50.0.2-8
-%endif
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils
-BuildRequires: /usr/bin/pod2man
-%if 0%{?rhel} >= 7
-BuildRequires: texinfo-tex
-%endif
-#BuildRequires: systemtap-sdt-devel >= 1.3
-# For VTA guality testing
-BuildRequires: gdb
-# Make sure pthread.h doesn't contain __thread tokens
-# Make sure glibc supports stack protector
-# Make sure glibc supports DT_GNU_HASH
-BuildRequires: glibc-devel >= 2.4.90-13
-%if 0%{?rhel} >= 6
-BuildRequires: elfutils-devel >= 0.147
-BuildRequires: elfutils-libelf-devel >= 0.147
-%else
-BuildRequires: elfutils-devel >= 0.72
-%endif
-%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
-# Make sure glibc supports TFmode long double
-BuildRequires: glibc >= 2.3.90-35
-%endif
-%ifarch %{multilib_64_archs} sparcv9 ppc
-# Ensure glibc{,-devel} is installed for both multilib arches
-BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
-%endif
-%ifarch ia64
-BuildRequires: libunwind >= 0.98
-%endif
-# Need .eh_frame ld optimizations
-# Need proper visibility support
-# Need -pie support
-# Need --as-needed/--no-as-needed support
-# On ppc64, need omit dot symbols support and --non-overlapping-opd
-# Need binutils that owns /usr/bin/c++filt
-# Need binutils that support .weakref
-# Need binutils that supports --hash-style=gnu
-# Need binutils that support mffgpr/mftgpr
-#%if 0%{?rhel} >= 6
-## Need binutils which support --build-id >= 2.17.50.0.17-3
-## Need binutils which support %gnu_unique_object >= 2.19.51.0.14
-## Need binutils which support .cfi_sections >= 2.19.51.0.14-33
-#Requires: binutils >= 2.19.51.0.14-33
-#%else
-## Don't have binutils which support --build-id >= 2.17.50.0.17-3
-## Don't have binutils which support %gnu_unique_object >= 2.19.51.0.14
-## Don't have binutils which support .cfi_sections >= 2.19.51.0.14-33
-#Requires: binutils >= 2.17.50.0.2-8
-#%endif
-## Make sure gdb will understand DW_FORM_strp
-#Conflicts: gdb < 5.1-2
-#Requires: glibc-devel >= 2.2.90-12
-#%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
-## Make sure glibc supports TFmode long double
-#Requires: glibc >= 2.3.90-35
-#%endif
-#Requires: libgcc >= 4.1.2-43
-#Requires: libgomp >= 4.4.4-13
-#%if 0%{?rhel} == 6
-#Requires: libstdc++ >= 4.4.4-13
-#%else
-#Requires: libstdc++ = 4.1.2
-#%endif
-##FIXME gcc version
-#Requires: libstdc++-devel = %{version}-%{release}
-BuildRequires: gmp-devel >= 4.1.2-8
-%if 0%{?rhel} >= 6
-BuildRequires: mpfr-devel >= 2.2.1
+%if %{?system_sqlite}
+BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
+Requires: sqlite >= %{sqlite_build_version}
%endif
-%if 0%{?rhel} >= 7
-BuildRequires: libmpc-devel >= 0.8.1
+%if %{?system_ffi}
+ %if !%{use_bundled_ffi}0
+BuildRequires: pkgconfig(libffi)
+ %endif
%endif
-%endif # bundled gcc BuildRequires
+Obsoletes: thunderbird-lightning
# ==================================================================================
# Override internal dependency generator to avoid showing libraries provided by this package
# in dependencies:
-AutoProv: 0
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE100}
+#AutoProv: 0
+#%define _use_internal_dependency_generator 0
+#%define __find_requires %{SOURCE101}
%description
Mozilla Thunderbird is a standalone mail and newsgroup client.
%prep
-%setup -q -c
-cd %{tarballdir}
+%setup -q -T -c -n python -a 100
+%setup -q -n %{tarballdir}
-# Mozilla (XULRunner) patches
-cd mozilla
-# Build patches
-# We have to keep original patch backup extension to go thru configure without problems with tests
-%patch0 -p1 -b .orig
-%patch5 -p1 -b .jemalloc-ppc.patch
-%patch6 -p1 -b .webrtc-arch-cpu
-%patch8 -p2 -b .ppc64le
-%patch9 -p1 -b .s390-missing-include
-%patch20 -p1 -b .s390-atomic
-%patch22 -p1 -b .missing-getrandom
-%patch23 -p1 -b .nss-version
-%patch24 -p1 -b .nss-prbool
-
-# RPM specific patches
-%patch103 -p1 -b .rhbz-966424
-%patch110 -p1 -b .moz-1170092-etc-conf
-%patch111 -p2 -b .rhbz-1173156
-%patch112 -p1 -b .mozbz-256180
-%patch113 -p1 -b .rhbz-1414535
-%patch114 -p1 -b .rhbz-1423012
+# Firefox patches
-# Upstream patches
-%patch202 -p1 -b .mozbz-1152515
+%patch29 -p1 -b .big-endian
+%patch37 -p1 -b .jit-atomic-lucky
+%patch40 -p1 -b .aarch64-skia
+%if %{?debug_build}
+%patch41 -p1 -b .build-debug-qcms
+%endif
+%patch43 -p1 -b .jemalloc-ppc
+# Disable DBus remote on RHEL6 as it does not build here.
+%if 0%{?rhel} == 6
+%patch44 -p1 -b .disable-dbus-remote
+%endif
+%if 0%{?rhel} == 8
+%patch45 -p1 -b .elfhack
+%endif
-# Patch for big endian platforms only
-%if 0%{?big_endian}
-%patch21 -p1 -b .big-endian-icu
+%patch3 -p1 -b .arm
+%patch4 -p1 -b .build-mozconfig-fix
+%patch5 -p1 -b .gdk-version
+%patch6 -p1 -b .nss-version
+
+# Fedora patches
+%patch215 -p1 -b .addons
+%patch219 -p2 -b .rhbz-1173156
+%patch224 -p1 -b .1170092
+%patch225 -p1 -b .1005640-accept-lang
+
+# This ensures no migration of certdb to sqlite on the RHEL6 and RHEL7.
+# This needs to stay for the future releases
+%if 0%{?rhel} < 8
+%patch230 -p1 -b .1503632-nss
+%patch417 -R -p1 -b .1475775-key3-revert
%endif
-cd ..
+#ARM run-time patch
+%ifarch aarch64
+%patch226 -p1 -b .1354671
+%endif
-%patch1000 -p2 -b .objdir
-%patch1001 -p1 -b .badlangs
-%patch1002 -p1 -b .addons
-%patch1003 -p1 -b .fix-dupes
-#%patch301 -p1 -b .ppc64le-build # fixme?
+%patch402 -p1 -b .1196777
+%patch406 -p1 -b .256180
+%patch413 -p1 -b .1353817
+%patch415 -p1 -b .1436242
+%patch416 -p1 -b .1460871-ldap-query
+# Patch for big endian platforms only
+%if 0%{?big_endian}
+%patch26 -p1 -b .icu
+%endif
+
+# Thunderbird patches
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -396,22 +387,8 @@ function add_to_mozconfig() {
%if %{official_branding}
add_to_mozconfig "enable-official-branding"
%endif
-
-%if %{?system_sqlite}
- add_to_mozconfig "enable-system-sqlite"
-%else
- add_to_mozconfig "disable-system-sqlite"
-%endif
-
-%if %{?system_cairo}
- add_to_mozconfig "enable-system-cairo"
-%else
- add_to_mozconfig "disable-system-cairo"
-%endif
-
-%if %{?system_ffi}
- add_to_mozconfig "enable-system-ffi"
-%endif
+%{__cp} %{SOURCE24} mozilla-api-key
+%{__cp} %{SOURCE27} google-api-key
%if %{?system_nss}
add_to_mozconfig "with-system-nspr"
@@ -421,55 +398,79 @@ function add_to_mozconfig() {
add_to_mozconfig "without-system-nss"
%endif
-add_to_mozconfig "with-system-jpeg"
-add_to_mozconfig "enable-system-hunspell"
-
-# RHEL 7 mozconfig changes:
-%if 0%{?rhel} >= 6
- add_to_mozconfig "enable-startup-notification"
- add_to_mozconfig "enable-jemalloc"
+%if %{?system_sqlite}
+ add_to_mozconfig "enable-system-sqlite"
+%else
+ add_to_mozconfig "disable-system-sqlite"
%endif
-
-# RHEL 6
-%if 0%{?rhel} == 6
- # Disable dbus, because we're unable to build with its support in brew
- add_to_mozconfig "disable-dbus"
- # ctypes require system libffi for these platforms and RHEL6 does not have libffi >= 3.0.9 available
- %ifarch ppc64 ppc64le ppc s390 s390x
- add_to_mozconfig "disable-ctypes"
- %endif
+%if 0%{?use_bundled_ffi}
+ add_to_mozconfig "with-system-ffi"
%endif
-%ifarch aarch64
- add_to_mozconfig "disable-ion"
+%if 0%{?system_ffi}
+ add_to_mozconfig "with-system-ffi"
%endif
-
-add_to_mozconfig "enable-gio"
-%ifarch aarch64 ppc ppc64 s390 s390x
- add_to_mozconfig "disable-skia"
+%ifarch %{arm}
+ add_to_mozconfig "disable-elf-hack"
%endif
-# Debug build flags
%if %{?debug_build}
add_to_mozconfig "enable-debug"
add_to_mozconfig "disable-optimize"
%else
- add_to_mozconfig "disable-debug"
- add_to_mozconfig "enable-optimize"
+%global optimize_flags "none"
+%ifnarch s390 s390x
+%global optimize_flags "-g -O2"
+%endif
+%ifarch armv7hl
+# ARMv7 need that (rhbz#1426850)
+%global optimize_flags "-g -O2 -fno-schedule-insns"
+%endif
+%ifarch ppc64le aarch64
+%global optimize_flags "-g -O2"
+%endif
+%if %{optimize_flags} != "none"
+echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
+%else
+echo 'ac_add_options --enable-optimize' >> .mozconfig
+%endif
+echo "ac_add_options --disable-debug" >> .mozconfig
%endif
-add_to_mozconfig "with-intl-api"
+# Second arches fail to start with jemalloc enabled
+%ifnarch %{ix86} x86_64
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
-#FIXME RTTI?? RHEL5/6
-# ac_add_options --enable-cpp-rtti
-# RHEL7: ac_add_options --with-system-bz2
-# RHEL5: never been there, but is it usable --enable-gnomeui ????
+%ifnarch %{ix86} x86_64
+echo "ac_add_options --disable-webrtc" >> .mozconfig
+%endif
-%if %{use_bundled_python}
- # Prepare Python 2.7 sources
- tar xf %{SOURCE200}
+%if %{?system_libvpx}
+echo "ac_add_options --with-system-libvpx" >> .mozconfig
+%else
+echo "ac_add_options --without-system-libvpx" >> .mozconfig
%endif
+%if %{?system_libicu}
+echo "ac_add_options --with-system-icu" >> .mozconfig
+%else
+echo "ac_add_options --without-system-icu" >> .mozconfig
+%endif
+%ifarch s390 s390x
+echo "ac_add_options --disable-ion" >> .mozconfig
+%endif
+
+%ifarch %{ix86}
+echo "ac_add_options --disable-stylo" >> .mozconfig
+%endif
+%if 0%{?rhel} == 6
+echo "ac_add_options --disable-stylo" >> .mozconfig
+%endif
+
+# Remove executable bit to make brp-mangle-shebangs happy.
+chmod -x third_party/rust/itertools/src/lib.rs
+
# install lightning langpacks
cd ..
%{__xz} -dc %{SOURCE2} | %{__tar} xf -
@@ -478,6 +479,32 @@ cd -
%build
+#GTK3 >>
+%if ! 0%{?avoid_bundled_rebuild}
+ rm -rf %{_buildrootdir}/*
+%endif
+export PATH="%{_buildrootdir}/bin:$PATH"
+
+function install_rpms_to_current_dir() {
+ PACKAGE_RPM=$(eval echo $1)
+ PACKAGE_DIR=%{_rpmdir}
+
+ if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then
+ # Hack for tps tests
+ ARCH_STR=%{_arch}
+ %ifarch i386 i686
+ ARCH_STR="i?86"
+ %endif
+ PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR"
+ fi
+
+ for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM)
+ do
+ echo "$package"
+ rpm2cpio "$package" | cpio -idu
+ done
+}
+
function build_bundled_package() {
PACKAGE_RPM=$1
PACKAGE_FILES=$2
@@ -485,7 +512,7 @@ function build_bundled_package() {
PACKAGE_DIR="%{_topdir}/RPMS"
PACKAGE_ALREADY_BUILD=0
- %if %{do_not_clean_rpms}
+ %if %{?avoid_bundled_rebuild}
if ls $PACKAGE_DIR/$PACKAGE_RPM; then
PACKAGE_ALREADY_BUILD=1
fi
@@ -510,7 +537,7 @@ function build_bundled_package() {
echo "Installing $PACKAGE_DIR/$PACKAGE_RPM"; echo "==============================="
rpm2cpio $PACKAGE_DIR/$PACKAGE_RPM | cpio -iduv
# Clean rpms to avoid including them to package
- %if ! %{do_not_clean_rpms}0
+ %if ! 0%{?avoid_bundled_rebuild}
rm -f $PACKAGE_FILES
%endif
@@ -527,38 +554,48 @@ function build_bundled_package() {
build_bundled_package 'yasm-1*.rpm' 'yasm-*.rpm' '%{SOURCE301}'
%endif
-# Install local binutils if needed
-# ======================================
-%if 0%{?use_bundled_binutils}
- build_bundled_package 'binutils-2*.rpm' 'binutils*.rpm' '%{SOURCE302}'
-%endif
-# Install local GCC if needed
-# ======================================
-%if %{use_bundled_gcc}
- build_bundled_package 'gcc48-%{gcc_version}*.rpm' 'gcc48-*.rpm' '%{SOURCE300}'
- export CXX=g++
+%if 0%{?bundle_gtk3}
+ %if ! 0%{?avoid_bundled_rebuild}
+ rpm -ivh %{SOURCE200}
+ rpmbuild --nodeps --define '_prefix %{gtk3_install_path}' -ba %{_specdir}/gtk3-private.spec
+ %endif
+ rm -rf %{_buildrootdir}/*
+ pushd %{_buildrootdir}
+ install_rpms_to_current_dir gtk3-private-%{gtk3_nvr}*.rpm
+ install_rpms_to_current_dir gtk3-private-devel-%{gtk3_nvr}*.rpm
+ install_rpms_to_current_dir gtk3-private-rpm-scripts-%{gtk3_nvr}*.rpm
+ popd
%endif
+# If needed build the bundled python 2.7 and put it in the PATH
+%if 0%{?use_bundled_python}
+ pushd %{_builddir}/python/Python-%{bundled_python_version}
+ #if ! 0%{?avoid_bundled_rebuild}
+ # Build Python 2.7 and set environment
+ # Pydebug set optimization to level 0, -O3 crashes on gcc 8 ATM
+ ./configure --with-pydebug --prefix="%{_buildrootdir}" --exec-prefix="%{_buildrootdir}" --libdir="%{_buildrootdir}/lib"
+ #endif
+ make %{?_smp_mflags} install V=1
+ popd
+%endif
-# Install local Python if needed
-# ======================================
-%if %{use_bundled_python}
- echo "Rebuilding Python"; echo "==============================="
- pushd %{tarballdir}
-
- # Build Python 2.7 and set environment
- BUILD_DIR=`pwd`/python_build
- cd Python-%{python_version}
- ./configure --prefix=$BUILD_DIR --exec-prefix=$BUILD_DIR
- make
- make install
- cd -
-
- PATH=$BUILD_DIR/bin:$PATH
- export PATH
+%if 0%{?bundle_gtk3}
+# gtk3-private-3.22.26.el6-1-requires-provides-filter.inc
+%include_file %{SOURCE206}
+%endif
+%if 0%{use_bundled_ffi}
+ # Install libraries to the predefined location to later add them to the Firefox libraries
+ rpm -ivh %{SOURCE303}
+ rpmbuild --nodeps --define '_prefix %{gtk3_install_path}' -ba %{_specdir}/libffi.spec
+ pushd %{_buildrootdir}
+ install_rpms_to_current_dir 'libffi*.rpm'
popd
-%endif # bundled Python
+ %filter_from_requires /libffi.so.6/d
+%endif
+%filter_setup
+
+# GTK3 <<
%if %{?system_sqlite}
# Do not proceed with build if the sqlite require would be broken:
@@ -571,59 +608,87 @@ function build_bundled_package() {
esac
%endif
-echo "Building Thunderbird"; echo "==============================="
-cd %{tarballdir}
+# We need to disable exit on error temporarily for the following scripts:
+set +e
+%if 0%{?use_dts}
+source scl_source enable devtoolset-%{dts_version}
+%endif
+%if 0%{?use_rustts}
+source scl_source enable rust-toolset-%{rst_version}
+%endif
-# Hack for missing shell when building in brew on RHEL6 and RHEL5
-%if 0%{?rhel} <= 6
+set -e
+# Hack for missing shell when building in brew on RHEL6
+%if 0%{?rhel} == 6
export SHELL=/bin/sh
%endif
-
+echo "Building Thunderbird"; echo "==============================="
+#cd %{tarballdir}
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
%if 0%{?big_endian}
- echo "Generate big endian version of config/external/icu/data/icud58l.dat"
- cd mozilla
./mach python intl/icu_sources_data.py .
ls -l config/external/icu/data
rm -f config/external/icu/data/icudt*l.dat
- cd ..
%endif
-
-# 1. Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-# 2. -Werror=format-security causes build failures when -Wno-format is explicitly given
-# for some sources
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive -Wformat-security -Wformat -Werror=format-security" | %{__sed} -e 's/-Wall//')
-
-# TODO check if necessery
# Update the various config.guess to upstream release for aarch64 support
-#find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-# FIXME required? find ./ -name config.guess -exec cp ./mozilla/build/autoconf/config.guess {} ';'
-
+find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
+
+# -fpermissive is needed to build with gcc 4.6+ which has become stricter
+#
+# Mozilla builds with -Wall with exception of a few warnings which show up
+# everywhere in the code; so, don't override that.
+#
+# Disable C++ exceptions since Mozilla code is not exception-safe
+#
+MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
+#rhbz#1037063
+# -Werror=format-security causes build failures when -Wno-format is explicitly given
+# for some sources
+# Explicitly force the hardening flags for Firefox so it passes the checksec test;
+# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+%if 0%{?fedora} > 23
+# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
+%endif
+# Use hardened build?
+%if %{?hardened_build}
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
+%endif
+%if %{?debug_build}
+ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
%ifarch s390
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
+# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
+# overrides the -g1 from line above and breaks building on s390
+# (OOM when linking, rhbz#1238225)
+export MOZ_DEBUG_FLAGS=" "
%endif
-
-# Avoid failing builds because OOM killer on some arches
-%ifarch s390 %{arm} ppc
-MOZ_LINK_FLAGS="$MOZ_LINK_FLAGS -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%ifarch s390 %{arm} ppc aarch64 i686
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif
-
-%if 0%{?rhel} == 6
- %if %{system_libatomic}
- MOZ_LINK_FLAGS="$MOZ_LINK_FLAGS -l:libatomic.so.1"
- %endif
+%ifarch %{arm}
+export RUSTFLAGS="-Cdebuginfo=0"
%endif
-
-%if %{?debug_build}
- MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%ifarch s390
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
+# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
+# overrides the -g1 from line above and breaks building on s390
+# (OOM when linking, rhbz#1238225)
+export MOZ_DEBUG_FLAGS=" "
%endif
-
-export CFLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-fpermissive//')
+%ifarch s390 %{arm} ppc aarch64 i686
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+%ifarch %{arm}
+export RUSTFLAGS="-Cdebuginfo=0"
+%endif
+export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
-export LDFLAGS="-Wl,--verbose $MOZ_LINK_FLAGS"
+export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -634,86 +699,120 @@ export SHELL=/bin/sh
%endif
MOZ_SMP_FLAGS=-j1
+# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# however builds tend to fail on other arches when building in parallel.
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
-#FIXME echo "test config.guess"
-#./mozilla/build/autoconf/config.guess
-#echo "test LDAP config.guess"
-#sh -x ./ldap/sdks/c-sdk/config/autoconf/config.guess
-
-make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-
-# Package l10n files
-cd %{objdir}/calendar/lightning
-grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x
-do
- make AB_CD=en-US L10N_XPI_NAME=lightning libs-$lang
-done
-# install l10n files
-make tools
-cd -
+%endif
-#===============================================================================
+%if 0%{?bundle_gtk3}
+# gtk3-private-setup-flags-env.inc
+%include_file %{SOURCE205}
+%endif
+
+export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+#export MOZ_SERVICES_SYNC="1"
+export STRIP=/bin/true
+./mach build -v
+
+#---------------------------------------------------------------------
%install
-# Hack for missing shell when building in brew on RHEL6 and RHEL5
-%if 0%{?rhel} <= 6
+%if 0%{?rhel} == 6
export SHELL=/bin/sh
%endif
-cd %{tarballdir}
-%{__rm} -rf $RPM_BUILD_ROOT
+%if 0%{?bundle_gtk3}
+function install_rpms_to_current_dir() {
+ PACKAGE_RPM=$(eval echo $1)
+ PACKAGE_DIR=%{_rpmdir}
+
+ if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then
+ # Hack for tps tests
+ ARCH_STR=%{_arch}
+ %ifarch i386 i686
+ ARCH_STR="i?86"
+ %endif
+ PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR"
+ fi
+
+ for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM)
+ do
+ echo "$package"
+ rpm2cpio "$package" | cpio -idu
+ done
+}
+
+pushd %{buildroot}
+# Install gtk3-private again to the buildroot, but without devel subpackage
+install_rpms_to_current_dir gtk3-private-%{gtk3_nvr}*.rpm
+install_rpms_to_current_dir gtk3-private-rpm-scripts-%{gtk3_nvr}*.rpm
+popd
+%endif
+
+# Install bundled libffi
+%if %{use_bundled_ffi}
+ pushd %{buildroot}
+ install_rpms_to_current_dir libffi-3*.rpm
+ popd
+%endif
+
+DESTDIR=%{buildroot} make -C objdir install
-DESTDIR=$RPM_BUILD_ROOT make -C objdir install
+%{__mkdir_p} %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications}
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE20}
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20}
+
+# set up the thunderbird start script
+rm -rf %{buildroot}%{_bindir}/thunderbird
+%{__rm} -rf %{buildroot}%{_bindir}/thunderbird
+%{__cat} %{SOURCE21} > %{buildroot}%{_bindir}/thunderbird
+%if 0%{?bundle_gtk3}
+sed -i -e 's|%RHEL_ENV_VARS%|export XDG_DATA_DIRS="$MOZ_LIB_DIR/thunderbird/bundled/share:/usr/share:$XDG_DATA_DIRS"|' %{buildroot}%{_bindir}/thunderbird
+%else
+sed -i -e 's|%RHEL_ENV_VARS%||' %{buildroot}%{_bindir}/thunderbird
+%endif
+%{__chmod} 755 %{buildroot}%{_bindir}/thunderbird
-# Set up the thunderbird start script, unfortunatelly it is different for each RHEL
-rm -rf $RPM_BUILD_ROOT%{_bindir}/thunderbird
-THUNDERBIRD_SH_SOURCE=%{SOURCE700}
+# Setup preferences, depends on RHEL version
THUNDERBIRD_PREF_SOURCE=%{SOURCE701}
%if 0%{?rhel} == 6
- THUNDERBIRD_SH_SOURCE=%{SOURCE600}
THUNDERBIRD_PREF_SOURCE=%{SOURCE601}
%endif
-cp $THUNDERBIRD_SH_SOURCE $RPM_BUILD_ROOT%{_bindir}/thunderbird
-%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/thunderbird
-# Fill in THUNDERBIRD_RPM_VR and COMMAND into our rh-default-prefs
-%{__cat} $THUNDERBIRD_PREF_SOURCE | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
- -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
- $RPM_BUILD_ROOT/rh-default-prefs
-%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
-%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
-%{__rm} $RPM_BUILD_ROOT/rh-default-prefs
+# Fill in THUNDERBIRD_RPM_VR into our rh-default-prefs
+%{__cat} $THUNDERBIRD_PREF_SOURCE | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' > \
+ %{buildroot}/rh-default-prefs
+%{__install} -D %{buildroot}/rh-default-prefs %{buildroot}/%{mozappdir}/greprefs/all-redhat.js
+%{__install} -D %{buildroot}/rh-default-prefs %{buildroot}/%{mozappdir}/defaults/pref/all-redhat.js
+%{__rm} %{buildroot}/rh-default-prefs
# install icons
for s in 16 22 24 32 48 256; do
- %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
- %{__cp} -p other-licenses/branding/%{name}/mailicon${s}.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png
+ %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
+ %{__cp} -p comm/mail/branding/%{name}/default${s}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png
done
-%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
+%{__rm} -f %{buildroot}%{_bindir}/thunderbird-config
# own mozilla plugin dir (#135050)
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
+%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins
# own extension directories
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{thunderbird_app_id}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{thunderbird_app_id}
+%{__mkdir_p} %{buildroot}%{_datadir}/mozilla/extensions/%{thunderbird_app_id}
+%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/extensions/%{thunderbird_app_id}
# Install langpacks
-echo > ../%{name}.lang
+echo > %{name}.lang
%if %{build_langpacks}
# Extract langpacks, make any mods needed, repack the langpack, and install it.
-%{__mkdir_p} $RPM_BUILD_ROOT%{langpackdir}
-%{__xz} -dc %{SOURCE1} | %{__tar} xf -
+%{__mkdir_p} %{buildroot}%{langpackdir}
+%{__tar} xf %{SOURCE1}
for langpack in `ls thunderbird-langpacks/*.xpi`; do
language=`basename $langpack .xpi`
extensionID=langpack-$language@thunderbird.mozilla.org
@@ -725,9 +824,9 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do
zip -r9mX ../${extensionID}.xpi *
cd -
- %{__install} -m 644 ${extensionID}.xpi $RPM_BUILD_ROOT%{langpackdir}
+ %{__install} -m 644 ${extensionID}.xpi %{buildroot}%{langpackdir}
language=`echo $language | sed -e 's/-/_/g'`
- echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> ../%{name}.lang
+ echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> %{name}.lang
done
%{__rm} -rf thunderbird-langpacks
@@ -735,7 +834,7 @@ done
function create_default_langpack() {
language_long=$1
language_short=$2
- cd $RPM_BUILD_ROOT%{langpackdir}
+ cd %{buildroot}%{langpackdir}
ln -s langpack-$language_long@thunderbird.mozilla.org.xpi langpack-$language_short@thunderbird.mozilla.org.xpi
cd -
echo "%%lang($language_short) %{langpackdir}/langpack-$language_short@thunderbird.mozilla.org.xpi" >> ../%{name}.lang
@@ -755,24 +854,28 @@ function create_default_langpack() {
#create_default_langpack "pt-PT" "pt"
#create_default_langpack "sv-SE" "sv"
#create_default_langpack "zh-TW" "zh"
+
+# lightning langpacks install
+cd %{buildroot}%{langpackdir}
+%{__tar} xf %{SOURCE2}
+chmod a+r *.xpi
+cd -
%endif # build_langpacks
# Get rid of devel package and its debugsymbols
-%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{version}
+%{__rm} -rf %{buildroot}%{_libdir}/%{name}-devel-%{version}
# Copy over the LICENSE
-cd mozilla
-install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
-cd -
+%{__install} -p -c -m 644 LICENSE %{buildroot}/%{mozappdir}
-# Use the system dictionaries for system hunspell
-%{__rm} -rf ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
-ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries
+# Use the system hunspell dictionaries
+%{__rm} -rf %{buildroot}%{mozappdir}/dictionaries
+ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
# ghost files
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components
-touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
-touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
+%{__mkdir_p} %{buildroot}%{mozappdir}/components
+touch %{buildroot}%{mozappdir}/components/compreg.dat
+touch %{buildroot}%{mozappdir}/components/xpti.dat
# Clean thunderbird-devel debuginfo
rm -rf %{_prefix}/lib/debug/lib/%{name}-devel-*
@@ -781,13 +884,19 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-*
#---------------------------------------------------------------------
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-#---------------------------------------------------------------------
+rm -rf %{_srcrpmdir}/gtk3-private-%{gtk3_nvr}*.src.rpm
+find %{_rpmdir} -name "gtk3-private-*%{gtk3_nvr}*.rpm" -delete
+rm -rf %{_srcrpmdir}/libffi*.src.rpm
+find %{_rpmdir} -name "libffi*.rpm" -delete
%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%if 0%{?bundle_gtk3}
+# gtk3-private-post.inc
+%include_file %{SOURCE201}
+%endif
+
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
@@ -798,10 +907,17 @@ if [ $1 -eq 0 ] ; then
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
-
+%if 0%{?bundle_gtk3}
+# gtk3-private-postun.inc
+%include_file %{SOURCE202}
+%endif
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%if 0%{?bundle_gtk3}
+# gtk3-private-posttrans.inc
+%include_file %{SOURCE203}
+%endif
#===============================================================================
%files -f %{name}.lang
@@ -822,10 +938,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/dictionaries
%dir %{mozappdir}/extensions
%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
-%dir %{mozappdir}/langpacks
%{mozappdir}/greprefs
%{mozappdir}/isp
-%{mozappdir}/run-mozilla.sh
%{mozappdir}/thunderbird-bin
%{mozappdir}/thunderbird
%{mozappdir}/*.so
@@ -839,27 +953,56 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
%{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
%{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
+%{mozappdir}/pingsender
+%{mozappdir}/gtk2/libmozgtk.so
%if !%{?system_nss}
%{mozappdir}/*.chk
%endif
-%exclude %{_datadir}/idl/%{name}-%{version}
-%exclude %{_includedir}/%{name}-%{version}
%{mozappdir}/dependentlibs.list
%{mozappdir}/distribution
-%if 0%{?big_endian}
-%{mozappdir}/icudt58b.dat
-%else
-%{mozappdir}/icudt58l.dat
-%endif
%{mozappdir}/chrome.manifest
%{mozappdir}/fonts/EmojiOneMozilla.ttf
+%if !%{?system_libicu}
+#%{mozappdir}/icudt*.dat
+%endif
+%if !%{?system_nss}
+%{mozappdir}/libfreeblpriv3.chk
+%{mozappdir}/libnssdbm3.chk
+%{mozappdir}/libsoftokn3.chk
+%exclude %{mozappdir}/libnssckbi.so
+%endif
+%if 0%{use_bundled_ffi}
+%{mozappdir}/bundled/%{_lib}/libffi.so*
+%exclude %{_datadir}/doc/libffi*
+%endif
+
+%if 0%{?bundle_gtk3}
+# gtk3-private-files.inc
+%include_file %{SOURCE204}
+%endif
#===============================================================================
%changelog
-* Tue Jul 24 2018 CentOS Sources <bugs@centos.org> - 52.9.1-1.el7.centos
-- Apply debranding changes
+* Wed Oct 31 2018 Jan Horak <jhorak@redhat.com> - 60.3.0-1
+- Update to 60.3.0
+
+* Wed Oct 31 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-6
+- Fixed missing calendar langpacks
+
+* Tue Oct 16 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-5
+- Fixing minor issues
+
+* Wed Oct 10 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-3
+- Reverting deleting of key3db
+
+* Wed Oct 3 2018 Jan Horak <jhorak@redhat.com> - 60.2.1-2
+- Update to 60.2.1
+- Added fix for rhbz#1546988
+
+* Fri Sep 14 2018 Jan Horak <jhorak@redhat.com> - 60.0-1
+- Rebase to version 60
* Tue Jul 10 2018 Jan Horak <jhorak@redhat.com> - 52.9.1-1
- Update to 52.9.1