The package rpms/xulrunner.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xulrunner.git/commit/?id=51d1320c....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit 51d1320c3cbcce9780a3d1c69b0d8a73abdefbb9
Author: Jan Horak <jhorak(a)redhat.com>
Date: Mon Jun 19 11:30:33 2017 +0200
Resolves: #480989 Excluing aarch64 because we're unable to build such old sources
on this architecture. -p
diff --git a/xulrunner.spec b/xulrunner.spec
index ebb1e37..e7a3d67 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: 1%{?pre_tag}%{?dist}
URL:
http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -207,6 +207,8 @@ Requires: libnotify-devel
Requires: mesa-libGL-devel
Requires: libvpx-devel >= %{libvpx_version}
+ExcludeArch: aarch64
+
%description devel
This package contains the libraries amd header files that are needed
for writing XUL+XPCOM applications with Mozilla XULRunner and Gecko.
commit 721e87200e850a0dd283cf05ce1769c5c0a8a6d8
Author: Jan Horak <jhorak(a)redhat.com>
Date: Wed Jun 14 14:03:16 2017 +0200
Fixed typo in release
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
commit be3317bc531ae5359e5d7a5960e34a234d76fec7
Author: Jan Horak <jhorak(a)redhat.com>
Date: Wed Jun 14 12:51:30 2017 +0200
Update to Firefox 45.9.0 esr source tarball
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 <m_kato(a)ga2.so-net.ne.jp>
-# 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 <franziskuskiefer(a)gmail.com>
-# 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 <daniel(a)haxx.se>
-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_versio...
+Source0:
ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_versio...
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 <jhorak(a)redhat.com> - 45.9.0-1
+- Update to 45.9.0 (esr) sources
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 44.0-10
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild