From ae52963c0106d72be2f342a76b23954bd1b2cc23 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 6 Apr 2015 16:33:52 -0400 Subject: [PATCH 01/50] rebuild for libvpx 1.4.0 --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index eacea7c..fd79c9d 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 33.0 -Release: 2%{?pre_tag}%{?dist} +Release: 3%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -549,6 +549,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 6 2015 Tom Callaway - 33.0-3 +- rebuild for libvpx 1.4.0 + * Wed Oct 22 2014 Dan Horák - 33.0-2 - Fix filelist for secondary arches From f0c48f3d46ef01eed03dec583e0f4fd1810fd8aa Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 7 Apr 2015 15:17:40 -0400 Subject: [PATCH 02/50] stop using old compat defines --- xulrunner-33.0-libvpx-modern.patch | 12 ++++++++++++ xulrunner.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 xulrunner-33.0-libvpx-modern.patch diff --git a/xulrunner-33.0-libvpx-modern.patch b/xulrunner-33.0-libvpx-modern.patch new file mode 100644 index 0000000..52d1839 --- /dev/null +++ b/xulrunner-33.0-libvpx-modern.patch @@ -0,0 +1,12 @@ +diff -up xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +--- xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 15:12:34.710923016 -0400 ++++ xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 15:12:48.278838658 -0400 +@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid + // Creating a wrapper to the image - setting image data to NULL. Actual + // pointer will be set in encode. Setting align to 1, as it is meaningless + // (actual memory is not allocated). +- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, ++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, + 1, NULL); + // populate encoder configuration with default values + if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { diff --git a/xulrunner.spec b/xulrunner.spec index fd79c9d..09a5155 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -102,6 +102,7 @@ Patch200: mozilla-193-pkgconfig.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch Patch207: firefox-baseline-disable.patch +Patch208: xulrunner-33.0-libvpx-modern.patch # Upstream patches Patch300: mozilla-1042889.patch @@ -245,6 +246,7 @@ cd %{tarballdir} %ifarch %{ix86} %patch207 -p2 -b .baseline %endif +%patch208 -p2 -b .modern # Upstream patches %patch300 -p1 -b .1042889 From afc4529c2321a2e5235d4b8d43211d303c355dff Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Apr 2015 13:30:31 +0200 Subject: [PATCH 03/50] Update to 37.0.1 --- sources | 2 +- xulrunner.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 292c031..a7e8418 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0e793898bddf4f2bc46e42a331f3383 firefox-33.0.source.tar.bz2 +2d466d850ef9b0a71bce3b208f5f884c firefox-37.0.1.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 09a5155..b7475e3 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 33.0 -Release: 3%{?pre_tag}%{?dist} +Version: 37.0.1 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -551,6 +551,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Apr 15 2015 Martin Stransky - 37.0.1-1 +- Update to 37.0.1 + * Mon Apr 6 2015 Tom Callaway - 33.0-3 - rebuild for libvpx 1.4.0 From cf90f2c273f8f1994ae24b07aefb584c48b62729 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Apr 2015 14:07:31 +0200 Subject: [PATCH 04/50] Update to new version - 37.0.1 --- mozilla-1042889.patch | 81 ------------------------------ xulrunner-33.0-libvpx-modern.patch | 12 ----- xulrunner.spec | 4 -- 3 files changed, 97 deletions(-) delete mode 100644 mozilla-1042889.patch delete mode 100644 xulrunner-33.0-libvpx-modern.patch diff --git a/mozilla-1042889.patch b/mozilla-1042889.patch deleted file mode 100644 index 6061b9b..0000000 --- a/mozilla-1042889.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js ---- a/dom/browser-element/BrowserElementChildPreload.js -+++ b/dom/browser-element/BrowserElementChildPreload.js -@@ -90,16 +90,17 @@ function getErrorClass(errorCode) { - switch (NSPRCode) { - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: - case SSL_ERROR_BAD_CERT_DOMAIN: - case SEC_ERROR_EXPIRED_CERTIFICATE: - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - return Ci.nsINSSErrorsService.ERROR_CLASS_BAD_CERT; - default: - return Ci.nsINSSErrorsService.ERROR_CLASS_SSL_PROTOCOL; - } - - return null; - } -diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp ---- a/security/manager/ssl/src/NSSErrorsService.cpp -+++ b/security/manager/ssl/src/NSSErrorsService.cpp -@@ -136,16 +136,17 @@ NSSErrorsService::GetErrorClass(nsresult - // Overridable errors. - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: - case SSL_ERROR_BAD_CERT_DOMAIN: - case SEC_ERROR_EXPIRED_CERTIFICATE: - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - *aErrorClass = ERROR_CLASS_BAD_CERT; - break; - // Non-overridable errors. - default: - *aErrorClass = ERROR_CLASS_SSL_PROTOCOL; - break; - } -diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/src/SSLServerCertVerification.cpp ---- a/security/manager/ssl/src/SSLServerCertVerification.cpp -+++ b/security/manager/ssl/src/SSLServerCertVerification.cpp -@@ -287,16 +287,17 @@ private: - - // A probe value of 1 means "no error". - uint32_t - MapCertErrorToProbeValue(PRErrorCode errorCode) - { - switch (errorCode) - { - case SEC_ERROR_UNKNOWN_ISSUER: return 2; -+ case SEC_ERROR_CA_CERT_INVALID: return 3; - case SEC_ERROR_UNTRUSTED_ISSUER: return 4; - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: return 5; - case SEC_ERROR_UNTRUSTED_CERT: return 6; - case SEC_ERROR_INADEQUATE_KEY_USAGE: return 7; - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: return 8; - case SSL_ERROR_BAD_CERT_DOMAIN: return 9; - case SEC_ERROR_EXPIRED_CERTIFICATE: return 10; - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: return 11; -@@ -321,16 +322,17 @@ DetermineCertOverrideErrors(CERTCertific - MOZ_ASSERT(errorCodeMismatch == 0); - MOZ_ASSERT(errorCodeExpired == 0); - - // Assumes the error prioritization described in mozilla::pkix's - // BuildForward function. Also assumes that CERT_VerifyCertName was only - // called if CertVerifier::VerifyCert succeeded. - switch (defaultErrorCodeToReport) { - case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: -+ case SEC_ERROR_CA_CERT_INVALID: - case SEC_ERROR_UNKNOWN_ISSUER: - case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: - { - collectedErrors = nsICertOverrideService::ERROR_UNTRUSTED; - errorCodeTrust = defaultErrorCodeToReport; - - SECCertTimeValidity validity = CERT_CheckCertValidTimes(cert, now, false); - if (validity == secCertTimeUndetermined) { diff --git a/xulrunner-33.0-libvpx-modern.patch b/xulrunner-33.0-libvpx-modern.patch deleted file mode 100644 index 52d1839..0000000 --- a/xulrunner-33.0-libvpx-modern.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc ---- xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc.modern 2015-04-07 15:12:34.710923016 -0400 -+++ xulrunner-33.0/mozilla-release/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-07 15:12:48.278838658 -0400 -@@ -180,7 +180,7 @@ int VP8EncoderImpl::InitEncode(const Vid - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, -+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, - 1, NULL); - // populate encoder configuration with default values - if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { diff --git a/xulrunner.spec b/xulrunner.spec index b7475e3..8449943 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -102,10 +102,8 @@ Patch200: mozilla-193-pkgconfig.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch Patch207: firefox-baseline-disable.patch -Patch208: xulrunner-33.0-libvpx-modern.patch # Upstream patches -Patch300: mozilla-1042889.patch # --------------------------------------------------- @@ -246,10 +244,8 @@ cd %{tarballdir} %ifarch %{ix86} %patch207 -p2 -b .baseline %endif -%patch208 -p2 -b .modern # Upstream patches -%patch300 -p1 -b .1042889 %{__rm} -f .mozconfig From a0e96f51f1661dfbf1b91ca6c1032c0685d21d97 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Apr 2015 14:37:53 +0200 Subject: [PATCH 05/50] removed unused patch --- firefox-baseline-disable.patch | 13 ------------- xulrunner.spec | 5 ----- 2 files changed, 18 deletions(-) delete mode 100644 firefox-baseline-disable.patch diff --git a/firefox-baseline-disable.patch b/firefox-baseline-disable.patch deleted file mode 100644 index 806d378..0000000 --- a/firefox-baseline-disable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile -diff -up firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js ---- firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old 2014-09-12 00:25:45.000000000 +0200 -+++ firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js 2014-09-16 14:27:52.447743192 +0200 -@@ -844,7 +844,7 @@ pref("javascript.options.strict", - #ifdef DEBUG - pref("javascript.options.strict.debug", true); - #endif --pref("javascript.options.baselinejit", true); -+pref("javascript.options.baselinejit", false); - pref("javascript.options.ion", true); - pref("javascript.options.asmjs", true); - pref("javascript.options.native_regexp", true); diff --git a/xulrunner.spec b/xulrunner.spec index 8449943..d2201d4 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -101,7 +101,6 @@ Patch20: firefox-build-prbool.patch Patch200: mozilla-193-pkgconfig.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch -Patch207: firefox-baseline-disable.patch # Upstream patches @@ -240,10 +239,6 @@ cd %{tarballdir} %patch200 -p2 -b .pk %patch204 -p2 -b .966424 -# disable baseline JIT on i686 (rhbz#1047079) -%ifarch %{ix86} -%patch207 -p2 -b .baseline -%endif # Upstream patches From 27bff7ab6a4e8590980d51f2c1f15a3f6c467b68 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Apr 2015 15:24:57 +0200 Subject: [PATCH 06/50] removed /mozilla-xremote-client --- xulrunner.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index d2201d4..a4f5054 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -500,7 +500,6 @@ fi %{mozappdir}/components/*.manifest %{mozappdir}/omni.ja %{mozappdir}/*.so -%{mozappdir}/mozilla-xremote-client %{mozappdir}/run-mozilla.sh %{mozappdir}/xulrunner %{mozappdir}/xulrunner-stub From c28fb475f7fea886964493e2c49d394dbb7d52e0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Apr 2015 20:59:44 +0200 Subject: [PATCH 07/50] Added gmp-clearkey to provided files --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index a4f5054..281ec3c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -507,6 +507,7 @@ fi %{mozappdir}/dependentlibs.list %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf %{mozappdir}/plugin-container +%{mozappdir}/gmp-clearkey %if !%{?system_nss} %{mozappdir}/*.chk %endif From 3949c148c5baf5e2be95bc70d5b3aa6089a28b2a Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 16 Apr 2015 13:52:45 +0200 Subject: [PATCH 08/50] Update to 37.0.2 --- sources | 2 +- xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a7e8418..1e885f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d466d850ef9b0a71bce3b208f5f884c firefox-37.0.1.source.tar.bz2 +755c04ee31dbcd28ed4d351b67fe8a8f firefox-37.0.2.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 281ec3c..dc0b15b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,7 +77,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 37.0.1 +Version: 37.0.2 Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -542,6 +542,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Apr 16 2015 Jan Horak - 37.0.2-1 +- Update to 37.0.2 + * Wed Apr 15 2015 Martin Stransky - 37.0.1-1 - Update to 37.0.1 From 5aaaab18aa9df5a3c33c8b42ac709fafbf151525 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 16 Apr 2015 14:27:09 +0200 Subject: [PATCH 09/50] Added skia patch for arm --- aarch64-fix-skia.patch | 18 ++++++++++++++++++ mozilla-build-arm.patch | 35 +++++++++++++++++++++++------------ xulrunner.spec | 2 ++ 3 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 aarch64-fix-skia.patch diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch new file mode 100644 index 0000000..4b9958d --- /dev/null +++ b/aarch64-fix-skia.patch @@ -0,0 +1,18 @@ +Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a9516b553d + +Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h +=================================================================== +--- mozilla-release.orig/gfx/skia/trunk/src/core/SkUtilsArm.h ++++ mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h +@@ -21,9 +21,9 @@ + #define SK_ARM_NEON_MODE_ALWAYS 1 + #define SK_ARM_NEON_MODE_DYNAMIC 2 + +-#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) ++#if defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) + # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC +-#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64) ++#elif defined(__ARM_HAVE_NEON) + # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS + #else + # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch index f98cbe3..86e6f2e 100644 --- a/mozilla-build-arm.patch +++ b/mozilla-build-arm.patch @@ -1,12 +1,23 @@ -diff -up firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-29.0/mozilla-release/gfx/ycbcr/moz.build ---- firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-04-22 07:27:47.000000000 +0200 -+++ firefox-29.0/mozilla-release/gfx/ycbcr/moz.build 2014-04-22 16:40:34.862849368 +0200 -@@ -61,7 +61,7 @@ else: - 'yuv_row_other.cpp', - ] - --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: -+if CONFIG['HAVE_ARM_NEON']: - SOURCES += [ - 'yuv_row_arm.s', - ] +diff -up firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi +--- firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm 2015-03-05 11:28:19.000000000 +0100 ++++ firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2015-03-09 10:02:17.875243261 +0100 +@@ -235,19 +235,6 @@ + 'defines': [ + 'WEBRTC_ARCH_ARM', + ], +- 'conditions': [ +- ['arm_version==7', { +- 'defines': ['WEBRTC_ARCH_ARM_V7', +- 'WEBRTC_BUILD_NEON_LIBS'], +- 'conditions': [ +- ['arm_neon==1', { +- 'defines': ['WEBRTC_ARCH_ARM_NEON',], +- }, { +- 'defines': ['WEBRTC_DETECT_ARM_NEON',], +- }], +- ], +- }], +- ], + }], + ['os_bsd==1', { + 'defines': [ diff --git a/xulrunner.spec b/xulrunner.spec index dc0b15b..347a664 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -96,6 +96,7 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch # workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch +Patch21: aarch64-fix-skia.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -236,6 +237,7 @@ cd %{tarballdir} %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool +%patch21 -p1 -b .aarch64-fix-skia %patch200 -p2 -b .pk %patch204 -p2 -b .966424 From 8017ba78f57ac1de352a20017c06d17740b9f4f8 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 16 Apr 2015 15:21:39 +0200 Subject: [PATCH 10/50] Enable skia by default --- xulrunner-mozconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 6d680ff..e80f39e 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -33,6 +33,7 @@ ac_add_options --disable-updater ac_add_options --enable-chrome-format=omni ac_add_options --disable-gstreamer ac_add_options --enable-pulseaudio +ac_add_options --enable-skia export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 From 30c26d6d0bb52a03e2e527800595b89f95397f85 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 16 Apr 2015 17:36:41 +0200 Subject: [PATCH 11/50] Add gmp-fake also to arm --- xulrunner.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 347a664..fe66e91 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -521,9 +521,7 @@ fi %{mozappdir}/install_app.py %ghost %{mozappdir}/install_app.pyc %ghost %{mozappdir}/install_app.pyo -%ifarch %{ix86} x86_64 %{mozappdir}/gmp-fake/* -%endif %files devel %defattr(-,root,root,-) From c535c4cbfa1c75d5f9b6c829d8c9ae5bb2977bb6 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 27 Apr 2015 15:43:34 +0200 Subject: [PATCH 12/50] Added skia patch for big endian platforms --- mozilla-1005535.patch | 194 ++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 2 + 2 files changed, 196 insertions(+) create mode 100644 mozilla-1005535.patch diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch new file mode 100644 index 0000000..2f0381b --- /dev/null +++ b/mozilla-1005535.patch @@ -0,0 +1,194 @@ +# HG changeset patch +# Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c +# User Steve Singer +Bug 1005535 - Get skia GPU building on big endian. + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -8231,21 +8231,21 @@ dnl Skia + dnl ======================================================== + if test "$MOZ_ENABLE_SKIA"; then + AC_DEFINE(MOZ_ENABLE_SKIA) + AC_DEFINE(USE_SKIA) + if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then + AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) + fi + +- if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then ++# if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then + MOZ_ENABLE_SKIA_GPU=1 + AC_DEFINE(USE_SKIA_GPU) + AC_SUBST(MOZ_ENABLE_SKIA_GPU) +- fi ++# fi + fi + AC_SUBST(MOZ_ENABLE_SKIA) + + dnl ======================================================== + dnl disable xul + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], +diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py +--- a/gfx/skia/generate_mozbuild.py ++++ b/gfx/skia/generate_mozbuild.py +@@ -236,17 +236,17 @@ def generate_separated_sources(platform_ + return True + + return False + + separated = { + 'common': { + #'trunk/src/effects/gradients/SkGradientTileProc.cpp', + 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', +- 'trunk/src/ports/SkDiscardableMemory_none.cpp', ++ #'trunk/src/ports/SkDiscardableMemory_none.cpp', + 'trunk/src/ports/SkImageDecoder_empty.cpp', + 'trunk/src/ports/SkMemory_mozalloc.cpp', + # 'trunk/src/images/SkImages.cpp', + # 'trunk/src/images/SkImageRef.cpp', + # 'trunk/src/images/SkImageRef_GlobalPool.cpp', + # 'trunk/src/images/SkImageRefPool.cpp', + # 'trunk/src/images/SkImageDecoder.cpp', + # 'trunk/src/images/SkImageDecoder_Factory.cpp', +diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +--- a/gfx/skia/moz.build ++++ b/gfx/skia/moz.build +@@ -847,17 +847,16 @@ else: + 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', + 'trunk/src/opts/SkBlitMask_opts_none.cpp', + 'trunk/src/opts/SkBlitRow_opts_none.cpp', + 'trunk/src/opts/SkBlurImage_opts_none.cpp', + 'trunk/src/opts/SkMorphology_opts_none.cpp', + 'trunk/src/opts/SkTextureCompression_opts_none.cpp', + 'trunk/src/opts/SkUtils_opts_none.cpp', + 'trunk/src/opts/SkXfermode_opts_none.cpp', +- 'trunk/src/ports/SkDiscardableMemory_none.cpp', + ] + + + # can we find a better way of dealing with asm sources? + + # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with + if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: + SOURCES += [ +diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h +--- a/gfx/skia/trunk/include/config/SkUserConfig.h ++++ b/gfx/skia/trunk/include/config/SkUserConfig.h +@@ -192,16 +192,17 @@ + + #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) + # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" + #else + # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" + #endif + + // On all platforms we have this byte order ++ + #define SK_A32_SHIFT 24 + #define SK_R32_SHIFT 16 + #define SK_G32_SHIFT 8 + #define SK_B32_SHIFT 0 + + #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 + + #define SK_SUPPORT_LEGACY_GETDEVICE +diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h +--- a/gfx/skia/trunk/include/core/SkColorPriv.h ++++ b/gfx/skia/trunk/include/core/SkColorPriv.h +@@ -27,37 +27,27 @@ + * For easier compatibility with Skia's GPU backend, we further restrict these + * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does + * not directly correspond to the same shift-order, since we have to take endianess + * into account. + * + * 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 + +- #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_RGBA_R32_SHIFT 0 + #define SK_RGBA_G32_SHIFT 8 + #define SK_RGBA_B32_SHIFT 16 + #define SK_RGBA_A32_SHIFT 24 + + #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 ++ + + #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) + #error "can't define PMCOLOR to be RGBA and BGRA" + #endif + + #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \ + (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \ + SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \ +diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h +--- a/gfx/skia/trunk/include/core/SkImageInfo.h ++++ b/gfx/skia/trunk/include/core/SkImageInfo.h +@@ -83,19 +83,20 @@ enum SkColorType { + + kLastEnum_SkColorType = kIndex_8_SkColorType, + + #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) + kN32_SkColorType = kBGRA_8888_SkColorType, + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + kN32_SkColorType = kRGBA_8888_SkColorType, + #else +-#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order" ++ kN32_SkColorType = kBGRA_8888_SkColorType + #endif + ++ + #ifdef SK_SUPPORT_LEGACY_N32_NAME + kPMColor_SkColorType = kN32_SkColorType + #endif + }; + + static int SkColorTypeBytesPerPixel(SkColorType ct) { + static const uint8_t gSize[] = { + 0, // Unknown +diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h +--- a/gfx/skia/trunk/include/gpu/GrTypes.h ++++ b/gfx/skia/trunk/include/gpu/GrTypes.h +@@ -304,25 +304,23 @@ enum GrPixelConfig { + * Byte order is r, g, b, a. This color format is 32 bits per channel + */ + kRGBA_float_GrPixelConfig, + kLast_GrPixelConfig = kRGBA_float_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; + #endif + + // Returns true if the pixel config is a GPU-specific compressed format + // representation. + static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) { + switch (config) { + case kETC1_GrPixelConfig: + case kLATC_GrPixelConfig: diff --git a/xulrunner.spec b/xulrunner.spec index fe66e91..a0f6160 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -97,6 +97,7 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch +Patch22: mozilla-1005535.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -238,6 +239,7 @@ cd %{tarballdir} %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool %patch21 -p1 -b .aarch64-fix-skia +%patch22 -p1 -b .mozilla-1005535 %patch200 -p2 -b .pk %patch204 -p2 -b .966424 From ea81758d7c935b28206ecfb41dec5952fa3026ef Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 27 Apr 2015 15:47:31 +0200 Subject: [PATCH 13/50] Added skia patch for big endian platforms, changelog entry and release bump --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index a0f6160..a884673 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 37.0.2 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -544,6 +544,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 27 2015 Jan Horak - 37.0.2-2 +- Added patch for big endian arches + * Thu Apr 16 2015 Jan Horak - 37.0.2-1 - Update to 37.0.2 From 0d6f3cd8d78aa2544b7bc55af98b8be2a5fa2e65 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 7 May 2015 13:09:09 +0200 Subject: [PATCH 14/50] Update to 38.0 Build 2 --- sources | 2 +- xulrunner.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 1e885f0..ed52843 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -755c04ee31dbcd28ed4d351b67fe8a8f firefox-37.0.2.source.tar.bz2 +d1c66ec031c0cb8aea3df7210dc6955c firefox-38.0.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index a884673..0ba25e0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 37.0.2 -Release: 2%{?pre_tag}%{?dist} +Version: 38.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -544,6 +544,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu May 7 2015 Martin Stransky - 38.0-1 +- Update to 38.0 Build 2 + * Mon Apr 27 2015 Jan Horak - 37.0.2-2 - Added patch for big endian arches From f6cc1db8651e5197ed17bc042337b6ec995fbe82 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 7 May 2015 13:23:15 +0200 Subject: [PATCH 15/50] patch for nss-3.18.0 --- firefox-nss-3.18.0.patch | 13 +++++++++++++ xulrunner.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 firefox-nss-3.18.0.patch diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch new file mode 100644 index 0000000..a693832 --- /dev/null +++ b/firefox-nss-3.18.0.patch @@ -0,0 +1,13 @@ +diff -up mozilla-release/configure.in.old mozilla-release/configure.in +--- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200 ++++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200 +@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_NATIVE_NSS"; then +diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile diff --git a/xulrunner.spec b/xulrunner.spec index 0ba25e0..f098a21 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -98,6 +98,7 @@ Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch Patch22: mozilla-1005535.patch +Patch23: firefox-nss-3.18.0.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -240,6 +241,7 @@ cd %{tarballdir} %patch20 -p1 -b .prbool %patch21 -p1 -b .aarch64-fix-skia %patch22 -p1 -b .mozilla-1005535 +%patch23 -p1 -b .nss-3.18.0 %patch200 -p2 -b .pk %patch204 -p2 -b .966424 From a361a147c0e53e6f5e30d3b7adbd4f8e576f0ca0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 7 May 2015 13:55:27 +0200 Subject: [PATCH 16/50] Updated file lists --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index f098a21..668377e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -525,7 +525,7 @@ fi %{mozappdir}/install_app.py %ghost %{mozappdir}/install_app.pyc %ghost %{mozappdir}/install_app.pyo -%{mozappdir}/gmp-fake/* +%{mozappdir}/gmp-fake*/* %files devel %defattr(-,root,root,-) From db9aa2876275b269cea59b922763121e309857da Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:30:41 +0000 Subject: [PATCH 17/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 668377e..292bf54 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 38.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -546,6 +546,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 38.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 7 2015 Martin Stransky - 38.0-1 - Update to 38.0 Build 2 From efb99048087356ea193c44e781a9f56d808bf59f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 8 Jul 2015 13:10:41 -0400 Subject: [PATCH 18/50] workaround build issues on s390 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) Workaround mis-optimization in javascipt engine on s390 (rhbz#1219542) --- rhbz-1219542-s390-build.patch | 23 +++++++++++++++++++++++ xulrunner.spec | 8 ++++++++ 2 files changed, 31 insertions(+) create mode 100644 rhbz-1219542-s390-build.patch diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch new file mode 100644 index 0000000..4f38200 --- /dev/null +++ b/rhbz-1219542-s390-build.patch @@ -0,0 +1,23 @@ +diff -up mozilla-release/js/src/configure.in.opt mozilla-release/js/src/configure.in +--- mozilla-release/js/src/configure.in.opt 2015-05-04 02:43:23.000000000 +0200 ++++ mozilla-release/js/src/configure.in 2015-05-07 14:21:07.685405039 +0200 +@@ -1492,7 +1492,7 @@ case "$host" in + *-linux*|*-kfreebsd*-gnu|*-gnu*) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' +- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ++ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}" + ;; + + *) +@@ -1674,8 +1674,8 @@ ia64*-hpux*) + # while; Intel recommends against using it. + MOZ_OPTIMIZE_FLAGS="-O2" + elif test "$GNU_CC" -o "$GNU_CXX"; then +- MOZ_PGO_OPTIMIZE_FLAGS="-O3" +- MOZ_OPTIMIZE_FLAGS="-O3" ++ MOZ_PGO_OPTIMIZE_FLAGS="-O1" ++ MOZ_OPTIMIZE_FLAGS="-O1" + if test -z "$CLANG_CC"; then + MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS" + fi diff --git a/xulrunner.spec b/xulrunner.spec index 292bf54..3bbbb4b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -99,6 +99,7 @@ Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch Patch22: mozilla-1005535.patch Patch23: firefox-nss-3.18.0.patch +Patch24: rhbz-1219542-s390-build.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -242,6 +243,9 @@ cd %{tarballdir} %patch21 -p1 -b .aarch64-fix-skia %patch22 -p1 -b .mozilla-1005535 %patch23 -p1 -b .nss-3.18.0 +%ifarch s390 +%patch24 -p1 -b .rhbz-1219542-s390 +%endif %patch200 -p2 -b .pk %patch204 -p2 -b .966424 @@ -346,6 +350,10 @@ 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 %ifarch s390 %{arm} ppc aarch64 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" From a0580a0bd85d367233f59e8a09e4045684d91374 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 10 Jul 2015 14:33:49 +0200 Subject: [PATCH 19/50] Update to 39.0 --- sources | 2 +- xulrunner.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ed52843..bfecd5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1c66ec031c0cb8aea3df7210dc6955c firefox-38.0.source.tar.bz2 +34d9841bc9b8a85aaf06e311cf1cb263 firefox-39.0.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 3bbbb4b..9570fd8 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 38.0 -Release: 2%{?pre_tag}%{?dist} +Version: 39.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -554,6 +554,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jul 10 2015 Martin Stransky - 39.0-1 +- Update to 39.0 + * Fri Jun 19 2015 Fedora Release Engineering - 38.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 588fddfcfcf891ca9cd576a1c2d61aaa458950e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1=C3=AD=C4=8Dek?= Date: Tue, 21 Jul 2015 12:46:14 +0200 Subject: [PATCH 20/50] Fixed xulrunner build on fedora 23, #1243104 --- mozilla-1005535.patch | 152 +++++++--------------- mozilla-1243104.patch | 284 ++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 9 +- 3 files changed, 333 insertions(+), 112 deletions(-) create mode 100644 mozilla-1243104.patch diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch index 2f0381b..ef4f1ac 100644 --- a/mozilla-1005535.patch +++ b/mozilla-1005535.patch @@ -3,15 +3,11 @@ # User Steve Singer Bug 1005535 - Get skia GPU building on big endian. -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -8231,21 +8231,21 @@ dnl Skia - dnl ======================================================== - if test "$MOZ_ENABLE_SKIA"; then - AC_DEFINE(MOZ_ENABLE_SKIA) - AC_DEFINE(USE_SKIA) - if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then +Index: mozilla-release/configure.in +=================================================================== +--- mozilla-release.orig/configure.in ++++ mozilla-release/configure.in +@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) fi @@ -25,63 +21,35 @@ diff --git a/configure.in b/configure.in fi AC_SUBST(MOZ_ENABLE_SKIA) - dnl ======================================================== - dnl disable xul - dnl ======================================================== - MOZ_ARG_DISABLE_BOOL(xul, - [ --disable-xul Disable XUL], -diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py ---- a/gfx/skia/generate_mozbuild.py -+++ b/gfx/skia/generate_mozbuild.py -@@ -236,17 +236,17 @@ def generate_separated_sources(platform_ - return True - - return False - - separated = { +Index: mozilla-release/gfx/skia/generate_mozbuild.py +=================================================================== +--- mozilla-release.orig/gfx/skia/generate_mozbuild.py ++++ mozilla-release/gfx/skia/generate_mozbuild.py +@@ -242,7 +242,6 @@ def generate_separated_sources(platform_ 'common': { #'trunk/src/effects/gradients/SkGradientTileProc.cpp', 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', - 'trunk/src/ports/SkDiscardableMemory_none.cpp', -+ #'trunk/src/ports/SkDiscardableMemory_none.cpp', 'trunk/src/ports/SkImageDecoder_empty.cpp', 'trunk/src/ports/SkMemory_mozalloc.cpp', # 'trunk/src/images/SkImages.cpp', - # 'trunk/src/images/SkImageRef.cpp', - # 'trunk/src/images/SkImageRef_GlobalPool.cpp', - # 'trunk/src/images/SkImageRefPool.cpp', - # 'trunk/src/images/SkImageDecoder.cpp', - # 'trunk/src/images/SkImageDecoder_Factory.cpp', -diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build ---- a/gfx/skia/moz.build -+++ b/gfx/skia/moz.build -@@ -847,17 +847,16 @@ else: - 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', - 'trunk/src/opts/SkBlitMask_opts_none.cpp', - 'trunk/src/opts/SkBlitRow_opts_none.cpp', - 'trunk/src/opts/SkBlurImage_opts_none.cpp', - 'trunk/src/opts/SkMorphology_opts_none.cpp', - 'trunk/src/opts/SkTextureCompression_opts_none.cpp', - 'trunk/src/opts/SkUtils_opts_none.cpp', - 'trunk/src/opts/SkXfermode_opts_none.cpp', -- 'trunk/src/ports/SkDiscardableMemory_none.cpp', - ] - - - # can we find a better way of dealing with asm sources? - - # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with - if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: - SOURCES += [ -diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h ---- a/gfx/skia/trunk/include/config/SkUserConfig.h -+++ b/gfx/skia/trunk/include/config/SkUserConfig.h -@@ -192,16 +192,17 @@ - - #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) - # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" - #else - # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" +Index: mozilla-release/gfx/skia/moz.build +=================================================================== +--- mozilla-release.orig/gfx/skia/moz.build ++++ mozilla-release/gfx/skia/moz.build +@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [ + 'trunk/src/pathops/SkReduceOrder.cpp', + 'trunk/src/pipe/SkGPipeRead.cpp', + 'trunk/src/pipe/SkGPipeWrite.cpp', +- 'trunk/src/ports/SkDiscardableMemory_none.cpp', + 'trunk/src/ports/SkGlobalInitialization_default.cpp', + 'trunk/src/ports/SkImageDecoder_empty.cpp', + 'trunk/src/ports/SkMemory_mozalloc.cpp', +Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h +=================================================================== +--- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h ++++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h +@@ -197,6 +197,7 @@ #endif // On all platforms we have this byte order @@ -89,20 +57,11 @@ diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/inclu #define SK_A32_SHIFT 24 #define SK_R32_SHIFT 16 #define SK_G32_SHIFT 8 - #define SK_B32_SHIFT 0 - - #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 - - #define SK_SUPPORT_LEGACY_GETDEVICE -diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h ---- a/gfx/skia/trunk/include/core/SkColorPriv.h -+++ b/gfx/skia/trunk/include/core/SkColorPriv.h -@@ -27,37 +27,27 @@ - * For easier compatibility with Skia's GPU backend, we further restrict these - * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does - * not directly correspond to the same shift-order, since we have to take endianess - * into account. - * +Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h +=================================================================== +--- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h ++++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h +@@ -32,17 +32,7 @@ * Here we enforce this constraint. */ @@ -120,9 +79,7 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ #define SK_RGBA_R32_SHIFT 0 #define SK_RGBA_G32_SHIFT 8 #define SK_RGBA_B32_SHIFT 16 - #define SK_RGBA_A32_SHIFT 24 - - #define SK_BGRA_B32_SHIFT 0 +@@ -52,7 +42,7 @@ #define SK_BGRA_G32_SHIFT 8 #define SK_BGRA_R32_SHIFT 16 #define SK_BGRA_A32_SHIFT 24 @@ -131,20 +88,11 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) #error "can't define PMCOLOR to be RGBA and BGRA" - #endif - - #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \ - (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \ - SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \ -diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h ---- a/gfx/skia/trunk/include/core/SkImageInfo.h -+++ b/gfx/skia/trunk/include/core/SkImageInfo.h -@@ -83,19 +83,20 @@ enum SkColorType { - - kLastEnum_SkColorType = kIndex_8_SkColorType, - - #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - kN32_SkColorType = kBGRA_8888_SkColorType, +Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h +=================================================================== +--- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h ++++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h +@@ -88,9 +88,10 @@ enum SkColorType { #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) kN32_SkColorType = kRGBA_8888_SkColorType, #else @@ -156,20 +104,11 @@ diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/ #ifdef SK_SUPPORT_LEGACY_N32_NAME kPMColor_SkColorType = kN32_SkColorType #endif - }; - - static int SkColorTypeBytesPerPixel(SkColorType ct) { - static const uint8_t gSize[] = { - 0, // Unknown -diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h ---- a/gfx/skia/trunk/include/gpu/GrTypes.h -+++ b/gfx/skia/trunk/include/gpu/GrTypes.h -@@ -304,25 +304,23 @@ enum GrPixelConfig { - * Byte order is r, g, b, a. This color format is 32 bits per channel - */ - kRGBA_float_GrPixelConfig, - kLast_GrPixelConfig = kRGBA_float_GrPixelConfig - }; +Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h +=================================================================== +--- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h ++++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h +@@ -309,15 +309,13 @@ enum GrPixelConfig { static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; // Aliases for pixel configs that match skia's byte order. @@ -187,8 +126,3 @@ diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/G #endif // Returns true if the pixel config is a GPU-specific compressed format - // representation. - static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) { - switch (config) { - case kETC1_GrPixelConfig: - case kLATC_GrPixelConfig: diff --git a/mozilla-1243104.patch b/mozilla-1243104.patch new file mode 100644 index 0000000..5736869 --- /dev/null +++ b/mozilla-1243104.patch @@ -0,0 +1,284 @@ +From e3ee5c0dbc8814f5114cdddb0f050691e7573b34 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz +Date: Tue, 14 Jul 2015 21:02:13 +0200 +Subject: [PATCH] fixed build + +--- + firefox-nss-3.18.0.patch | 13 ---- + mozilla-1005535.patch | 152 ++++++++++++++--------------------------------- + xulrunner.spec | 9 ++- + 3 files changed, 49 insertions(+), 125 deletions(-) + delete mode 100644 firefox-nss-3.18.0.patch + +diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch +deleted file mode 100644 +index a693832..0000000 +--- a/firefox-nss-3.18.0.patch ++++ /dev/null +@@ -1,13 +0,0 @@ +-diff -up mozilla-release/configure.in.old mozilla-release/configure.in +---- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200 +-+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200 +-@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, +- _USE_SYSTEM_NSS=1 ) +- +- if test -n "$_USE_SYSTEM_NSS"; then +-- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +-+ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- fi +- +- if test -n "$MOZ_NATIVE_NSS"; then +-diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile +diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch +index 2f0381b..ef4f1ac 100644 +--- a/mozilla-1005535.patch ++++ b/mozilla-1005535.patch +@@ -3,15 +3,11 @@ + # User Steve Singer + Bug 1005535 - Get skia GPU building on big endian. + +-diff --git a/configure.in b/configure.in +---- a/configure.in +-+++ b/configure.in +-@@ -8231,21 +8231,21 @@ dnl Skia +- dnl ======================================================== +- if test "$MOZ_ENABLE_SKIA"; then +- AC_DEFINE(MOZ_ENABLE_SKIA) +- AC_DEFINE(USE_SKIA) +- if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then ++Index: mozilla-release/configure.in ++=================================================================== ++--- mozilla-release.orig/configure.in +++++ mozilla-release/configure.in ++@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then + AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) + fi + +@@ -25,63 +21,35 @@ diff --git a/configure.in b/configure.in + fi + AC_SUBST(MOZ_ENABLE_SKIA) + +- dnl ======================================================== +- dnl disable xul +- dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(xul, +- [ --disable-xul Disable XUL], +-diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py +---- a/gfx/skia/generate_mozbuild.py +-+++ b/gfx/skia/generate_mozbuild.py +-@@ -236,17 +236,17 @@ def generate_separated_sources(platform_ +- return True +- +- return False +- +- separated = { ++Index: mozilla-release/gfx/skia/generate_mozbuild.py ++=================================================================== ++--- mozilla-release.orig/gfx/skia/generate_mozbuild.py +++++ mozilla-release/gfx/skia/generate_mozbuild.py ++@@ -242,7 +242,6 @@ def generate_separated_sources(platform_ + 'common': { + #'trunk/src/effects/gradients/SkGradientTileProc.cpp', + 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', + - 'trunk/src/ports/SkDiscardableMemory_none.cpp', +-+ #'trunk/src/ports/SkDiscardableMemory_none.cpp', + 'trunk/src/ports/SkImageDecoder_empty.cpp', + 'trunk/src/ports/SkMemory_mozalloc.cpp', + # 'trunk/src/images/SkImages.cpp', +- # 'trunk/src/images/SkImageRef.cpp', +- # 'trunk/src/images/SkImageRef_GlobalPool.cpp', +- # 'trunk/src/images/SkImageRefPool.cpp', +- # 'trunk/src/images/SkImageDecoder.cpp', +- # 'trunk/src/images/SkImageDecoder_Factory.cpp', +-diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +---- a/gfx/skia/moz.build +-+++ b/gfx/skia/moz.build +-@@ -847,17 +847,16 @@ else: +- 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', +- 'trunk/src/opts/SkBlitMask_opts_none.cpp', +- 'trunk/src/opts/SkBlitRow_opts_none.cpp', +- 'trunk/src/opts/SkBlurImage_opts_none.cpp', +- 'trunk/src/opts/SkMorphology_opts_none.cpp', +- 'trunk/src/opts/SkTextureCompression_opts_none.cpp', +- 'trunk/src/opts/SkUtils_opts_none.cpp', +- 'trunk/src/opts/SkXfermode_opts_none.cpp', +-- 'trunk/src/ports/SkDiscardableMemory_none.cpp', +- ] +- +- +- # can we find a better way of dealing with asm sources? +- +- # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with +- if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: +- SOURCES += [ +-diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h +---- a/gfx/skia/trunk/include/config/SkUserConfig.h +-+++ b/gfx/skia/trunk/include/config/SkUserConfig.h +-@@ -192,16 +192,17 @@ +- +- #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) +- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" +- #else +- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" ++Index: mozilla-release/gfx/skia/moz.build ++=================================================================== ++--- mozilla-release.orig/gfx/skia/moz.build +++++ mozilla-release/gfx/skia/moz.build ++@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [ ++ 'trunk/src/pathops/SkReduceOrder.cpp', ++ 'trunk/src/pipe/SkGPipeRead.cpp', ++ 'trunk/src/pipe/SkGPipeWrite.cpp', ++- 'trunk/src/ports/SkDiscardableMemory_none.cpp', ++ 'trunk/src/ports/SkGlobalInitialization_default.cpp', ++ 'trunk/src/ports/SkImageDecoder_empty.cpp', ++ 'trunk/src/ports/SkMemory_mozalloc.cpp', ++Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h ++=================================================================== ++--- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h +++++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h ++@@ -197,6 +197,7 @@ + #endif + + // On all platforms we have this byte order +@@ -89,20 +57,11 @@ diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/inclu + #define SK_A32_SHIFT 24 + #define SK_R32_SHIFT 16 + #define SK_G32_SHIFT 8 +- #define SK_B32_SHIFT 0 +- +- #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 +- +- #define SK_SUPPORT_LEGACY_GETDEVICE +-diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h +---- a/gfx/skia/trunk/include/core/SkColorPriv.h +-+++ b/gfx/skia/trunk/include/core/SkColorPriv.h +-@@ -27,37 +27,27 @@ +- * For easier compatibility with Skia's GPU backend, we further restrict these +- * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does +- * not directly correspond to the same shift-order, since we have to take endianess +- * into account. +- * ++Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h ++=================================================================== ++--- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h +++++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h ++@@ -32,17 +32,7 @@ + * Here we enforce this constraint. + */ + +@@ -120,9 +79,7 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ + #define SK_RGBA_R32_SHIFT 0 + #define SK_RGBA_G32_SHIFT 8 + #define SK_RGBA_B32_SHIFT 16 +- #define SK_RGBA_A32_SHIFT 24 +- +- #define SK_BGRA_B32_SHIFT 0 ++@@ -52,7 +42,7 @@ + #define SK_BGRA_G32_SHIFT 8 + #define SK_BGRA_R32_SHIFT 16 + #define SK_BGRA_A32_SHIFT 24 +@@ -131,20 +88,11 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ + + #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) + #error "can't define PMCOLOR to be RGBA and BGRA" +- #endif +- +- #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \ +- (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \ +- SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \ +-diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h +---- a/gfx/skia/trunk/include/core/SkImageInfo.h +-+++ b/gfx/skia/trunk/include/core/SkImageInfo.h +-@@ -83,19 +83,20 @@ enum SkColorType { +- +- kLastEnum_SkColorType = kIndex_8_SkColorType, +- +- #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) +- kN32_SkColorType = kBGRA_8888_SkColorType, ++Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h ++=================================================================== ++--- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h +++++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h ++@@ -88,9 +88,10 @@ enum SkColorType { + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + kN32_SkColorType = kRGBA_8888_SkColorType, + #else +@@ -156,20 +104,11 @@ diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/ + #ifdef SK_SUPPORT_LEGACY_N32_NAME + kPMColor_SkColorType = kN32_SkColorType + #endif +- }; +- +- static int SkColorTypeBytesPerPixel(SkColorType ct) { +- static const uint8_t gSize[] = { +- 0, // Unknown +-diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h +---- a/gfx/skia/trunk/include/gpu/GrTypes.h +-+++ b/gfx/skia/trunk/include/gpu/GrTypes.h +-@@ -304,25 +304,23 @@ enum GrPixelConfig { +- * Byte order is r, g, b, a. This color format is 32 bits per channel +- */ +- kRGBA_float_GrPixelConfig, +- kLast_GrPixelConfig = kRGBA_float_GrPixelConfig +- }; ++Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h ++=================================================================== ++--- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h +++++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h ++@@ -309,15 +309,13 @@ enum GrPixelConfig { + static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; + + // Aliases for pixel configs that match skia's byte order. +@@ -187,8 +126,3 @@ diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/G + #endif + + // Returns true if the pixel config is a GPU-specific compressed format +- // representation. +- static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) { +- switch (config) { +- case kETC1_GrPixelConfig: +- case kLATC_GrPixelConfig: +diff --git a/xulrunner.spec b/xulrunner.spec +index 9570fd8..e9447b3 100644 +--- a/xulrunner.spec ++++ b/xulrunner.spec +@@ -78,7 +78,7 @@ + Summary: XUL Runtime for Gecko Applications + Name: xulrunner + Version: 39.0 +-Release: 1%{?pre_tag}%{?dist} ++Release: 2%{?pre_tag}%{?dist} + URL: http://developer.mozilla.org/En/XULRunner + License: MPLv1.1 or GPLv2+ or LGPLv2+ + Group: Applications/Internet +@@ -98,7 +98,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch + Patch20: firefox-build-prbool.patch + Patch21: aarch64-fix-skia.patch + Patch22: mozilla-1005535.patch +-Patch23: firefox-nss-3.18.0.patch + Patch24: rhbz-1219542-s390-build.patch + + # Fedora specific patches +@@ -242,7 +241,6 @@ cd %{tarballdir} + %patch20 -p1 -b .prbool + %patch21 -p1 -b .aarch64-fix-skia + %patch22 -p1 -b .mozilla-1005535 +-%patch23 -p1 -b .nss-3.18.0 + %ifarch s390 + %patch24 -p1 -b .rhbz-1219542-s390 + %endif +@@ -554,6 +552,11 @@ fi + #--------------------------------------------------------------------- + + %changelog ++* Tue Jul 14 2015 Marcin Juszkiewicz - 39.0-2 ++- fixed build ++ - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available ++ - refreshed mozilla-1005535.patch patch to apply ++ + * Fri Jul 10 2015 Martin Stransky - 39.0-1 + - Update to 39.0 + +-- +2.4.5 + diff --git a/xulrunner.spec b/xulrunner.spec index 9570fd8..e9447b3 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 39.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -98,7 +98,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch Patch22: mozilla-1005535.patch -Patch23: firefox-nss-3.18.0.patch Patch24: rhbz-1219542-s390-build.patch # Fedora specific patches @@ -242,7 +241,6 @@ cd %{tarballdir} %patch20 -p1 -b .prbool %patch21 -p1 -b .aarch64-fix-skia %patch22 -p1 -b .mozilla-1005535 -%patch23 -p1 -b .nss-3.18.0 %ifarch s390 %patch24 -p1 -b .rhbz-1219542-s390 %endif @@ -554,6 +552,11 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jul 14 2015 Marcin Juszkiewicz - 39.0-2 +- fixed build + - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available + - refreshed mozilla-1005535.patch patch to apply + * Fri Jul 10 2015 Martin Stransky - 39.0-1 - Update to 39.0 From f5c38e0137e78377fc3e55726551b314567ffbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1=C3=AD=C4=8Dek?= Date: Wed, 22 Jul 2015 14:09:49 +0200 Subject: [PATCH 21/50] Removed unneeded patch files --- firefox-nss-3.18.0.patch | 13 -- mozilla-1243104.patch | 284 --------------------------------------- xulrunner.spec | 5 +- 3 files changed, 4 insertions(+), 298 deletions(-) delete mode 100644 firefox-nss-3.18.0.patch delete mode 100644 mozilla-1243104.patch diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch deleted file mode 100644 index a693832..0000000 --- a/firefox-nss-3.18.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mozilla-release/configure.in.old mozilla-release/configure.in ---- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200 -+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200 -@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, - _USE_SYSTEM_NSS=1 ) - - if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) - fi - - if test -n "$MOZ_NATIVE_NSS"; then -diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile diff --git a/mozilla-1243104.patch b/mozilla-1243104.patch deleted file mode 100644 index 5736869..0000000 --- a/mozilla-1243104.patch +++ /dev/null @@ -1,284 +0,0 @@ -From e3ee5c0dbc8814f5114cdddb0f050691e7573b34 Mon Sep 17 00:00:00 2001 -From: Marcin Juszkiewicz -Date: Tue, 14 Jul 2015 21:02:13 +0200 -Subject: [PATCH] fixed build - ---- - firefox-nss-3.18.0.patch | 13 ---- - mozilla-1005535.patch | 152 ++++++++++++++--------------------------------- - xulrunner.spec | 9 ++- - 3 files changed, 49 insertions(+), 125 deletions(-) - delete mode 100644 firefox-nss-3.18.0.patch - -diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch -deleted file mode 100644 -index a693832..0000000 ---- a/firefox-nss-3.18.0.patch -+++ /dev/null -@@ -1,13 +0,0 @@ --diff -up mozilla-release/configure.in.old mozilla-release/configure.in ----- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200 --+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200 --@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, -- _USE_SYSTEM_NSS=1 ) -- -- if test -n "$_USE_SYSTEM_NSS"; then --- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) --+ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -- fi -- -- if test -n "$MOZ_NATIVE_NSS"; then --diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile -diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch -index 2f0381b..ef4f1ac 100644 ---- a/mozilla-1005535.patch -+++ b/mozilla-1005535.patch -@@ -3,15 +3,11 @@ - # User Steve Singer - Bug 1005535 - Get skia GPU building on big endian. - --diff --git a/configure.in b/configure.in ----- a/configure.in --+++ b/configure.in --@@ -8231,21 +8231,21 @@ dnl Skia -- dnl ======================================================== -- if test "$MOZ_ENABLE_SKIA"; then -- AC_DEFINE(MOZ_ENABLE_SKIA) -- AC_DEFINE(USE_SKIA) -- if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then -+Index: mozilla-release/configure.in -+=================================================================== -+--- mozilla-release.orig/configure.in -++++ mozilla-release/configure.in -+@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then - AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) - fi - -@@ -25,63 +21,35 @@ diff --git a/configure.in b/configure.in - fi - AC_SUBST(MOZ_ENABLE_SKIA) - -- dnl ======================================================== -- dnl disable xul -- dnl ======================================================== -- MOZ_ARG_DISABLE_BOOL(xul, -- [ --disable-xul Disable XUL], --diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py ----- a/gfx/skia/generate_mozbuild.py --+++ b/gfx/skia/generate_mozbuild.py --@@ -236,17 +236,17 @@ def generate_separated_sources(platform_ -- return True -- -- return False -- -- separated = { -+Index: mozilla-release/gfx/skia/generate_mozbuild.py -+=================================================================== -+--- mozilla-release.orig/gfx/skia/generate_mozbuild.py -++++ mozilla-release/gfx/skia/generate_mozbuild.py -+@@ -242,7 +242,6 @@ def generate_separated_sources(platform_ - 'common': { - #'trunk/src/effects/gradients/SkGradientTileProc.cpp', - 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', - - 'trunk/src/ports/SkDiscardableMemory_none.cpp', --+ #'trunk/src/ports/SkDiscardableMemory_none.cpp', - 'trunk/src/ports/SkImageDecoder_empty.cpp', - 'trunk/src/ports/SkMemory_mozalloc.cpp', - # 'trunk/src/images/SkImages.cpp', -- # 'trunk/src/images/SkImageRef.cpp', -- # 'trunk/src/images/SkImageRef_GlobalPool.cpp', -- # 'trunk/src/images/SkImageRefPool.cpp', -- # 'trunk/src/images/SkImageDecoder.cpp', -- # 'trunk/src/images/SkImageDecoder_Factory.cpp', --diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build ----- a/gfx/skia/moz.build --+++ b/gfx/skia/moz.build --@@ -847,17 +847,16 @@ else: -- 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', -- 'trunk/src/opts/SkBlitMask_opts_none.cpp', -- 'trunk/src/opts/SkBlitRow_opts_none.cpp', -- 'trunk/src/opts/SkBlurImage_opts_none.cpp', -- 'trunk/src/opts/SkMorphology_opts_none.cpp', -- 'trunk/src/opts/SkTextureCompression_opts_none.cpp', -- 'trunk/src/opts/SkUtils_opts_none.cpp', -- 'trunk/src/opts/SkXfermode_opts_none.cpp', --- 'trunk/src/ports/SkDiscardableMemory_none.cpp', -- ] -- -- -- # can we find a better way of dealing with asm sources? -- -- # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with -- if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: -- SOURCES += [ --diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h ----- a/gfx/skia/trunk/include/config/SkUserConfig.h --+++ b/gfx/skia/trunk/include/config/SkUserConfig.h --@@ -192,16 +192,17 @@ -- -- #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) -- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" -- #else -- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" -+Index: mozilla-release/gfx/skia/moz.build -+=================================================================== -+--- mozilla-release.orig/gfx/skia/moz.build -++++ mozilla-release/gfx/skia/moz.build -+@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [ -+ 'trunk/src/pathops/SkReduceOrder.cpp', -+ 'trunk/src/pipe/SkGPipeRead.cpp', -+ 'trunk/src/pipe/SkGPipeWrite.cpp', -+- 'trunk/src/ports/SkDiscardableMemory_none.cpp', -+ 'trunk/src/ports/SkGlobalInitialization_default.cpp', -+ 'trunk/src/ports/SkImageDecoder_empty.cpp', -+ 'trunk/src/ports/SkMemory_mozalloc.cpp', -+Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h -+=================================================================== -+--- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h -++++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h -+@@ -197,6 +197,7 @@ - #endif - - // On all platforms we have this byte order -@@ -89,20 +57,11 @@ diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/inclu - #define SK_A32_SHIFT 24 - #define SK_R32_SHIFT 16 - #define SK_G32_SHIFT 8 -- #define SK_B32_SHIFT 0 -- -- #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 -- -- #define SK_SUPPORT_LEGACY_GETDEVICE --diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h ----- a/gfx/skia/trunk/include/core/SkColorPriv.h --+++ b/gfx/skia/trunk/include/core/SkColorPriv.h --@@ -27,37 +27,27 @@ -- * For easier compatibility with Skia's GPU backend, we further restrict these -- * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does -- * not directly correspond to the same shift-order, since we have to take endianess -- * into account. -- * -+Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h -+=================================================================== -+--- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h -++++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h -+@@ -32,17 +32,7 @@ - * Here we enforce this constraint. - */ - -@@ -120,9 +79,7 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ - #define SK_RGBA_R32_SHIFT 0 - #define SK_RGBA_G32_SHIFT 8 - #define SK_RGBA_B32_SHIFT 16 -- #define SK_RGBA_A32_SHIFT 24 -- -- #define SK_BGRA_B32_SHIFT 0 -+@@ -52,7 +42,7 @@ - #define SK_BGRA_G32_SHIFT 8 - #define SK_BGRA_R32_SHIFT 16 - #define SK_BGRA_A32_SHIFT 24 -@@ -131,20 +88,11 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/ - - #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) - #error "can't define PMCOLOR to be RGBA and BGRA" -- #endif -- -- #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \ -- (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \ -- SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \ --diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h ----- a/gfx/skia/trunk/include/core/SkImageInfo.h --+++ b/gfx/skia/trunk/include/core/SkImageInfo.h --@@ -83,19 +83,20 @@ enum SkColorType { -- -- kLastEnum_SkColorType = kIndex_8_SkColorType, -- -- #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) -- kN32_SkColorType = kBGRA_8888_SkColorType, -+Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h -+=================================================================== -+--- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h -++++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h -+@@ -88,9 +88,10 @@ enum SkColorType { - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kN32_SkColorType = kRGBA_8888_SkColorType, - #else -@@ -156,20 +104,11 @@ diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/ - #ifdef SK_SUPPORT_LEGACY_N32_NAME - kPMColor_SkColorType = kN32_SkColorType - #endif -- }; -- -- static int SkColorTypeBytesPerPixel(SkColorType ct) { -- static const uint8_t gSize[] = { -- 0, // Unknown --diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h ----- a/gfx/skia/trunk/include/gpu/GrTypes.h --+++ b/gfx/skia/trunk/include/gpu/GrTypes.h --@@ -304,25 +304,23 @@ enum GrPixelConfig { -- * Byte order is r, g, b, a. This color format is 32 bits per channel -- */ -- kRGBA_float_GrPixelConfig, -- kLast_GrPixelConfig = kRGBA_float_GrPixelConfig -- }; -+Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h -+=================================================================== -+--- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h -++++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h -+@@ -309,15 +309,13 @@ enum GrPixelConfig { - static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; - - // Aliases for pixel configs that match skia's byte order. -@@ -187,8 +126,3 @@ diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/G - #endif - - // Returns true if the pixel config is a GPU-specific compressed format -- // representation. -- static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) { -- switch (config) { -- case kETC1_GrPixelConfig: -- case kLATC_GrPixelConfig: -diff --git a/xulrunner.spec b/xulrunner.spec -index 9570fd8..e9447b3 100644 ---- a/xulrunner.spec -+++ b/xulrunner.spec -@@ -78,7 +78,7 @@ - Summary: XUL Runtime for Gecko Applications - Name: xulrunner - Version: 39.0 --Release: 1%{?pre_tag}%{?dist} -+Release: 2%{?pre_tag}%{?dist} - URL: http://developer.mozilla.org/En/XULRunner - License: MPLv1.1 or GPLv2+ or LGPLv2+ - Group: Applications/Internet -@@ -98,7 +98,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch - Patch20: firefox-build-prbool.patch - Patch21: aarch64-fix-skia.patch - Patch22: mozilla-1005535.patch --Patch23: firefox-nss-3.18.0.patch - Patch24: rhbz-1219542-s390-build.patch - - # Fedora specific patches -@@ -242,7 +241,6 @@ cd %{tarballdir} - %patch20 -p1 -b .prbool - %patch21 -p1 -b .aarch64-fix-skia - %patch22 -p1 -b .mozilla-1005535 --%patch23 -p1 -b .nss-3.18.0 - %ifarch s390 - %patch24 -p1 -b .rhbz-1219542-s390 - %endif -@@ -554,6 +552,11 @@ fi - #--------------------------------------------------------------------- - - %changelog -+* Tue Jul 14 2015 Marcin Juszkiewicz - 39.0-2 -+- fixed build -+ - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available -+ - refreshed mozilla-1005535.patch patch to apply -+ - * Fri Jul 10 2015 Martin Stransky - 39.0-1 - - Update to 39.0 - --- -2.4.5 - diff --git a/xulrunner.spec b/xulrunner.spec index e9447b3..4f570b2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 39.0 -Release: 2%{?pre_tag}%{?dist} +Release: 3%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -552,6 +552,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Jul 22 2015 Petr Jasicek - 39.0-3 +- Removed unneeded patch files + * Tue Jul 14 2015 Marcin Juszkiewicz - 39.0-2 - fixed build - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available From dfdecde2b971da01f55aea391cd8f015c77fa5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1=C3=AD=C4=8Dek?= Date: Tue, 25 Aug 2015 11:09:44 +0200 Subject: [PATCH 22/50] Update to 40.0 --- sources | 2 +- xulrunner.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index bfecd5f..7e7ec37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d9841bc9b8a85aaf06e311cf1cb263 firefox-39.0.source.tar.bz2 +62b9e6a4a46874a0be523fe41d3176e2 firefox-40.0.source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 4f570b2..699e376 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 39.0 -Release: 3%{?pre_tag}%{?dist} +Version: 40.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -552,6 +552,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Aug 25 2015 Petr Jasicek - 40.0-1 +- Update to 40.0 + * Wed Jul 22 2015 Petr Jasicek - 39.0-3 - Removed unneeded patch files From af1aad65f1728bcb399fbe0fdf14d75d97973edd Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 2 Sep 2015 22:01:45 +0200 Subject: [PATCH 23/50] Disablet Skia to build on second arches --- xulrunner-mozconfig | 2 +- xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index e80f39e..0dcf27d 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -33,7 +33,7 @@ ac_add_options --disable-updater ac_add_options --enable-chrome-format=omni ac_add_options --disable-gstreamer ac_add_options --enable-pulseaudio -ac_add_options --enable-skia +ac_add_options --disable-skia export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/xulrunner.spec b/xulrunner.spec index 699e376..28145a4 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 40.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -552,6 +552,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Sep 2 2015 Martin Stransky - 40.0-2 +- Disable Skia to build on second arches + * Tue Aug 25 2015 Petr Jasicek - 40.0-1 - Update to 40.0 From 104f4ba570ea0567259096006dc6abf73866b6b3 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 1 Dec 2015 12:26:02 +0100 Subject: [PATCH 24/50] Update to 42.0 --- .gitignore | 1 + aarch64-fix-skia.patch | 4 +- mozilla-1005535.patch | 128 ----------------------------------------- sources | 2 +- xulrunner.spec | 19 +++--- 5 files changed, 14 insertions(+), 140 deletions(-) delete mode 100644 mozilla-1005535.patch diff --git a/.gitignore b/.gitignore index 0d88a9e..64b20fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /firefox-*.source.tar.bz2 /xulrunner-*.source.tar.bz2 +/firefox-42.0.source.tar.xz diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch index 4b9958d..17df80e 100644 --- a/aarch64-fix-skia.patch +++ b/aarch64-fix-skia.patch @@ -2,8 +2,8 @@ Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a95 Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h =================================================================== ---- mozilla-release.orig/gfx/skia/trunk/src/core/SkUtilsArm.h -+++ mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h +--- mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h ++++ mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h @@ -21,9 +21,9 @@ #define SK_ARM_NEON_MODE_ALWAYS 1 #define SK_ARM_NEON_MODE_DYNAMIC 2 diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch deleted file mode 100644 index ef4f1ac..0000000 --- a/mozilla-1005535.patch +++ /dev/null @@ -1,128 +0,0 @@ -# HG changeset patch -# Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c -# User Steve Singer -Bug 1005535 - Get skia GPU building on big endian. - -Index: mozilla-release/configure.in -=================================================================== ---- mozilla-release.orig/configure.in -+++ mozilla-release/configure.in -@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then - AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) - fi - -- if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then -+# if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then - MOZ_ENABLE_SKIA_GPU=1 - AC_DEFINE(USE_SKIA_GPU) - AC_SUBST(MOZ_ENABLE_SKIA_GPU) -- fi -+# fi - fi - AC_SUBST(MOZ_ENABLE_SKIA) - -Index: mozilla-release/gfx/skia/generate_mozbuild.py -=================================================================== ---- mozilla-release.orig/gfx/skia/generate_mozbuild.py -+++ mozilla-release/gfx/skia/generate_mozbuild.py -@@ -242,7 +242,6 @@ def generate_separated_sources(platform_ - 'common': { - #'trunk/src/effects/gradients/SkGradientTileProc.cpp', - 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', -- 'trunk/src/ports/SkDiscardableMemory_none.cpp', - 'trunk/src/ports/SkImageDecoder_empty.cpp', - 'trunk/src/ports/SkMemory_mozalloc.cpp', - # 'trunk/src/images/SkImages.cpp', -Index: mozilla-release/gfx/skia/moz.build -=================================================================== ---- mozilla-release.orig/gfx/skia/moz.build -+++ mozilla-release/gfx/skia/moz.build -@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [ - 'trunk/src/pathops/SkReduceOrder.cpp', - 'trunk/src/pipe/SkGPipeRead.cpp', - 'trunk/src/pipe/SkGPipeWrite.cpp', -- 'trunk/src/ports/SkDiscardableMemory_none.cpp', - 'trunk/src/ports/SkGlobalInitialization_default.cpp', - 'trunk/src/ports/SkImageDecoder_empty.cpp', - 'trunk/src/ports/SkMemory_mozalloc.cpp', -Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h -=================================================================== ---- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h -+++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h -@@ -197,6 +197,7 @@ - #endif - - // On all platforms we have this byte order -+ - #define SK_A32_SHIFT 24 - #define SK_R32_SHIFT 16 - #define SK_G32_SHIFT 8 -Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h -=================================================================== ---- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h -+++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h -@@ -32,17 +32,7 @@ - * 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 - -- #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_RGBA_R32_SHIFT 0 - #define SK_RGBA_G32_SHIFT 8 - #define SK_RGBA_B32_SHIFT 16 -@@ -52,7 +42,7 @@ - #define SK_BGRA_G32_SHIFT 8 - #define SK_BGRA_R32_SHIFT 16 - #define SK_BGRA_A32_SHIFT 24 --#endif -+ - - #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) - #error "can't define PMCOLOR to be RGBA and BGRA" -Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h -=================================================================== ---- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h -+++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h -@@ -88,9 +88,10 @@ enum SkColorType { - #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - kN32_SkColorType = kRGBA_8888_SkColorType, - #else --#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order" -+ kN32_SkColorType = kBGRA_8888_SkColorType - #endif - -+ - #ifdef SK_SUPPORT_LEGACY_N32_NAME - kPMColor_SkColorType = kN32_SkColorType - #endif -Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h -=================================================================== ---- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h -+++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h -@@ -309,15 +309,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; - #endif - - // Returns true if the pixel config is a GPU-specific compressed format diff --git a/sources b/sources index 7e7ec37..1c7d7c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62b9e6a4a46874a0be523fe41d3176e2 firefox-40.0.source.tar.bz2 +d610bf10a75afb4734045e1a43d8eba4 firefox-42.0.source.tar.xz diff --git a/xulrunner.spec b/xulrunner.spec index 28145a4..6388241 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -23,14 +23,14 @@ %global libvpx_version 1.0.0 %if %{?system_nss} -%global nspr_version 4.10.2 +%global nspr_version 4.10.10 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.15.4 +%global nss_version 3.19.2 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %endif %if %{?system_sqlite} -%global sqlite_version 3.7.13 +%global sqlite_version 3.8.4.2 # The actual sqlite version (see #480989): %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif @@ -46,7 +46,7 @@ %global tarballname firefox %global mozappdir %{_libdir}/%{name} -%global tarballdir mozilla-release +%global tarballdir %{tarballname}-%{version} # crash reporter work only on x86/x86_64 %ifarch %{ix86} x86_64 @@ -77,12 +77,12 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 40.0 -Release: 2%{?pre_tag}%{?dist} +Version: 42.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}.source.tar.bz2 +Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}.source.tar.xz Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -97,7 +97,6 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch -Patch22: mozilla-1005535.patch Patch24: rhbz-1219542-s390-build.patch # Fedora specific patches @@ -240,7 +239,6 @@ cd %{tarballdir} %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool %patch21 -p1 -b .aarch64-fix-skia -%patch22 -p1 -b .mozilla-1005535 %ifarch s390 %patch24 -p1 -b .rhbz-1219542-s390 %endif @@ -552,6 +550,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Dec 1 2015 Martin Stransky - 42.0-1 +- Update to 42.0 + * Wed Sep 2 2015 Martin Stransky - 40.0-2 - Disable Skia to build on second arches From 5ae495fd5c706a61fbf03f8b857d3ab88521473d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 1 Dec 2015 13:07:59 +0100 Subject: [PATCH 25/50] Build fix --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index 6388241..ba8eb5b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -137,6 +137,7 @@ BuildRequires: libcurl-devel BuildRequires: libvpx-devel >= %{libvpx_version} BuildRequires: autoconf213 BuildRequires: pulseaudio-libs-devel +BuildRequires: pkgconfig(gconf-2.0) Requires: mozilla-filesystem %if %{?system_nss} From fd7866ba134079300db04a815e1337e4d6e38f7a Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 1 Dec 2015 13:56:55 +0100 Subject: [PATCH 26/50] build fix --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index ba8eb5b..ec4b37c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -138,6 +138,7 @@ BuildRequires: libvpx-devel >= %{libvpx_version} BuildRequires: autoconf213 BuildRequires: pulseaudio-libs-devel BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: yasm Requires: mozilla-filesystem %if %{?system_nss} From 197a6537ee19f78acef175c56dd60e484b80da06 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 1 Dec 2015 16:51:17 -0500 Subject: [PATCH 27/50] rebuild for libvpx 1.5.0 --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index ec4b37c..94da967 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 42.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -552,6 +552,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Dec 1 2015 Tom Callaway - 42.0-2 +- rebuild for libvpx 1.5.0 + * Tue Dec 1 2015 Martin Stransky - 42.0-1 - Update to 42.0 From fcb40580a959f31f9b72456fc3998b49e559739e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 26 Jan 2016 13:37:16 +0100 Subject: [PATCH 28/50] Update to 44.0 --- .gitignore | 1 + firefox-build.patch | 11 ----------- sources | 2 +- xulrunner.spec | 9 +++++---- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 firefox-build.patch diff --git a/.gitignore b/.gitignore index 64b20fe..d7e8527 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /firefox-*.source.tar.bz2 /xulrunner-*.source.tar.bz2 /firefox-42.0.source.tar.xz +/firefox-44.0.source.tar.xz diff --git a/firefox-build.patch b/firefox-build.patch deleted file mode 100644 index 262337c..0000000 --- a/firefox-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up firefox-32.0/mozilla-release/media/libstagefright/moz.build.old firefox-32.0/mozilla-release/media/libstagefright/moz.build ---- firefox-32.0/mozilla-release/media/libstagefright/moz.build.old 2014-08-26 05:38:08.000000000 +0200 -+++ firefox-32.0/mozilla-release/media/libstagefright/moz.build 2014-08-27 15:40:12.030299348 +0200 -@@ -120,7 +120,6 @@ elif CONFIG['GNU_CXX']: - '-Wno-sign-compare' - ] - CXXFLAGS += [ -- '-Wno-format', - '-Wno-multichar', - '-Wno-sign-compare', - '-Wno-unused', diff --git a/sources b/sources index 1c7d7c4..bf85a54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d610bf10a75afb4734045e1a43d8eba4 firefox-42.0.source.tar.xz +9d940e72f9eaff767fafcfbcc387594d firefox-44.0.source.tar.xz diff --git a/xulrunner.spec b/xulrunner.spec index 94da967..b94a2e5 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -77,8 +77,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 42.0 -Release: 2%{?pre_tag}%{?dist} +Version: 44.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -89,7 +89,6 @@ Source21: %{name}.sh.in # build patches Patch1: xulrunner-install-dir.patch -Patch2: firefox-build.patch Patch3: mozilla-build-arm.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-24.0-jemalloc-ppc.patch @@ -235,7 +234,6 @@ debug %{name}, you want to install %{name}-debuginfo instead. cd %{tarballdir} %patch1 -p1 -%patch2 -p2 -b .build %patch3 -p2 -b .arm %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines @@ -552,6 +550,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Jan 26 2016 Martin Stransky - 44.0-1 +- Update to 44.0 + * Tue Dec 1 2015 Tom Callaway - 42.0-2 - rebuild for libvpx 1.5.0 From 97e3e8e361ba2d56d1bb5d497b328db57c2e010a Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 26 Jan 2016 15:32:31 +0100 Subject: [PATCH 29/50] Fixed file list --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index b94a2e5..6e9566a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -510,6 +510,7 @@ fi %{mozappdir}/components/*.manifest %{mozappdir}/omni.ja %{mozappdir}/*.so +%{mozappdir}/rapl %{mozappdir}/run-mozilla.sh %{mozappdir}/xulrunner %{mozappdir}/xulrunner-stub From 8f10697eafe82413e62f8c69b769bd0db974970b Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 27 Jan 2016 09:28:38 +0100 Subject: [PATCH 30/50] build fix --- xulrunner.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xulrunner.spec b/xulrunner.spec index 6e9566a..c1e97fa 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -510,7 +510,9 @@ fi %{mozappdir}/components/*.manifest %{mozappdir}/omni.ja %{mozappdir}/*.so +%ifarch %{ix86} x86_64 %{mozappdir}/rapl +%endif %{mozappdir}/run-mozilla.sh %{mozappdir}/xulrunner %{mozappdir}/xulrunner-stub From 05a100edbfa280b6bab53e52c170e2c2ff9c8de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 1 Feb 2016 12:45:25 +0100 Subject: [PATCH 31/50] refresh s390 patch --- rhbz-1219542-s390-build.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch index 4f38200..3734ce5 100644 --- a/rhbz-1219542-s390-build.patch +++ b/rhbz-1219542-s390-build.patch @@ -1,16 +1,16 @@ -diff -up mozilla-release/js/src/configure.in.opt mozilla-release/js/src/configure.in ---- mozilla-release/js/src/configure.in.opt 2015-05-04 02:43:23.000000000 +0200 -+++ mozilla-release/js/src/configure.in 2015-05-07 14:21:07.685405039 +0200 -@@ -1492,7 +1492,7 @@ case "$host" in +diff -up firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390 firefox-43.0.3/js/src/configure.in +--- firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390 2015-12-23 17:11:01.000000000 -0500 ++++ firefox-43.0.3/js/src/configure.in 2016-01-03 08:08:27.139956990 -0500 +@@ -1466,7 +1466,7 @@ case "$host" in + *-linux*|*-kfreebsd*-gnu|*-gnu*) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" - HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' - HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" + HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}" ;; *) -@@ -1674,8 +1674,8 @@ ia64*-hpux*) +@@ -1649,8 +1649,8 @@ ia64*-hpux*) # while; Intel recommends against using it. MOZ_OPTIMIZE_FLAGS="-O2" elif test "$GNU_CC" -o "$GNU_CXX"; then From caeb8b7b700fe93f2d4bfd01eeaa5c7d0959f16b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:52:57 +0000 Subject: [PATCH 32/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index c1e97fa..9199c71 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -553,6 +553,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 44.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 26 2016 Martin Stransky - 44.0-1 - Update to 44.0 From 998d1df3b6d635523ac7a10c90da004f299702a4 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 15 Feb 2016 11:26:55 +0100 Subject: [PATCH 33/50] gcc 6 build fix --- firefox-gcc-6.0.patch | 26 ++++++++++++++++++++++++++ xulrunner.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 firefox-gcc-6.0.patch diff --git a/firefox-gcc-6.0.patch b/firefox-gcc-6.0.patch new file mode 100644 index 0000000..0a74d36 --- /dev/null +++ b/firefox-gcc-6.0.patch @@ -0,0 +1,26 @@ +diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl +--- firefox-44.0/nsprpub/config/make-system-wrappers.pl.back 2016-01-24 00:23:49.000000000 +0100 ++++ firefox-44.0/nsprpub/config/make-system-wrappers.pl 2016-02-02 14:58:45.064112655 +0100 +@@ -19,7 +19,9 @@ while () { + open OUT, ">$output_dir/$_"; + print OUT "#pragma GCC system_header\n"; # suppress include_next warning + print OUT "#pragma GCC visibility push(default)\n"; ++ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; + print OUT "#include_next \<$_\>\n"; ++ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; + print OUT "#pragma GCC visibility pop\n"; + close OUT; + } +diff -up firefox-44.0/mozglue/build/arm.cpp.old firefox-44.0/mozglue/build/arm.cpp +--- firefox-44.0/mozglue/build/arm.cpp.old 2016-02-03 10:07:29.879526500 +0100 ++++ firefox-44.0/mozglue/build/arm.cpp 2016-02-03 10:08:11.062697517 +0100 +@@ -104,7 +104,9 @@ check_neon(void) + + # elif defined(__linux__) || defined(ANDROID) + # include ++#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS + # include ++#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + # include + + enum{ diff --git a/xulrunner.spec b/xulrunner.spec index 9199c71..ec97ed9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 2%{?pre_tag}%{?dist} +Release: 3%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -97,6 +97,7 @@ Patch19: xulrunner-24.0-s390-inlines.patch Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch Patch24: rhbz-1219542-s390-build.patch +Patch25: firefox-gcc-6.0.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -242,6 +243,7 @@ cd %{tarballdir} %ifarch s390 %patch24 -p1 -b .rhbz-1219542-s390 %endif +%patch25 -p1 -b .gcc6 %patch200 -p2 -b .pk %patch204 -p2 -b .966424 @@ -553,6 +555,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Feb 15 2016 Martin Stransky - 44.0-3 +- gcc 6 build fix + * Fri Feb 05 2016 Fedora Release Engineering - 44.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 355332afb11d9b94cb21d6d1a5dcbefe5942f500 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 17 Feb 2016 12:32:15 +0100 Subject: [PATCH 34/50] Rebuild --- xulrunner.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index ec97ed9..9126632 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -555,7 +555,7 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Feb 15 2016 Martin Stransky - 44.0-3 +* Mon Feb 15 2016 Martin Stransky - 44.0-4 - gcc 6 build fix * Fri Feb 05 2016 Fedora Release Engineering - 44.0-2 From 9926729efe5907771e7e4c6fff1c6019ab7d090a Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 22 Feb 2016 11:06:17 +0100 Subject: [PATCH 35/50] gcc6 woraround --- xulrunner.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xulrunner.spec b/xulrunner.spec index 9126632..54ad87f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -312,6 +312,11 @@ echo "ac_add_options --disable-ion" >> .mozconfig echo "ac_add_options --disable-yarr-jit" >> .mozconfig %endif +#Workarounf for mozbz#1245783 +%if 0%{?fedora} > 23 +echo "ac_add_options --disable-ion" >> .mozconfig +%endif + %ifnarch %{ix86} x86_64 echo "ac_add_options --disable-webrtc" >> .mozconfig %endif From 078871b9d0159a9bc6039a493cfbe1df3e076316 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 2 Mar 2016 11:34:01 +0100 Subject: [PATCH 36/50] Fix WebRTC on AArch64 again. --- firefox-webrtc-add-missing-archs.patch | 33 ++++++++++++++++++++++++++ xulrunner.spec | 9 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 firefox-webrtc-add-missing-archs.patch diff --git a/firefox-webrtc-add-missing-archs.patch b/firefox-webrtc-add-missing-archs.patch new file mode 100644 index 0000000..94ce346 --- /dev/null +++ b/firefox-webrtc-add-missing-archs.patch @@ -0,0 +1,33 @@ + +# HG changeset patch +# User Makoto Kato +# Date 1446192505 -32400 +# Node ID 189d4b0f9f238c76b1c2ee7003bba8fb693b3e54 +# Parent 6bac283aad5301f23a0bdbcd7c7f3f92b9da7c24 +Bug 1219566 - Add aarch64 macro to webrtc/trunk/build/build_config.h. r=rjesup + +diff --git a/media/webrtc/trunk/build/build_config.h b/media/webrtc/trunk/build/build_config.h +--- a/media/webrtc/trunk/build/build_config.h ++++ b/media/webrtc/trunk/build/build_config.h +@@ -151,16 +151,20 @@ + #define ARCH_CPU_S390X 1 + #define ARCH_CPU_64_BITS 1 + #elif defined(__s390__) + #define ARCH_CPU_S390 1 + #define ARCH_CPU_32_BITS 1 + #elif defined(__alpha__) + #define ARCH_CPU_ALPHA 1 + #define ARCH_CPU_64_BITS 1 ++#elif defined(__aarch64__) ++#define ARCH_CPU_ARM_FAMILY 1 ++#define ARCH_CPU_ARM64 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif + + // Type detection for wchar_t. + #if defined(OS_WIN) + #define WCHAR_T_IS_UTF16 + #elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ + diff --git a/xulrunner.spec b/xulrunner.spec index 54ad87f..dd7bd37 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -104,6 +104,9 @@ Patch200: mozilla-193-pkgconfig.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch +# FTBFS on AArch64 +Patch205: firefox-webrtc-add-missing-archs.patch + # Upstream patches # --------------------------------------------------- @@ -247,6 +250,7 @@ cd %{tarballdir} %patch200 -p2 -b .pk %patch204 -p2 -b .966424 +%patch205 -p1 # Upstream patches @@ -560,6 +564,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Mar 02 2016 Marcin Juszkiewicz - 44.0-5 +- Fix WebRTC on AArch64 again. + * Mon Feb 15 2016 Martin Stransky - 44.0-4 - gcc 6 build fix From 60bbba63be55322472db545b1f56050676336ed9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 27 Apr 2016 22:40:56 +0100 Subject: [PATCH 37/50] Added fix for rhbz#1315225 - ppc64le/aarch64 build fixes --- xulrunner.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index dd7bd37..f630b41 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 5%{?pre_tag}%{?dist} +Release: 6%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -288,8 +288,12 @@ echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig %else echo "ac_add_options --disable-debug" >> .mozconfig +%ifarch ppc64le aarch64 +echo 'ac_add_options --enable-optimize="-g -O2"' >> .mozconfig +%else echo "ac_add_options --enable-optimize" >> .mozconfig %endif +%endif # s390(x) fails to start with jemalloc enabled %ifarch s390 s390x @@ -564,6 +568,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Apr 27 2016 Peter Robinson 44.0-6 +- Added fix for rhbz#1315225 - ppc64le/aarch64 build fixes + * Wed Mar 02 2016 Marcin Juszkiewicz - 44.0-5 - Fix WebRTC on AArch64 again. From f4ed118ce993829ff5a80149dfe37c3088124423 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 22 Jul 2016 11:19:15 -0400 Subject: [PATCH 38/50] rebuild for libvpx 1.6.0 --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index f630b41..dbf41f9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 6%{?pre_tag}%{?dist} +Release: 7%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -568,6 +568,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jul 22 2016 Tom Callaway - 44.0-7 +- rebuild for libvpx 1.6.0 + * Wed Apr 27 2016 Peter Robinson 44.0-6 - Added fix for rhbz#1315225 - ppc64le/aarch64 build fixes From 5aa49f34725db30a92ca4c14623bc7e964adb2cf Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 15 Dec 2016 11:03:39 +0100 Subject: [PATCH 39/50] Rebuilt --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index dbf41f9..c562dad 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 7%{?pre_tag}%{?dist} +Release: 8%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -568,6 +568,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Dec 15 2016 Martin Stransky - 44.0-8 +- Rebuilt + * Fri Jul 22 2016 Tom Callaway - 44.0-7 - rebuild for libvpx 1.6.0 From f0c6414b608d8f0dd1ce9c815adbdcacb5c15a66 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 15 Dec 2016 11:40:33 +0100 Subject: [PATCH 40/50] update build req --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index c562dad..6451f93 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -142,6 +142,7 @@ BuildRequires: autoconf213 BuildRequires: pulseaudio-libs-devel BuildRequires: pkgconfig(gconf-2.0) BuildRequires: yasm +BuildRequires: dbus-glib-devel Requires: mozilla-filesystem %if %{?system_nss} From 1299889d393c06e1328f2b30f501078180182f76 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 20 Jan 2017 11:17:55 +0100 Subject: [PATCH 41/50] Added fix for new nss 3.28.1 (mozbz#1290037) --- xulrunner.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 6451f93..f1b1968 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -25,7 +25,7 @@ %if %{?system_nss} %global nspr_version 4.10.10 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.19.2 +%global nss_version 3.28.1 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %endif @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 8%{?pre_tag}%{?dist} +Release: 9%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -107,6 +107,9 @@ Patch204: rhbz-966424.patch # FTBFS on AArch64 Patch205: firefox-webrtc-add-missing-archs.patch +# Upstream patches +Patch300: mozilla-1290037.patch + # Upstream patches # --------------------------------------------------- @@ -254,6 +257,7 @@ cd %{tarballdir} %patch205 -p1 # Upstream patches +%patch300 -p1 -b .1290037 %{__rm} -f .mozconfig @@ -569,6 +573,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Jan 20 2017 Martin Stransky - 44.0-9 +- Added fix for new nss 3.28.1 (mozbz#1290037) + * Thu Dec 15 2016 Martin Stransky - 44.0-8 - Rebuilt From ec4a6e93109bdd221598f28e4ebcf51bbef1ccc4 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 20 Jan 2017 11:30:49 +0100 Subject: [PATCH 42/50] Added missing patch --- mozilla-1290037.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 mozilla-1290037.patch diff --git a/mozilla-1290037.patch b/mozilla-1290037.patch new file mode 100644 index 0000000..508d580 --- /dev/null +++ b/mozilla-1290037.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Franziskus Kiefer +# Date 1469717280 -7200 +# Thu Jul 28 16:48:00 2016 +0200 +# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda +# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33 +Update keybits in H2, r=mt + +MozReview-Commit-ID: 35oWoDMqe1Y + +diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp +--- a/netwerk/protocol/http/Http2Session.cpp ++++ b/netwerk/protocol/http/Http2Session.cpp +@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile() + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + uint32_t keybits = ssl->GetKEAKeyBits(); + if (kea == ssl_kea_dh && keybits < 2048) { + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); + LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", + this, macAlgorithm)); + if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { From 36e54a1e24bce507651a7b2b1195a06bb3c6fa2c Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 20 Jan 2017 12:04:35 +0100 Subject: [PATCH 43/50] Disabled system icu --- xulrunner-mozconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 0dcf27d..e7c882d 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -34,6 +34,7 @@ ac_add_options --enable-chrome-format=omni ac_add_options --disable-gstreamer ac_add_options --enable-pulseaudio ac_add_options --disable-skia +ac_add_options --without-system-icu export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 From dedebcc1f71e8e8ad6ba8dbbc44cf3fc25a3714d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 20 Jan 2017 12:32:06 +0100 Subject: [PATCH 44/50] Relaxed requested nss version --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index f1b1968..45e339a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -25,7 +25,7 @@ %if %{?system_nss} %global nspr_version 4.10.10 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.28.1 +%global nss_version 3.27 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %endif From 3608d371a58510eb7cadcb13d61c5dbad48e5601 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 20 Jan 2017 12:47:14 +0100 Subject: [PATCH 45/50] Added mozbz#1329272 build fix --- mozilla-1329272.patch | 29 +++++++++++++++++++++++++++++ xulrunner-mozconfig | 1 - xulrunner.spec | 2 ++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 mozilla-1329272.patch diff --git a/mozilla-1329272.patch b/mozilla-1329272.patch new file mode 100644 index 0000000..ab0b26b --- /dev/null +++ b/mozilla-1329272.patch @@ -0,0 +1,29 @@ +From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 9 Jan 2017 14:37:33 +0100 +Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium + +--- + build/autoconf/icu.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 +index 4f46345f435a..794ddcdf4e52 100644 +--- a/build/autoconf/icu.m4 ++++ b/build/autoconf/icu.m4 +@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then + if test ! -d "$icudir"; then + AC_MSG_ERROR([Cannot find the ICU directory]) + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi + MOZ_ICU_VERSION="$version" + +-- +2.11.0 + diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index e7c882d..0dcf27d 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -34,7 +34,6 @@ ac_add_options --enable-chrome-format=omni ac_add_options --disable-gstreamer ac_add_options --enable-pulseaudio ac_add_options --disable-skia -ac_add_options --without-system-icu export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/xulrunner.spec b/xulrunner.spec index 45e339a..8fc82ac 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -109,6 +109,7 @@ Patch205: firefox-webrtc-add-missing-archs.patch # Upstream patches Patch300: mozilla-1290037.patch +Patch301: mozilla-1329272.patch # Upstream patches @@ -258,6 +259,7 @@ cd %{tarballdir} # Upstream patches %patch300 -p1 -b .1290037 +%patch301 -p1 -b .1329272 %{__rm} -f .mozconfig From 656d9078e217a4dcfefc151ff4b4ccaf5f54e047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:11:41 +0000 Subject: [PATCH 46/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xulrunner.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 8fc82ac..e0720a4 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 44.0 -Release: 9%{?pre_tag}%{?dist} +Release: 10%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -575,6 +575,9 @@ fi #--------------------------------------------------------------------- %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 44.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 20 2017 Martin Stransky - 44.0-9 - Added fix for new nss 3.28.1 (mozbz#1290037) From 90cdbfa41ddd48bff32d8e460fb34ac42d4e290c Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 1 Jun 2017 15:20:24 +0200 Subject: [PATCH 47/50] Fixed xulrunner build problems with stl headers --- build-stl-headers-fix-mbz1269171.patch | 169 +++++++++++++++++++++++++ xulrunner.spec | 2 + 2 files changed, 171 insertions(+) create mode 100644 build-stl-headers-fix-mbz1269171.patch diff --git a/build-stl-headers-fix-mbz1269171.patch b/build-stl-headers-fix-mbz1269171.patch new file mode 100644 index 0000000..7f9db14 --- /dev/null +++ b/build-stl-headers-fix-mbz1269171.patch @@ -0,0 +1,169 @@ +diff -up firefox-44.0/config/gcc-stl-wrapper.template.h.1269171 firefox-44.0/config/gcc-stl-wrapper.template.h +--- firefox-44.0/config/gcc-stl-wrapper.template.h.1269171 2017-06-01 12:06:24.481286748 +0200 ++++ firefox-44.0/config/gcc-stl-wrapper.template.h 2017-06-01 12:09:28.883022995 +0200 +@@ -17,24 +17,6 @@ + // Silence "warning: #include_next is a GCC extension" + #pragma GCC system_header + +-// mozalloc.h wants ; break the cycle by always explicitly +-// including here. NB: this is a tad sneaky. Sez the gcc docs: +-// +-// `#include_next' does not distinguish between and "file" +-// inclusion, nor does it check that the file you specify has the +-// same name as the current file. It simply looks for the file +-// named, starting with the directory in the search path after the +-// one where the current file was found. +-#include_next +- +-// See if we're in code that can use mozalloc. NB: this duplicates +-// code in nscore.h because nscore.h pulls in prtypes.h, and chromium +-// can't build with that being included before base/basictypes.h. +-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +-# include "mozilla/mozalloc.h" +-#else +-# error "STL code can only be used with infallible ::operator new()" +-#endif + + #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) + // Enable checked iterators and other goodies +@@ -46,10 +28,34 @@ + // # define _GLIBCXX_DEBUG 1 + #endif + ++// Don't include mozalloc for cstdlib. See bug 1245076. ++#ifndef moz_dont_include_mozalloc_for_cstdlib ++# define moz_dont_include_mozalloc_for_cstdlib ++#endif ++ ++// Include mozalloc after the STL header and all other headers it includes ++// have been preprocessed. ++#if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ ++ !defined(moz_dont_include_mozalloc_for_${HEADER}) ++# define MOZ_INCLUDE_MOZALLOC_H ++# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} ++#endif ++ + #pragma GCC visibility push(default) + #include_next <${HEADER}> + #pragma GCC visibility pop + ++#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} ++// See if we're in code that can use mozalloc. NB: this duplicates ++// code in nscore.h because nscore.h pulls in prtypes.h, and chromium ++// can't build with that being included before base/basictypes.h. ++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) ++# include "mozilla/mozalloc.h" ++# else ++# error "STL code can only be used with infallible ::operator new()" ++# endif ++#endif ++ + // gcc calls a __throw_*() function from bits/functexcept.h when it + // wants to "throw an exception". functexcept exists nominally to + // support -fno-exceptions, but since we'll always use the system +diff -up firefox-44.0/config/make-stl-wrappers.py.1269171 firefox-44.0/config/make-stl-wrappers.py +--- firefox-44.0/config/make-stl-wrappers.py.1269171 2016-01-24 00:23:37.000000000 +0100 ++++ firefox-44.0/config/make-stl-wrappers.py 2017-06-01 12:06:24.482286747 +0200 +@@ -30,7 +30,6 @@ def main(outdir, compiler, template_file + os.mkdir(outdir) + + template = open(template_file, 'r').read() +- path_to_new = header_path('new', compiler) + + for header in open(header_list_file, 'r'): + header = header.rstrip() +@@ -40,8 +39,7 @@ def main(outdir, compiler, template_file + path = header_path(header, compiler) + with FileAvoidWrite(os.path.join(outdir, header)) as f: + f.write(string.Template(template).substitute(HEADER=header, +- HEADER_PATH=path, +- NEW_HEADER_PATH=path_to_new)) ++ HEADER_PATH=path)) + + + if __name__ == '__main__': +diff -up firefox-44.0/config/msvc-stl-wrapper.template.h.1269171 firefox-44.0/config/msvc-stl-wrapper.template.h +--- firefox-44.0/config/msvc-stl-wrapper.template.h.1269171 2016-01-24 00:23:37.000000000 +0100 ++++ firefox-44.0/config/msvc-stl-wrapper.template.h 2017-06-01 12:06:24.482286747 +0200 +@@ -8,35 +8,23 @@ + #ifndef mozilla_${HEADER}_h + #define mozilla_${HEADER}_h + +-#ifndef MOZ_HAVE_INCLUDED_ALLOC +-#define MOZ_HAVE_INCLUDED_ALLOC +- + #if _HAS_EXCEPTIONS + # error "STL code can only be used with -fno-exceptions" + #endif + ++// Include mozalloc after the STL header and all other headers it includes ++// have been preprocessed. ++#if !defined(MOZ_INCLUDE_MOZALLOC_H) ++# define MOZ_INCLUDE_MOZALLOC_H ++# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} ++#endif ++ + // Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k + // CRT doesn't export std::_Throw(). So we define it. + #ifndef mozilla_Throw_h + # include "mozilla/throw_msvc.h" + #endif + +-// Code might include before other wrapped headers, but +-// includes and so we want to wrap it. But mozalloc.h +-// wants also, so we break the cycle by always explicitly +-// including here. +-#include <${NEW_HEADER_PATH}> +- +-// See if we're in code that can use mozalloc. NB: this duplicates +-// code in nscore.h because nscore.h pulls in prtypes.h, and chromium +-// can't build with that being included before base/basictypes.h. +-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +-# include "mozilla/mozalloc.h" +-#else +-# error "STL code can only be used with infallible ::operator new()" +-#endif +-#endif /* MOZ_HAVE_INCLUDED_ALLOC */ +- + #ifdef _DEBUG + // From + // http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx +@@ -75,4 +63,15 @@ + + #pragma warning( pop ) + ++#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} ++// See if we're in code that can use mozalloc. NB: this duplicates ++// code in nscore.h because nscore.h pulls in prtypes.h, and chromium ++// can't build with that being included before base/basictypes.h. ++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) ++# include "mozilla/mozalloc.h" ++# else ++# error "STL code can only be used with infallible ::operator new()" ++# endif ++#endif ++ + #endif // if mozilla_${HEADER}_h +diff -up firefox-44.0/memory/mozalloc/mozalloc.h.1269171 firefox-44.0/memory/mozalloc/mozalloc.h +--- firefox-44.0/memory/mozalloc/mozalloc.h.1269171 2016-01-24 00:23:44.000000000 +0100 ++++ firefox-44.0/memory/mozalloc/mozalloc.h 2017-06-01 12:06:24.482286747 +0200 +@@ -12,10 +12,17 @@ + * https://bugzilla.mozilla.org/show_bug.cgi?id=427099 + */ + +-#include +-#include + #if defined(__cplusplus) + # include ++// Since libstdc++ 6, including the C headers (e.g. stdlib.h) instead of the ++// corresponding C++ header (e.g. cstdlib) can cause confusion in C++ code ++// using things defined there. Specifically, with stdlib.h, the use of abs() ++// in gfx/graphite2/src/inc/UtfCodec.h somehow ends up picking the wrong abs() ++# include ++# include ++#else ++# include ++# include + #endif + + #if defined(__cplusplus) diff --git a/xulrunner.spec b/xulrunner.spec index e0720a4..d477a8a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -98,6 +98,7 @@ Patch20: firefox-build-prbool.patch Patch21: aarch64-fix-skia.patch Patch24: rhbz-1219542-s390-build.patch Patch25: firefox-gcc-6.0.patch +Patch26: build-stl-headers-fix-mbz1269171.patch # Fedora specific patches Patch200: mozilla-193-pkgconfig.patch @@ -252,6 +253,7 @@ cd %{tarballdir} %patch24 -p1 -b .rhbz-1219542-s390 %endif %patch25 -p1 -b .gcc6 +%patch26 -p1 -b .1269171 %patch200 -p2 -b .pk %patch204 -p2 -b .966424 From be3317bc531ae5359e5d7a5960e34a234d76fec7 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 14 Jun 2017 12:51:30 +0200 Subject: [PATCH 48/50] Update to Firefox 45.9.0 esr source tarball --- .gitignore | 1 + firefox-webrtc-add-missing-archs.patch | 33 ------------------------- mozilla-1290037.patch | 34 -------------------------- mozilla-1329272.patch | 29 ---------------------- sources | 2 +- xulrunner-install-dir.patch | 10 ++++---- xulrunner.spec | 29 ++++++---------------- 7 files changed, 15 insertions(+), 123 deletions(-) delete mode 100644 firefox-webrtc-add-missing-archs.patch delete mode 100644 mozilla-1290037.patch delete mode 100644 mozilla-1329272.patch diff --git a/.gitignore b/.gitignore index d7e8527..6f4d157 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xulrunner-*.source.tar.bz2 /firefox-42.0.source.tar.xz /firefox-44.0.source.tar.xz +/firefox-45.9.0esr.source.tar.xz diff --git a/firefox-webrtc-add-missing-archs.patch b/firefox-webrtc-add-missing-archs.patch deleted file mode 100644 index 94ce346..0000000 --- a/firefox-webrtc-add-missing-archs.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# HG changeset patch -# User Makoto Kato -# Date 1446192505 -32400 -# Node ID 189d4b0f9f238c76b1c2ee7003bba8fb693b3e54 -# Parent 6bac283aad5301f23a0bdbcd7c7f3f92b9da7c24 -Bug 1219566 - Add aarch64 macro to webrtc/trunk/build/build_config.h. r=rjesup - -diff --git a/media/webrtc/trunk/build/build_config.h b/media/webrtc/trunk/build/build_config.h ---- a/media/webrtc/trunk/build/build_config.h -+++ b/media/webrtc/trunk/build/build_config.h -@@ -151,16 +151,20 @@ - #define ARCH_CPU_S390X 1 - #define ARCH_CPU_64_BITS 1 - #elif defined(__s390__) - #define ARCH_CPU_S390 1 - #define ARCH_CPU_32_BITS 1 - #elif defined(__alpha__) - #define ARCH_CPU_ALPHA 1 - #define ARCH_CPU_64_BITS 1 -+#elif defined(__aarch64__) -+#define ARCH_CPU_ARM_FAMILY 1 -+#define ARCH_CPU_ARM64 1 -+#define ARCH_CPU_64_BITS 1 - #else - #error Please add support for your architecture in build/build_config.h - #endif - - // Type detection for wchar_t. - #if defined(OS_WIN) - #define WCHAR_T_IS_UTF16 - #elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ - diff --git a/mozilla-1290037.patch b/mozilla-1290037.patch deleted file mode 100644 index 508d580..0000000 --- a/mozilla-1290037.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Franziskus Kiefer -# Date 1469717280 -7200 -# Thu Jul 28 16:48:00 2016 +0200 -# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda -# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33 -Update keybits in H2, r=mt - -MozReview-Commit-ID: 35oWoDMqe1Y - -diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp ---- a/netwerk/protocol/http/Http2Session.cpp -+++ b/netwerk/protocol/http/Http2Session.cpp -@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile() - RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); - } - - uint32_t keybits = ssl->GetKEAKeyBits(); - if (kea == ssl_kea_dh && keybits < 2048) { - LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", - this, keybits)); - RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); -- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 -- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", -+ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. -+ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", - this, keybits)); - RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); - } - - int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); - LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", - this, macAlgorithm)); - if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { diff --git a/mozilla-1329272.patch b/mozilla-1329272.patch deleted file mode 100644 index ab0b26b..0000000 --- a/mozilla-1329272.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Mon, 9 Jan 2017 14:37:33 +0100 -Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium - ---- - build/autoconf/icu.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 -index 4f46345f435a..794ddcdf4e52 100644 ---- a/build/autoconf/icu.m4 -+++ b/build/autoconf/icu.m4 -@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then - if test ! -d "$icudir"; then - AC_MSG_ERROR([Cannot find the ICU directory]) - fi - fi - -- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` -+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` - if test x"$version" = x; then - AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) - fi - MOZ_ICU_VERSION="$version" - --- -2.11.0 - diff --git a/sources b/sources index bf85a54..799823c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d940e72f9eaff767fafcfbcc387594d firefox-44.0.source.tar.xz +SHA512 (firefox-45.9.0esr.source.tar.xz) = 2e4c1f8bca0c59ac93ab918b996e3b6cf25e7279ad5800de256aa220e670c6aaab2036c3ead4020b80e2a0e8cda3ae5fe9b270106646c625ce4fd6ecfd66d9ca diff --git a/xulrunner-install-dir.patch b/xulrunner-install-dir.patch index 51fe4ba..89d2972 100644 --- a/xulrunner-install-dir.patch +++ b/xulrunner-install-dir.patch @@ -1,6 +1,6 @@ -diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk ---- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200 -+++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200 +diff -up firefox-45.9.0esr/config/baseconfig.mk.version-fix firefox-45.9.0esr/config/baseconfig.mk +--- firefox-45.9.0esr/config/baseconfig.mk.version-fix 2017-06-14 10:02:42.829306768 +0200 ++++ firefox-45.9.0esr/config/baseconfig.mk 2017-06-14 10:02:54.014302221 +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) @@ -8,5 +8,5 @@ diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/moz -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 + ifeq (.,$(DEPTH)) + DIST = dist diff --git a/xulrunner.spec b/xulrunner.spec index d477a8a..68fea22 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -46,7 +46,7 @@ %global tarballname firefox %global mozappdir %{_libdir}/%{name} -%global tarballdir %{tarballname}-%{version} +%global tarballdir %{tarballname}-%{version}esr # crash reporter work only on x86/x86_64 %ifarch %{ix86} x86_64 @@ -77,12 +77,12 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 44.0 -Release: 10%{?pre_tag}%{?dist} +Version: 45.9.0 +Release: 10%?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}.source.tar.xz +Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}esr.source.tar.xz Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -105,13 +105,6 @@ Patch200: mozilla-193-pkgconfig.patch # Unable to install addons from https pages Patch204: rhbz-966424.patch -# FTBFS on AArch64 -Patch205: firefox-webrtc-add-missing-archs.patch - -# Upstream patches -Patch300: mozilla-1290037.patch -Patch301: mozilla-1329272.patch - # Upstream patches # --------------------------------------------------- @@ -244,7 +237,7 @@ debug %{name}, you want to install %{name}-debuginfo instead. cd %{tarballdir} %patch1 -p1 -%patch3 -p2 -b .arm +#%patch3 -p2 -b .arm %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool @@ -257,12 +250,6 @@ cd %{tarballdir} %patch200 -p2 -b .pk %patch204 -p2 -b .966424 -%patch205 -p1 - -# Upstream patches -%patch300 -p1 -b .1290037 -%patch301 -p1 -b .1329272 - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -525,13 +512,10 @@ fi %doc %attr(644, root, root) %{mozappdir}/LICENSE %doc %attr(644, root, root) %{mozappdir}/README.xulrunner %{mozappdir}/chrome -%{mozappdir}/chrome.manifest %{mozappdir}/dictionaries %dir %{mozappdir}/components %ghost %{mozappdir}/components/compreg.dat %ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/components/*.so -%{mozappdir}/components/*.manifest %{mozappdir}/omni.ja %{mozappdir}/*.so %ifarch %{ix86} x86_64 @@ -577,6 +561,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Jun 14 2017 Jan Horak - 45.9.0-1 +- Update to 45.9.0 (esr) sources + * Sat Feb 11 2017 Fedora Release Engineering - 44.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 721e87200e850a0dd283cf05ce1769c5c0a8a6d8 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 14 Jun 2017 14:03:16 +0200 Subject: [PATCH 49/50] Fixed typo in release --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 68fea22..ebb1e37 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -78,7 +78,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 45.9.0 -Release: 10%?pre_tag}%{?dist} +Release: 10%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet From 799473cddd907fb3b0036df8f436a51902bbfbf0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 15 Jun 2017 14:29:34 +0200 Subject: [PATCH 50/50] This package is no longer supported by upstream --- .gitignore | 5 - aarch64-fix-skia.patch | 18 - build-stl-headers-fix-mbz1269171.patch | 169 ----- dead.package | 1 + firefox-build-prbool.patch | 11 - firefox-gcc-6.0.patch | 26 - mozilla-193-pkgconfig.patch | 32 - mozilla-639554.patch | 15 - mozilla-build-arm.patch | 23 - rhbz-1219542-s390-build.patch | 23 - rhbz-966424.patch | 14 - sources | 1 - xulrunner-24.0-jemalloc-ppc.patch | 12 - xulrunner-24.0-s390-inlines.patch | 12 - xulrunner-install-dir.patch | 12 - xulrunner-mozconfig | 44 -- xulrunner-redhat-default-prefs.js | 8 - xulrunner.sh.in | 69 -- xulrunner.spec | 883 ------------------------- 19 files changed, 1 insertion(+), 1377 deletions(-) delete mode 100644 .gitignore delete mode 100644 aarch64-fix-skia.patch delete mode 100644 build-stl-headers-fix-mbz1269171.patch create mode 100644 dead.package delete mode 100644 firefox-build-prbool.patch delete mode 100644 firefox-gcc-6.0.patch delete mode 100644 mozilla-193-pkgconfig.patch delete mode 100644 mozilla-639554.patch delete mode 100644 mozilla-build-arm.patch delete mode 100644 rhbz-1219542-s390-build.patch delete mode 100644 rhbz-966424.patch delete mode 100644 sources delete mode 100644 xulrunner-24.0-jemalloc-ppc.patch delete mode 100644 xulrunner-24.0-s390-inlines.patch delete mode 100644 xulrunner-install-dir.patch delete mode 100644 xulrunner-mozconfig delete mode 100644 xulrunner-redhat-default-prefs.js delete mode 100644 xulrunner.sh.in delete mode 100644 xulrunner.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6f4d157..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/firefox-*.source.tar.bz2 -/xulrunner-*.source.tar.bz2 -/firefox-42.0.source.tar.xz -/firefox-44.0.source.tar.xz -/firefox-45.9.0esr.source.tar.xz diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch deleted file mode 100644 index 17df80e..0000000 --- a/aarch64-fix-skia.patch +++ /dev/null @@ -1,18 +0,0 @@ -Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a9516b553d - -Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h -=================================================================== ---- mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h -+++ mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h -@@ -21,9 +21,9 @@ - #define SK_ARM_NEON_MODE_ALWAYS 1 - #define SK_ARM_NEON_MODE_DYNAMIC 2 - --#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) -+#if defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) - # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC --#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64) -+#elif defined(__ARM_HAVE_NEON) - # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS - #else - # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE diff --git a/build-stl-headers-fix-mbz1269171.patch b/build-stl-headers-fix-mbz1269171.patch deleted file mode 100644 index 7f9db14..0000000 --- a/build-stl-headers-fix-mbz1269171.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -up firefox-44.0/config/gcc-stl-wrapper.template.h.1269171 firefox-44.0/config/gcc-stl-wrapper.template.h ---- firefox-44.0/config/gcc-stl-wrapper.template.h.1269171 2017-06-01 12:06:24.481286748 +0200 -+++ firefox-44.0/config/gcc-stl-wrapper.template.h 2017-06-01 12:09:28.883022995 +0200 -@@ -17,24 +17,6 @@ - // Silence "warning: #include_next is a GCC extension" - #pragma GCC system_header - --// mozalloc.h wants ; break the cycle by always explicitly --// including here. NB: this is a tad sneaky. Sez the gcc docs: --// --// `#include_next' does not distinguish between and "file" --// inclusion, nor does it check that the file you specify has the --// same name as the current file. It simply looks for the file --// named, starting with the directory in the search path after the --// one where the current file was found. --#include_next -- --// See if we're in code that can use mozalloc. NB: this duplicates --// code in nscore.h because nscore.h pulls in prtypes.h, and chromium --// can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" --#endif - - #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) - // Enable checked iterators and other goodies -@@ -46,10 +28,34 @@ - // # define _GLIBCXX_DEBUG 1 - #endif - -+// Don't include mozalloc for cstdlib. See bug 1245076. -+#ifndef moz_dont_include_mozalloc_for_cstdlib -+# define moz_dont_include_mozalloc_for_cstdlib -+#endif -+ -+// Include mozalloc after the STL header and all other headers it includes -+// have been preprocessed. -+#if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ -+ !defined(moz_dont_include_mozalloc_for_${HEADER}) -+# define MOZ_INCLUDE_MOZALLOC_H -+# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} -+#endif -+ - #pragma GCC visibility push(default) - #include_next <${HEADER}> - #pragma GCC visibility pop - -+#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} -+// See if we're in code that can use mozalloc. NB: this duplicates -+// code in nscore.h because nscore.h pulls in prtypes.h, and chromium -+// can't build with that being included before base/basictypes.h. -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+#endif -+ - // gcc calls a __throw_*() function from bits/functexcept.h when it - // wants to "throw an exception". functexcept exists nominally to - // support -fno-exceptions, but since we'll always use the system -diff -up firefox-44.0/config/make-stl-wrappers.py.1269171 firefox-44.0/config/make-stl-wrappers.py ---- firefox-44.0/config/make-stl-wrappers.py.1269171 2016-01-24 00:23:37.000000000 +0100 -+++ firefox-44.0/config/make-stl-wrappers.py 2017-06-01 12:06:24.482286747 +0200 -@@ -30,7 +30,6 @@ def main(outdir, compiler, template_file - os.mkdir(outdir) - - template = open(template_file, 'r').read() -- path_to_new = header_path('new', compiler) - - for header in open(header_list_file, 'r'): - header = header.rstrip() -@@ -40,8 +39,7 @@ def main(outdir, compiler, template_file - path = header_path(header, compiler) - with FileAvoidWrite(os.path.join(outdir, header)) as f: - f.write(string.Template(template).substitute(HEADER=header, -- HEADER_PATH=path, -- NEW_HEADER_PATH=path_to_new)) -+ HEADER_PATH=path)) - - - if __name__ == '__main__': -diff -up firefox-44.0/config/msvc-stl-wrapper.template.h.1269171 firefox-44.0/config/msvc-stl-wrapper.template.h ---- firefox-44.0/config/msvc-stl-wrapper.template.h.1269171 2016-01-24 00:23:37.000000000 +0100 -+++ firefox-44.0/config/msvc-stl-wrapper.template.h 2017-06-01 12:06:24.482286747 +0200 -@@ -8,35 +8,23 @@ - #ifndef mozilla_${HEADER}_h - #define mozilla_${HEADER}_h - --#ifndef MOZ_HAVE_INCLUDED_ALLOC --#define MOZ_HAVE_INCLUDED_ALLOC -- - #if _HAS_EXCEPTIONS - # error "STL code can only be used with -fno-exceptions" - #endif - -+// Include mozalloc after the STL header and all other headers it includes -+// have been preprocessed. -+#if !defined(MOZ_INCLUDE_MOZALLOC_H) -+# define MOZ_INCLUDE_MOZALLOC_H -+# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} -+#endif -+ - // Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k - // CRT doesn't export std::_Throw(). So we define it. - #ifndef mozilla_Throw_h - # include "mozilla/throw_msvc.h" - #endif - --// Code might include before other wrapped headers, but --// includes and so we want to wrap it. But mozalloc.h --// wants also, so we break the cycle by always explicitly --// including here. --#include <${NEW_HEADER_PATH}> -- --// See if we're in code that can use mozalloc. NB: this duplicates --// code in nscore.h because nscore.h pulls in prtypes.h, and chromium --// can't build with that being included before base/basictypes.h. --#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) --# include "mozilla/mozalloc.h" --#else --# error "STL code can only be used with infallible ::operator new()" --#endif --#endif /* MOZ_HAVE_INCLUDED_ALLOC */ -- - #ifdef _DEBUG - // From - // http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx -@@ -75,4 +63,15 @@ - - #pragma warning( pop ) - -+#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} -+// See if we're in code that can use mozalloc. NB: this duplicates -+// code in nscore.h because nscore.h pulls in prtypes.h, and chromium -+// can't build with that being included before base/basictypes.h. -+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -+# include "mozilla/mozalloc.h" -+# else -+# error "STL code can only be used with infallible ::operator new()" -+# endif -+#endif -+ - #endif // if mozilla_${HEADER}_h -diff -up firefox-44.0/memory/mozalloc/mozalloc.h.1269171 firefox-44.0/memory/mozalloc/mozalloc.h ---- firefox-44.0/memory/mozalloc/mozalloc.h.1269171 2016-01-24 00:23:44.000000000 +0100 -+++ firefox-44.0/memory/mozalloc/mozalloc.h 2017-06-01 12:06:24.482286747 +0200 -@@ -12,10 +12,17 @@ - * https://bugzilla.mozilla.org/show_bug.cgi?id=427099 - */ - --#include --#include - #if defined(__cplusplus) - # include -+// Since libstdc++ 6, including the C headers (e.g. stdlib.h) instead of the -+// corresponding C++ header (e.g. cstdlib) can cause confusion in C++ code -+// using things defined there. Specifically, with stdlib.h, the use of abs() -+// in gfx/graphite2/src/inc/UtfCodec.h somehow ends up picking the wrong abs() -+# include -+# include -+#else -+# include -+# include - #endif - - #if defined(__cplusplus) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3f37036 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package is no longer supported by upstream diff --git a/firefox-build-prbool.patch b/firefox-build-prbool.patch deleted file mode 100644 index c7424ea..0000000 --- a/firefox-build-prbool.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mozilla-release/security/certverifier/OCSPCache.h.old mozilla-release/security/certverifier/OCSPCache.h ---- mozilla-release/security/certverifier/OCSPCache.h.old 2014-10-14 12:33:46.519970732 +0200 -+++ mozilla-release/security/certverifier/OCSPCache.h 2014-10-14 12:34:44.418000625 +0200 -@@ -25,6 +25,7 @@ - #ifndef mozilla_psm_OCSPCache_h - #define mozilla_psm_OCSPCache_h - -+#include "prtypes.h" - #include "hasht.h" - #include "mozilla/Mutex.h" - #include "mozilla/Vector.h" diff --git a/firefox-gcc-6.0.patch b/firefox-gcc-6.0.patch deleted file mode 100644 index 0a74d36..0000000 --- a/firefox-gcc-6.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl ---- firefox-44.0/nsprpub/config/make-system-wrappers.pl.back 2016-01-24 00:23:49.000000000 +0100 -+++ firefox-44.0/nsprpub/config/make-system-wrappers.pl 2016-02-02 14:58:45.064112655 +0100 -@@ -19,7 +19,9 @@ while () { - open OUT, ">$output_dir/$_"; - print OUT "#pragma GCC system_header\n"; # suppress include_next warning - print OUT "#pragma GCC visibility push(default)\n"; -+ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#include_next \<$_\>\n"; -+ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n"; - print OUT "#pragma GCC visibility pop\n"; - close OUT; - } -diff -up firefox-44.0/mozglue/build/arm.cpp.old firefox-44.0/mozglue/build/arm.cpp ---- firefox-44.0/mozglue/build/arm.cpp.old 2016-02-03 10:07:29.879526500 +0100 -+++ firefox-44.0/mozglue/build/arm.cpp 2016-02-03 10:08:11.062697517 +0100 -@@ -104,7 +104,9 @@ check_neon(void) - - # elif defined(__linux__) || defined(ANDROID) - # include -+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS - # include -+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - # include - - enum{ diff --git a/mozilla-193-pkgconfig.patch b/mozilla-193-pkgconfig.patch deleted file mode 100644 index 67ec302..0000000 --- a/mozilla-193-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in 2010-08-16 11:12:32.000000000 +0200 -@@ -6,5 +6,6 @@ idldir=%idldir% - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk 2010-08-06 03:09:24.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in 2010-08-16 11:07:52.000000000 +0200 -@@ -2,6 +2,7 @@ prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - idldir=%idldir% -+libdir=%libdir% - - Name: libxul - Description: The Mozilla Runtime and Embedding Engine -diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk 2010-08-16 11:07:52.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in 2010-08-16 11:07:52.000000000 +0200 -@@ -116,6 +116,7 @@ endif - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ diff --git a/mozilla-639554.patch b/mozilla-639554.patch deleted file mode 100644 index 12d32b2..0000000 --- a/mozilla-639554.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/toolkit/mozapps/installer/packager.mk -+++ b/toolkit/mozapps/installer/packager.mk -@@ -621,10 +621,12 @@ ifdef INSTALL_SDK # Here comes the hard - (cd $(DESTDIR)$(idldir) && tar -xf -) - # SDK directory is the libs + a bunch of symlinks - $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib -+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin - if test -f $(DIST)/include/xpcom-config.h; then \ - $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ - fi - (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) -+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) - $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl - ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib - ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch deleted file mode 100644 index 86e6f2e..0000000 --- a/mozilla-build-arm.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi ---- firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm 2015-03-05 11:28:19.000000000 +0100 -+++ firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2015-03-09 10:02:17.875243261 +0100 -@@ -235,19 +235,6 @@ - 'defines': [ - 'WEBRTC_ARCH_ARM', - ], -- 'conditions': [ -- ['arm_version==7', { -- 'defines': ['WEBRTC_ARCH_ARM_V7', -- 'WEBRTC_BUILD_NEON_LIBS'], -- 'conditions': [ -- ['arm_neon==1', { -- 'defines': ['WEBRTC_ARCH_ARM_NEON',], -- }, { -- 'defines': ['WEBRTC_DETECT_ARM_NEON',], -- }], -- ], -- }], -- ], - }], - ['os_bsd==1', { - 'defines': [ diff --git a/rhbz-1219542-s390-build.patch b/rhbz-1219542-s390-build.patch deleted file mode 100644 index 3734ce5..0000000 --- a/rhbz-1219542-s390-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390 firefox-43.0.3/js/src/configure.in ---- firefox-43.0.3/js/src/configure.in.rhbz-1219542-s390 2015-12-23 17:11:01.000000000 -0500 -+++ firefox-43.0.3/js/src/configure.in 2016-01-03 08:08:27.139956990 -0500 -@@ -1466,7 +1466,7 @@ case "$host" in - - *-linux*|*-kfreebsd*-gnu|*-gnu*) - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" -- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}" - ;; - - *) -@@ -1649,8 +1649,8 @@ ia64*-hpux*) - # while; Intel recommends against using it. - MOZ_OPTIMIZE_FLAGS="-O2" - elif test "$GNU_CC" -o "$GNU_CXX"; then -- MOZ_PGO_OPTIMIZE_FLAGS="-O3" -- MOZ_OPTIMIZE_FLAGS="-O3" -+ MOZ_PGO_OPTIMIZE_FLAGS="-O1" -+ MOZ_OPTIMIZE_FLAGS="-O1" - if test -z "$CLANG_CC"; then - MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS" - fi diff --git a/rhbz-966424.patch b/rhbz-966424.patch deleted file mode 100644 index 7579d09..0000000 --- a/rhbz-966424.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm ---- firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 2014-10-14 08:12:14.358697255 +0200 -+++ firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-14 08:17:59.962181908 +0200 -@@ -174,7 +174,9 @@ this.checkCert = - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** diff --git a/sources b/sources deleted file mode 100644 index 799823c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (firefox-45.9.0esr.source.tar.xz) = 2e4c1f8bca0c59ac93ab918b996e3b6cf25e7279ad5800de256aa220e670c6aaab2036c3ead4020b80e2a0e8cda3ae5fe9b270106646c625ce4fd6ecfd66d9ca diff --git a/xulrunner-24.0-jemalloc-ppc.patch b/xulrunner-24.0-jemalloc-ppc.patch deleted file mode 100644 index fe404ca..0000000 --- a/xulrunner-24.0-jemalloc-ppc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c.jemalloc-ppc xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c ---- xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c.jemalloc-ppc 2013-09-11 01:15:18.000000000 +0200 -+++ xulrunner-24.0/mozilla-release/memory/mozjemalloc/jemalloc.c 2013-09-13 13:36:34.171680919 +0200 -@@ -1104,7 +1104,7 @@ static unsigned ncpus; - * 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__) -+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__)) - #define MALLOC_STATIC_SIZES 1 - #endif - diff --git a/xulrunner-24.0-s390-inlines.patch b/xulrunner-24.0-s390-inlines.patch deleted file mode 100644 index 074f8d9..0000000 --- a/xulrunner-24.0-s390-inlines.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp ---- xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp.s390-inlines 2013-10-23 16:04:01.773093979 +0200 -+++ xulrunner-25.0/mozilla-release/js/src/vm/SPSProfiler.cpp 2013-10-23 16:04:44.551134551 +0200 -@@ -4,6 +4,8 @@ - * 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 "jscntxtinlines.h" -+ - #include "vm/SPSProfiler.h" - - #include "mozilla/DebugOnly.h" diff --git a/xulrunner-install-dir.patch b/xulrunner-install-dir.patch deleted file mode 100644 index 89d2972..0000000 --- a/xulrunner-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-45.9.0esr/config/baseconfig.mk.version-fix firefox-45.9.0esr/config/baseconfig.mk ---- firefox-45.9.0esr/config/baseconfig.mk.version-fix 2017-06-14 10:02:42.829306768 +0200 -+++ firefox-45.9.0esr/config/baseconfig.mk 2017-06-14 10:02:54.014302221 +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) - ifeq (.,$(DEPTH)) - DIST = dist diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig deleted file mode 100644 index 0dcf27d..0000000 --- a/xulrunner-mozconfig +++ /dev/null @@ -1,44 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig -# --with-system-png is disabled because Mozilla requires APNG support in libpng -#ac_add_options --with-system-png - -ac_add_options --prefix="$PREFIX" -ac_add_options --libdir="$LIBDIR" -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --with-pthreads -ac_add_options --disable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --enable-xinerama -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --disable-javaxpcom -ac_add_options --enable-safe-browsing -ac_add_options --enable-extensions=default -ac_add_options --enable-libnotify -ac_add_options --disable-necko-wifi -ac_add_options --enable-startup-notification -ac_add_options --disable-cpp-exceptions -ac_add_options --enable-url-classifier -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --disable-updater -ac_add_options --enable-chrome-format=omni -ac_add_options --disable-gstreamer -ac_add_options --enable-pulseaudio -ac_add_options --disable-skia - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -export MOZ_UA_BUILDID=20100101 - -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir diff --git a/xulrunner-redhat-default-prefs.js b/xulrunner-redhat-default-prefs.js deleted file mode 100644 index 15a1e2a..0000000 --- a/xulrunner-redhat-default-prefs.js +++ /dev/null @@ -1,8 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("general.smoothScroll", true); -pref("intl.locale.matchOS", true); -pref("network.manage-offline-status", true); -pref("toolkit.storage.synchronous", 0); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); diff --git a/xulrunner.sh.in b/xulrunner.sh.in deleted file mode 100644 index 534b840..0000000 --- a/xulrunner.sh.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# The contents of this file are subject to the Netscape Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/NPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# - -## -## Usage: -## -## $ xulrunner -## -## This script is meant to run a xulrunner program from the xulrunner -## rpm installation. -## - -cmdname=`basename $0` - -## -## Variables -## -XUL_ARCH=$(uname -m) -case $XUL_ARCH in - x86_64 | ia64 | s390 ) - XUL_LIB_DIR="/usr/lib64" - SECONDARY_LIB_DIR="/usr/lib" - ;; - * ) - XUL_LIB_DIR="/usr/lib" - SECONDARY_LIB_DIR="/usr/lib64" - ;; -esac - -if [ ! -x $XUL_LIB_DIR/xulrunner/xulrunner ]; then - if [ ! -x $SECONDARY_LIB_DIR/xulrunner/xulrunner ]; then - echo "Error: $XUL_LIB_DIR/xulrunner/xulrunner not found" - if [ -d $SECONDARY_LIB_DIR ]; then - echo " $SECONDARY_LIB_DIR/xulrunner/xulrunner not found" - fi - exit 1 - fi - XUL_LIB_DIR="$SECONDARY_LIB_DIR" -fi -XUL_DIST_BIN="$XUL_LIB_DIR/xulrunner" -XUL_PROGRAM="$XUL_DIST_BIN/xulrunner" - -## -## Enable WebGL -## -MOZ_GLX_IGNORE_BLACKLIST=1 -export MOZ_GLX_IGNORE_BLACKLIST - - -exec $XUL_PROGRAM "$@" diff --git a/xulrunner.spec b/xulrunner.spec deleted file mode 100644 index ebb1e37..0000000 --- a/xulrunner.spec +++ /dev/null @@ -1,883 +0,0 @@ -# Use system nspr/nss? -%define system_nss 1 - -# Use system sqlite? -%if 0%{?fedora} < 20 -%define system_sqlite 0 -%define system_ffi 0 -%else -%define system_sqlite 1 -%define system_ffi 1 -%endif - -# Use system cairo? -%define system_cairo 0 - -# Build as a debug package? -%define debug_build 0 - -# Minimal required versions -%global cairo_version 1.10.2 -%global freetype_version 2.1.9 -%global libnotify_version 0.7.0 -%global libvpx_version 1.0.0 - -%if %{?system_nss} -%global nspr_version 4.10.10 -%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.27 -%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) -%endif - -%if %{?system_sqlite} -%global sqlite_version 3.8.4.2 -# The actual sqlite version (see #480989): -%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) -%endif - -# gecko_dir_ver should be set to the version in our directory names -# alpha_version should be set to the alpha number if using an alpha, 0 otherwise -# beta_version should be set to the beta number if using a beta, 0 otherwise -# rc_version should be set to the RC number if using an RC, 0 otherwise -%global gecko_dir_ver %{version} -%global alpha_version 0 -%global beta_version 0 -%global rc_version 0 - -%global tarballname firefox -%global mozappdir %{_libdir}/%{name} -%global tarballdir %{tarballname}-%{version}esr - -# crash reporter work only on x86/x86_64 -%ifarch %{ix86} x86_64 -%global enable_mozilla_crashreporter 1 -%else -%global enable_mozilla_crashreporter 0 -%endif - -%if %{alpha_version} > 0 -%global pre_version a%{alpha_version} -%global tarballdir mozilla-beta -%endif -%if %{beta_version} > 0 -%global pre_version b%{beta_version} -%global tarballdir mozilla-beta -%endif -%if %{rc_version} > 0 -%global pre_version rc%{rc_version} -%global tarballdir mozilla-release -%endif - -%if %{defined pre_version} -%global gecko_verrel %{expand:%%{version}}-%{pre_version} -%global pre_tag .%{pre_version} -%else -%global gecko_verrel %{expand:%%{version}} -%endif - -Summary: XUL Runtime for Gecko Applications -Name: xulrunner -Version: 45.9.0 -Release: 10%{?pre_tag}%{?dist} -URL: http://developer.mozilla.org/En/XULRunner -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Applications/Internet -Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}esr.source.tar.xz -Source10: %{name}-mozconfig -Source12: %{name}-redhat-default-prefs.js -Source21: %{name}.sh.in - -# build patches -Patch1: xulrunner-install-dir.patch -Patch3: mozilla-build-arm.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 -Patch18: xulrunner-24.0-jemalloc-ppc.patch -# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) -Patch19: xulrunner-24.0-s390-inlines.patch -Patch20: firefox-build-prbool.patch -Patch21: aarch64-fix-skia.patch -Patch24: rhbz-1219542-s390-build.patch -Patch25: firefox-gcc-6.0.patch -Patch26: build-stl-headers-fix-mbz1269171.patch - -# Fedora specific patches -Patch200: mozilla-193-pkgconfig.patch -# Unable to install addons from https pages -Patch204: rhbz-966424.patch - -# Upstream patches - -# --------------------------------------------------- - -%if %{?system_nss} -BuildRequires: nspr-devel >= %{nspr_version} -BuildRequires: nss-devel >= %{nss_version} -BuildRequires: nss-static >= %{nss_version} -%endif -%if %{?system_cairo} -BuildRequires: cairo-devel >= %{cairo_version} -%endif -BuildRequires: libpng-devel -BuildRequires: libjpeg-devel -BuildRequires: zip -BuildRequires: bzip2-devel -BuildRequires: zlib-devel -BuildRequires: libIDL-devel -BuildRequires: gtk2-devel -BuildRequires: krb5-devel -BuildRequires: pango-devel -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: libXt-devel -BuildRequires: libXrender-devel -BuildRequires: hunspell-devel -BuildRequires: startup-notification-devel -BuildRequires: alsa-lib-devel -BuildRequires: libnotify-devel >= %{libnotify_version} -BuildRequires: mesa-libGL-devel -BuildRequires: libcurl-devel -BuildRequires: libvpx-devel >= %{libvpx_version} -BuildRequires: autoconf213 -BuildRequires: pulseaudio-libs-devel -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: yasm -BuildRequires: dbus-glib-devel - -Requires: mozilla-filesystem -%if %{?system_nss} -Requires: nspr >= %{nspr_build_version} -Requires: nss >= %{nss_build_version} -%endif -Provides: gecko-libs = %{gecko_verrel} -Provides: gecko-libs%{?_isa} = %{gecko_verrel} -Conflicts: firefox < 3.6 - -%if %{?system_sqlite} -BuildRequires: sqlite-devel >= %{sqlite_version} -Requires: sqlite >= %{sqlite_build_version} -%endif - -%if %{?system_ffi} -BuildRequires: libffi-devel -%endif - -%description -XULRunner is a Mozilla runtime package that can be used to bootstrap XUL+XPCOM -applications that are as rich as Firefox and Thunderbird. It provides mechanisms -for installing, upgrading, and uninstalling these applications. XULRunner also -provides libxul, a solution which allows the embedding of Mozilla technologies -in other projects and products. - -%package devel -Summary: Development files for Gecko -Group: Development/Libraries -Obsoletes: mozilla-devel < 1.9 -Obsoletes: firefox-devel < 2.1 -Obsoletes: xulrunner-devel-unstable -Provides: gecko-devel = %{gecko_verrel} -Provides: gecko-devel%{?_isa} = %{gecko_verrel} -Provides: gecko-devel-unstable = %{gecko_verrel} -Provides: gecko-devel-unstable%{?_isa} = %{gecko_verrel} - -Requires: xulrunner = %{version}-%{release} -%if %{?system_nss} -Requires: nspr-devel >= %{nspr_build_version} -Requires: nss-devel >= %{nss_build_version} -%endif -%if %{?system_cairo} -Requires: cairo-devel >= %{cairo_version} -%endif -Requires: libjpeg-devel -Requires: zip -Requires: bzip2-devel -Requires: zlib-devel -Requires: libIDL-devel -Requires: gtk2-devel -Requires: krb5-devel -Requires: pango-devel -Requires: freetype-devel >= %{freetype_version} -Requires: libXt-devel -Requires: libXrender-devel -Requires: hunspell-devel -%if %{?system_sqlite} -Requires: sqlite-devel -%endif -Requires: startup-notification-devel -Requires: alsa-lib-devel -Requires: libnotify-devel -Requires: mesa-libGL-devel -Requires: libvpx-devel >= %{libvpx_version} - -%description devel -This package contains the libraries amd header files that are needed -for writing XUL+XPCOM applications with Mozilla XULRunner and Gecko. - -%if %{enable_mozilla_crashreporter} -%global moz_debug_prefix %{_prefix}/lib/debug -%global moz_debug_dir %{moz_debug_prefix}%{mozappdir} -%global uname_m %(uname -m) -%global symbols_file_name %{name}-%{version}.en-US.%{_os}-%{uname_m}.crashreporter-symbols.zip -%global symbols_file_path %{moz_debug_dir}/%{symbols_file_name} -%global _find_debuginfo_opts -p %{symbols_file_path} -o debugcrashreporter.list -%global crashreporter_pkg_name mozilla-crashreporter-%{name}-debuginfo -%package -n %{crashreporter_pkg_name} -Summary: Debugging symbols used by Mozilla's crash reporter servers -Group: Development/Debug -%description -n %{crashreporter_pkg_name} -This package provides debug information for XULRunner, for use by -Mozilla's crash reporter servers. If you are trying to locally -debug %{name}, you want to install %{name}-debuginfo instead. -%files -n %{crashreporter_pkg_name} -f debugcrashreporter.list -%defattr(-,root,root) -%endif - -#--------------------------------------------------------------------- - -%prep -%setup -q -c -cd %{tarballdir} - -%patch1 -p1 -#%patch3 -p2 -b .arm -%patch18 -p2 -b .jemalloc-ppc -%patch19 -p2 -b .s390-inlines -%patch20 -p1 -b .prbool -%patch21 -p1 -b .aarch64-fix-skia -%ifarch s390 -%patch24 -p1 -b .rhbz-1219542-s390 -%endif -%patch25 -p1 -b .gcc6 -%patch26 -p1 -b .1269171 - -%patch200 -p2 -b .pk -%patch204 -p2 -b .966424 - -%{__rm} -f .mozconfig -%{__cp} %{SOURCE10} .mozconfig - -%if %{?system_nss} -echo "ac_add_options --with-system-nspr" >> .mozconfig -echo "ac_add_options --with-system-nss" >> .mozconfig -%else -echo "ac_add_options --without-system-nspr" >> .mozconfig -echo "ac_add_options --without-system-nss" >> .mozconfig -%endif - -%if %{?system_sqlite} -echo "ac_add_options --enable-system-sqlite" >> .mozconfig -%else -echo "ac_add_options --disable-system-sqlite" >> .mozconfig -%endif - -%if %{?system_cairo} -echo "ac_add_options --enable-system-cairo" >> .mozconfig -%else -echo "ac_add_options --disable-system-cairo" >> .mozconfig -%endif - -%if %{?system_ffi} -echo "ac_add_options --enable-system-ffi" >> .mozconfig -%endif - - -%if %{?debug_build} -echo "ac_add_options --enable-debug" >> .mozconfig -echo "ac_add_options --disable-optimize" >> .mozconfig -%else -echo "ac_add_options --disable-debug" >> .mozconfig -%ifarch ppc64le aarch64 -echo 'ac_add_options --enable-optimize="-g -O2"' >> .mozconfig -%else -echo "ac_add_options --enable-optimize" >> .mozconfig -%endif -%endif - -# s390(x) fails to start with jemalloc enabled -%ifarch s390 s390x -echo "ac_add_options --disable-jemalloc" >> .mozconfig -%endif - -%ifarch armv7hl -echo "ac_add_options --with-arch=armv7-a" >> .mozconfig -echo "ac_add_options --with-float-abi=hard" >> .mozconfig -echo "ac_add_options --with-fpu=vfpv3-d16" >> .mozconfig -echo "ac_add_options --disable-elf-hack" >> .mozconfig -%endif -%ifarch armv7hnl -echo "ac_add_options --with-arch=armv7-a" >> .mozconfig -echo "ac_add_options --with-float-abi=hard" >> .mozconfig -echo "ac_add_options --with-fpu=neon" >> .mozconfig -echo "ac_add_options --disable-elf-hack" >> .mozconfig -%endif -%ifarch armv5tel -echo "ac_add_options --with-arch=armv5te" >> .mozconfig -echo "ac_add_options --with-float-abi=soft" >> .mozconfig -echo "ac_add_options --disable-elf-hack" >> .mozconfig -echo "ac_add_options --disable-ion" >> .mozconfig -echo "ac_add_options --disable-yarr-jit" >> .mozconfig -%endif - -#Workarounf for mozbz#1245783 -%if 0%{?fedora} > 23 -echo "ac_add_options --disable-ion" >> .mozconfig -%endif - -%ifnarch %{ix86} x86_64 -echo "ac_add_options --disable-webrtc" >> .mozconfig -%endif - -#--------------------------------------------------------------------- - -%build -%if %{?system_sqlite} -# Do not proceed with build if the sqlite require would be broken: -# make sure the minimum requirement is non-empty, ... -sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1 -# ... and that major number of the computed build-time version matches: -case "%{sqlite_build_version}" in - "$sqlite_version"*) ;; - *) exit 1 ;; -esac -%endif - -cd %{tarballdir} - -# Update the various config.guess to upstream release for aarch64 support -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 "$RPM_OPT_FLAGS" | %{__sed} -e 's/-Wall//') -%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 -%ifarch s390 %{arm} ppc aarch64 -MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" -%endif - -#rhbz#1037063 -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security" - -export CFLAGS="$MOZ_OPT_FLAGS" -export CXXFLAGS="$MOZ_OPT_FLAGS -fpermissive" -export LDFLAGS=$MOZ_LINK_FLAGS - -export PREFIX='%{_prefix}' -export LIBDIR='%{_libdir}' - -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 %{arm} -[ -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 -%endif - -make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1" - -# create debuginfo for crash-stats.mozilla.com -%if %{enable_mozilla_crashreporter} -#cd %{moz_objdir} -make -C objdir buildsymbols -%endif - -#--------------------------------------------------------------------- - -%install -cd %{tarballdir} - -# set up our prefs before install, so it gets pulled in to omni.jar -%{__cp} -p %{SOURCE12} objdir/dist/bin/defaults/pref/all-redhat.js - -DESTDIR=$RPM_BUILD_ROOT make -C objdir install - -# Start script install -%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__cat} %{SOURCE21} | %{__sed} -e 's,XULRUNNER_VERSION,%{gecko_dir_ver},g' > \ - $RPM_BUILD_ROOT%{_bindir}/%{name} -%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} - -%{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/%{name}-config - -# install install_app.py -%{__cp} objdir/dist/bin/install_app.py $RPM_BUILD_ROOT%{mozappdir} - -# Copy pc files (for compatibility with 1.9.1) -%{__cp} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libxul.pc \ - $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libxul-unstable.pc -%{__cp} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libxul-embedding.pc \ - $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libxul-embedding-unstable.pc - -# Fix multilib devel conflicts... -function install_file() { -genheader=$* -mv ${genheader}.h ${genheader}%{__isa_bits}.h -cat > ${genheader}.h << EOF -/* This file exists to fix multilib conflicts */ -#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__aarch64__) -#include "${genheader}64.h" -#else -#include "${genheader}32.h" -#endif -EOF -} - -INTERNAL_APP_NAME=%{name}-%{gecko_dir_ver} - -pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME} -install_file "mozilla-config" -install_file "js-config" -popd - -# Link libraries in sdk directory instead of copying them: -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/lib -for i in *.so; do - rm $i - ln -s %{mozappdir}/$i $i -done -popd - -# Move sdk/bin to xulrunner libdir -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/bin -mv ply *.py $RPM_BUILD_ROOT%{mozappdir} -popd -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/bin - -# Library path -LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d -LD_CONF_FILE=xulrunner-%{__isa_bits}.conf - -%{__mkdir_p} ${RPM_BUILD_ROOT}${LD_SO_CONF_D} -%{__cat} > ${RPM_BUILD_ROOT}${LD_SO_CONF_D}/${LD_CONF_FILE} << EOF -%{mozappdir} -EOF - -# Copy over the LICENSE -%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir} - -# Install xpcshell -%{__cp} objdir/dist/bin/xpcshell $RPM_BUILD_ROOT/%{mozappdir} - -# Install run-mozilla.sh -%{__cp} objdir/dist/bin/run-mozilla.sh $RPM_BUILD_ROOT/%{mozappdir} - -# Use the system hunspell dictionaries -%{__rm} -rf ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries -ln -s %{_datadir}/myspell ${RPM_BUILD_ROOT}%{mozappdir}/dictionaries - -# Remove tmp files -find $RPM_BUILD_ROOT/%{mozappdir} -name '.mkdir.done' -exec rm -rf {} \; - -# 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 - -# Add debuginfo for crash-stats.mozilla.com -%if %{enable_mozilla_crashreporter} -%{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir} -%{__cp} objdir/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir} -%endif - -#--------------------------------------------------------------------- - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%preun -# is it a final removal? -if [ $1 -eq 0 ]; then - %{__rm} -rf %{mozappdir}/components -fi - -%files -%defattr(-,root,root,-) -%{_bindir}/xulrunner -%dir %{mozappdir} -%doc %attr(644, root, root) %{mozappdir}/LICENSE -%doc %attr(644, root, root) %{mozappdir}/README.xulrunner -%{mozappdir}/chrome -%{mozappdir}/dictionaries -%dir %{mozappdir}/components -%ghost %{mozappdir}/components/compreg.dat -%ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/omni.ja -%{mozappdir}/*.so -%ifarch %{ix86} x86_64 -%{mozappdir}/rapl -%endif -%{mozappdir}/run-mozilla.sh -%{mozappdir}/xulrunner -%{mozappdir}/xulrunner-stub -%{mozappdir}/platform.ini -%{mozappdir}/dependentlibs.list -%{_sysconfdir}/ld.so.conf.d/xulrunner*.conf -%{mozappdir}/plugin-container -%{mozappdir}/gmp-clearkey -%if !%{?system_nss} -%{mozappdir}/*.chk -%endif -%if %{enable_mozilla_crashreporter} -%{mozappdir}/crashreporter -%{mozappdir}/crashreporter.ini -%{mozappdir}/Throbber-small.gif -%endif -%{mozappdir}/install_app.py -%ghost %{mozappdir}/install_app.pyc -%ghost %{mozappdir}/install_app.pyo -%{mozappdir}/gmp-fake*/* - -%files devel -%defattr(-,root,root,-) -%dir %{_libdir}/%{name}-devel-* -%{_datadir}/idl/%{name}*%{gecko_dir_ver} -%{_includedir}/%{name}*%{gecko_dir_ver} -%{_libdir}/%{name}-devel-*/* -%{_libdir}/pkgconfig/*.pc -%{mozappdir}/xpcshell -%{mozappdir}/*.py -%ghost %{mozappdir}/*.pyc -%ghost %{mozappdir}/*.pyo -%dir %{mozappdir}/ply -%{mozappdir}/ply/*.py -%ghost %{mozappdir}/ply/*.pyc -%ghost %{mozappdir}/ply/*.pyo - -#--------------------------------------------------------------------- - -%changelog -* Wed Jun 14 2017 Jan Horak - 45.9.0-1 -- Update to 45.9.0 (esr) sources - -* Sat Feb 11 2017 Fedora Release Engineering - 44.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 20 2017 Martin Stransky - 44.0-9 -- Added fix for new nss 3.28.1 (mozbz#1290037) - -* Thu Dec 15 2016 Martin Stransky - 44.0-8 -- Rebuilt - -* Fri Jul 22 2016 Tom Callaway - 44.0-7 -- rebuild for libvpx 1.6.0 - -* Wed Apr 27 2016 Peter Robinson 44.0-6 -- Added fix for rhbz#1315225 - ppc64le/aarch64 build fixes - -* Wed Mar 02 2016 Marcin Juszkiewicz - 44.0-5 -- Fix WebRTC on AArch64 again. - -* Mon Feb 15 2016 Martin Stransky - 44.0-4 -- gcc 6 build fix - -* Fri Feb 05 2016 Fedora Release Engineering - 44.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 Martin Stransky - 44.0-1 -- Update to 44.0 - -* Tue Dec 1 2015 Tom Callaway - 42.0-2 -- rebuild for libvpx 1.5.0 - -* Tue Dec 1 2015 Martin Stransky - 42.0-1 -- Update to 42.0 - -* Wed Sep 2 2015 Martin Stransky - 40.0-2 -- Disable Skia to build on second arches - -* Tue Aug 25 2015 Petr Jasicek - 40.0-1 -- Update to 40.0 - -* Wed Jul 22 2015 Petr Jasicek - 39.0-3 -- Removed unneeded patch files - -* Tue Jul 14 2015 Marcin Juszkiewicz - 39.0-2 -- fixed build - - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available - - refreshed mozilla-1005535.patch patch to apply - -* Fri Jul 10 2015 Martin Stransky - 39.0-1 -- Update to 39.0 - -* Fri Jun 19 2015 Fedora Release Engineering - 38.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 7 2015 Martin Stransky - 38.0-1 -- Update to 38.0 Build 2 - -* Mon Apr 27 2015 Jan Horak - 37.0.2-2 -- Added patch for big endian arches - -* Thu Apr 16 2015 Jan Horak - 37.0.2-1 -- Update to 37.0.2 - -* Wed Apr 15 2015 Martin Stransky - 37.0.1-1 -- Update to 37.0.1 - -* Mon Apr 6 2015 Tom Callaway - 33.0-3 -- rebuild for libvpx 1.4.0 - -* Wed Oct 22 2014 Dan Horák - 33.0-2 -- Fix filelist for secondary arches - -* Thu Oct 16 2014 Martin Stransky - 33.0-1 -- Update to 33.0 - -* Sat Sep 20 2014 Peter Robinson 32.0.2-1 -- Update to 32.0.2 -- sync fixes to the same as firefox - -* Tue Sep 9 2014 Martin Stransky - 32.0-2 -- move /sdk/bin to xulrunner libdir - -* Tue Aug 26 2014 Martin Stransky - 32.0-1 -- Update to 32.0 build 1 - -* Mon Aug 18 2014 Fedora Release Engineering - 31.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jul 25 2014 Martin Stransky - 31.0-1 -- Update to 31.0 build 2 - -* Fri Jul 25 2014 Yaakov Selkowitz - 30.0-3 -- Fix mozilla-config.h wrapper on aarch64 - -* Sun Jun 08 2014 Fedora Release Engineering - 30.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Martin Stransky - 30.0-1 -- Update to 30.0 build 1 -- Disabled shared js - -* Fri May 23 2014 Martin Stransky - 29.0-5 -- Added a build fix for ppc64 - rhbz#1100495 - -* Thu May 15 2014 Peter Robinson 29.0-4 -- Update aarch64 bits - -* Thu May 15 2014 Peter Robinson 29.0-3 -- Add upstream patches for aarch64 support - -* Mon Apr 28 2014 Martin Stransky - 29.0-2 -- An updated ppc64le patch (rhbz#1091054) - -* Mon Apr 28 2014 Martin Stransky - 29.0-1 -- Update to 29.0 - -* Tue Mar 18 2014 Martin Stransky - 28.0-1 -- Update to 28.0 -- Fixed arm patch - -* Mon Feb 3 2014 Martin Stransky - 27.0-1 -- Update to 27.0 - -* Fri Dec 13 2013 Martin Stransky - 26.0-2 -- rhbz#1037406 - xulrunner FTBFS if "-Werror=format-security" - flag is used - -* Mon Dec 9 2013 Martin Stransky - 26.0-1 -- Update to 26.0 Build 2 - -* Thu Nov 21 2013 Martin Stransky - 25.0-5 -- Fixed rhbz#1007603 - NSS and cert9 (sql): firefox crash on exit - with https-everywhere installed - -* Tue Nov 12 2013 Martin Stransky - 25.0-4 -- rhbz#1010916 - enabled pluseaudio backend - -* Fri Nov 8 2013 Martin Stransky - 25.0-3 -- Fixed rhbz#974718 - Segfault in FileBlockCache::Run - when playing a movie on ppc - -* Wed Oct 30 2013 Martin Stransky - 25.0-2 -- Update to 25.0 Build 3 - -* Wed Oct 23 2013 Martin Stransky - 25.0-1 -- Update to 25.0 Build 2 - -* Tue Oct 15 2013 Karsten Hopp 24.0-3 -- drop PPC-only rhbz-911314.patch, fixed upstream - -* Mon Sep 16 2013 Martin Stransky - 24.0.1-2 -- Arm build fix - -* Fri Sep 13 2013 Martin Stransky - 24.0.1-1 -- Update to 24.0 - -* Mon Sep 2 2013 Dan Horák - 23.0.1-4 -- Fix build on 64-bit big endian platforms (mozbz#618485) - -* Sat Aug 31 2013 Karsten Hopp 23.0.1-3 -- update rhbz-911314.patch (PPC* only) - -* Thu Aug 29 2013 Martin Stransky - 23.0.1-2 -- Enabled dtrace for debug builds - -* Mon Aug 19 2013 Jan Horak - 23.0.1-1 -- Update to 23.0.1 - -* Mon Aug 5 2013 Martin Stransky - 23.0-2 -- Update to latest upstream (23.0 Build 2) - -* Mon Aug 5 2013 Martin Stransky - 23.0-1 -- Update to latest upstream (23.0) - -* Mon Jul 29 2013 Jan Horak - 22.0-7 -- Use system libffi for Fedora 19+ -- Added fix for mozbz#860213 - -* Thu Jul 25 2013 Martin Stransky - 22.0-6 -- Removed already applied patches (rhbz#978123) - -* Wed Jul 24 2013 Peter Robinson 22.0-5 -- Enable web-rtc on ARM now it's fixed upstream (RHBZ 886976) - -* Mon Jul 1 2013 Jan Horak - 22.0-4 -- Added fix from mozbz#817533 - fix issues with proxy settings -- Fixed missing about:healthreport - -* Mon Jun 24 2013 Martin Stransky - 22.0-2 -- Rebuild - -* Fri Jun 21 2013 Martin Stransky - 22.0-1 -- Update to latest upstream (22.0) - -* Wed Jun 12 2013 Jan Horak - 21.0-8 -- Fixed rhbz#966424 - unable to install addons - -* Mon Jun 3 2013 Jan Horak - 21.0-7 -- Using upstream build flags for crashreporter - -* Wed May 29 2013 Martin Stransky - 21.0-6 -- Removed the i686/f19 gcc hack (rhbz#928353) - -* Tue May 21 2013 Martin Stransky - 21.0-5 -- Added ppc(64) patches (rhbz#963907) - -* Tue May 21 2013 Martin Stransky - 21.0-4 -- Added s390(x) patch - -* Mon May 13 2013 Martin Stransky - 21.0-3 -- New upstream tarball (build 4) - -* Mon May 13 2013 Martin Stransky - 21.0-2 -- Updated requested NSS/NSPR versions - -* Sun May 12 2013 Martin Stransky - 21.0-1 -- Update to latest upstream (21.0) - -* Fri Apr 5 2013 Martin Stransky - 20.0-4 -- Updated rhbz-911314.patch for xulrunner 20 - -* Wed Apr 3 2013 Martin Stransky - 20.0-3 -- A workaround for Bug 928353 - firefox i686 crashes - for a number of web pages - -* Tue Mar 19 2013 Martin Stransky - 20.0-1 -- Update to latest upstream (20.0) - -* Tue Mar 19 2013 Martin Stransky - 19.0.2-4 -- Added fix for rhbz#913284 - Firefox segfaults - in mozilla::gfx::AlphaBoxBlur::BoxBlur_C() on PPC64 - -* Tue Mar 19 2013 Martin Stransky - 19.0.2-3 -- Added fix for mozbz#826171/rhbz#922904 - strndup implementation - in memory/build/mozmemory_wrap.c is broken - -* Mon Mar 11 2013 Martin Stransky - 19.0.2-2 -- Update to 19.0.2 - -* Wed Feb 20 2013 Martin Stransky - 19.0-2 -- Added fix for rhbz#911314 (ppc only) - -* Mon Feb 18 2013 Martin Stransky - 19.0-1 -- Update to 19.0 -- Added fix for mozbz#239254 - -* Wed Feb 6 2013 Jan Horak - 18.0.2-1 -- Update to 18.0.2 - -* Fri Jan 25 2013 Jan Horak - 18.0.1-1 -- Update to 18.0.1 - -* Tue Jan 15 2013 Martin Stransky - 18.0-8 -- Added fix for NM regression (mozbz#791626) - -* Thu Jan 10 2013 Martin Stransky - 18.0-7 -- Fixed Makefile generator (rhbz#304121) - -* Wed Jan 9 2013 Martin Stransky - 18.0-6 -- Fixed missing libxpcom.so provides - -* Wed Jan 9 2013 Martin Stransky - 18.0-5 -- Added fix for langpacks - -* Wed Jan 9 2013 Martin Stransky - 18.0-4 -- Fixed source files -- Disabled WebRTC due to rhbz#304121 - -* Wed Jan 9 2013 Martin Stransky - 18.0-2 -- Disabled system sqlite on Fedora 18 - -* Mon Jan 7 2013 Martin Stransky - 18.0-1 -- Update to 18.0 - -* Thu Dec 13 2012 Peter Robinson 17.0.1-3 -- Disable webrtc on ARM as it currently tries to build SSE on ARM (fix FTBFS) -- Enable methodjit/tracejit on ARMv7 for more speed :) Fixes RHBZ 870548 - -* Fri Dec 7 2012 Jan Horak - 17.0.1-2 -- Fixed rhbz#879595 - -* Thu Nov 29 2012 Jan Horak - 17.0.1-1 -- Update to 17.0.1 - -* Tue Nov 27 2012 Jan Horak - 17.0-4 -- Rebuild agains older NSS - -* Mon Nov 19 2012 Martin Stransky - 17.0-3 -- Updated second arch patches - -* Mon Nov 19 2012 Dan Horák - 17.0-2 -- webrtc is available only on selected arches - -* Mon Nov 19 2012 Martin Stransky - 17.0-1 -- Update to 17.0 - -* Wed Nov 14 2012 Martin Stransky - 17.0-0.2b6 -- Update to 17.0 Beta 6 - -* Tue Nov 13 2012 Martin Stransky - 17.0-0.1b5 -- Update to 17.0 Beta 5 - -* Tue Nov 6 2012 Martin Stransky - 16.0.2-2 -- Added fix for rhbz#872752 - -* Wed Oct 31 2012 Martin Stransky - 16.0.2-1 -- Updated mozilla-746112.patch for second arches -- Removed unused one (rhbz#855919) - -* Fri Oct 26 2012 Jan Horak - 16.0.2-1 -- Update to 16.0.2 - -* Tue Oct 16 2012 Jan Horak - 16.0.1-2 -- Fixed required nss and nspr version - -* Thu Oct 11 2012 Martin Stransky - 16.0.1-1 -- Update to 16.0.1 -