diff --git a/.gitignore b/.gitignore index 7e375cc..800e340 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/firefox-31.2.0esr.source.tar.bz2 +SOURCES/firefox-31.4.0esr.source.tar.bz2 diff --git a/.xulrunner.metadata b/.xulrunner.metadata index 8060bc1..8dc1ade 100644 --- a/.xulrunner.metadata +++ b/.xulrunner.metadata @@ -1 +1 @@ -ca54163c670d9868609254e94bba19d90ac1cf9a SOURCES/firefox-31.2.0esr.source.tar.bz2 +32502debd0a207bb918ccf169757607ecb32b5e0 SOURCES/firefox-31.4.0esr.source.tar.bz2 diff --git a/SOURCES/webrtc-arch-cpu.patch b/SOURCES/webrtc-arch-cpu.patch new file mode 100644 index 0000000..29fd578 --- /dev/null +++ b/SOURCES/webrtc-arch-cpu.patch @@ -0,0 +1,22 @@ +--- a/media/webrtc/trunk/build/build_config.h ++++ b/media/webrtc/trunk/build/build_config.h +@@ -123,7 +123,9 @@ + #define ARCH_CPU_PPC_FAMILY 1 + #define ARCH_CPU_PPC64 1 + #define ARCH_CPU_64_BITS 1 ++#ifndef _LITTLE_ENDIAN + #define ARCH_CPU_BIG_ENDIAN 1 ++#endif + #elif defined(__ppc__) || defined(__powerpc__) + #define ARCH_CPU_PPC_FAMILY 1 + #define ARCH_CPU_PPC 1 +@@ -156,6 +158,9 @@ + #elif defined(__alpha__) + #define ARCH_CPU_ALPHA 1 + #define ARCH_CPU_64_BITS 1 ++#elif defined(__aarch64__) ++#define ARCH_CPU_AARCH64 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif diff --git a/SOURCES/xulrunner-centos-default-prefs.js b/SOURCES/xulrunner-centos-default-prefs.js deleted file mode 100644 index e470e95..0000000 --- a/SOURCES/xulrunner-centos-default-prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("browser.link.open_external", 3); -pref("general.smoothScroll", true); -pref("general.useragent.vendor","CentOS"); -pref("general.useragent.vendorSub", "RPM_VERREL"); -pref("intl.locale.matchOS", true); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("toolkit.storage.synchronous", 0); -pref("browser.startup.homepage", "http://www.centos.org"); -pref("startup.homepage_override_url", "http://www.centos.org"); -pref("startup.homepage_welcome_url", "http://www.centos.org"); diff --git a/SPECS/xulrunner.spec b/SPECS/xulrunner.spec index 956b098..34b2962 100644 --- a/SPECS/xulrunner.spec +++ b/SPECS/xulrunner.spec @@ -5,11 +5,7 @@ # Use system nss/nspr? %define system_nss 1 -%ifarch %{ix86} x86_64 ppc ppc64 %define enable_webm 1 -%else -%define enable_webm 0 -%endif # Build as a debug package? %define debug_build 0 @@ -20,7 +16,7 @@ # Minimal required versions %if %{?system_nss} %global nspr_version 4.10.6 -%global nss_version 3.16.2 +%global nss_version 3.16.2.3 %endif %define cairo_version 1.6.0 @@ -45,14 +41,14 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 31.2.0 +Version: 31.4.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/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{ext_version}%{?pre_version}.source.tar.bz2 Source10: %{name}-mozconfig -Source12: xulrunner-centos-default-prefs.js +Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in Source23: %{name}.1 Source100: find-external-requires @@ -61,6 +57,7 @@ Source100: find-external-requires # Build patches Patch0: xulrunner-nspr-version.patch Patch2: firefox-install-dir.patch +Patch6: webrtc-arch-cpu.patch Patch20: xulrunner-24.0-jemalloc-ppc.patch Patch21: disable-webm.patch Patch22: remove-ogg.patch @@ -196,6 +193,7 @@ sed -e 's/__RH_NSPR_VERSION__/%{nspr_version}/' %{P:%%PATCH0} > version.patch %{__patch} -p2 -b --suffix .nspr --fuzz=0 < version.patch %patch2 -p1 +%patch6 -p1 -b .webrtc-arch-cpu %patch20 -p2 -b .jemalloc-ppc %if !%{?enable_webm} %patch21 -p1 -b .disable-webm @@ -247,11 +245,6 @@ echo "ac_add_options --enable-libnotify" >> .mozconfig echo "ac_add_options --enable-startup-notification" >> .mozconfig echo "ac_add_options --enable-jemalloc" >> .mozconfig -# s390(x) fails to start with jemalloc enabled -%ifarch s390 s390x -echo "ac_add_options --disable-jemalloc" >> .mozconfig -%endif - # Debug build flags %if %{?debug_build} echo "ac_add_options --enable-debug" >> .mozconfig @@ -377,6 +370,7 @@ 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 +ln -s %{mozappdir} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{gecko_dir_ver}/sdk/bin # Library path LD_SO_CONF_D=%{_sysconfdir}/ld.so.conf.d @@ -470,8 +464,17 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Oct 14 2014 CentOS Sources - 31.2.0-1.el7.centos -- Change default prefs to CentOS +* Tue Jan 6 2015 Jan Horak - 31.4.0-1 +- Update to 31.4.0 ESR + +* Fri Dec 5 2014 Martin Stransky - 31.3.0-1 +- Update to 31.3.0 ESR Build 2 + +* Mon Nov 10 2014 Martin Stransky - 31.2.0-3 +- Ship sdk/bin as a symlink for compability (rhbz#1162187) + +* Mon Oct 27 2014 Yaakov Selkowitz - 31.2.0-2 +- Fix webRTC for aarch64, ppc64le (rhbz#1148622) * Tue Oct 7 2014 Jan Horak - 31.2.0-1 - Update to 31.2.0 @@ -676,6 +679,3 @@ fi * Mon Sep 19 2011 Jan Horak - 7.0-6.b6 - Updated to 7.0 Beta 6 - Added fix for mozbz#674522: s390x javascript freeze fix - -* Wed Sep 14 2011 Martin Stransky 7.0-2.b5 -- Updated to 7.0 Beta 5