Merge branch 'master' into f24

This commit is contained in:
Martin Stransky 2016-07-26 15:56:34 +02:00
commit c92514bf32
3 changed files with 27 additions and 4 deletions

View File

@ -3,6 +3,7 @@
ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --prefix="$PREFIX" ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
ac_add_options --with-system-bz2 ac_add_options --with-system-bz2
ac_add_options --enable-system-hunspell ac_add_options --enable-system-hunspell

View File

@ -109,6 +109,7 @@ Patch20: firefox-build-prbool.patch
Patch21: firefox-ppc64le.patch Patch21: firefox-ppc64le.patch
Patch24: firefox-debug.patch Patch24: firefox-debug.patch
Patch25: rhbz-1219542-s390-build.patch Patch25: rhbz-1219542-s390-build.patch
Patch26: mozilla-1282843.patch
# Fedora specific patches # Fedora specific patches
# Unable to install addons from https pages # Unable to install addons from https pages
@ -247,6 +248,7 @@ cd %{tarballdir}
%ifarch s390 %ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390 %patch25 -p1 -b .rhbz-1219542-s390
%endif %endif
%patch26 -p1 -b .mzbz#1282843
%patch3 -p1 -b .arm %patch3 -p1 -b .arm
@ -741,10 +743,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/32x32/apps/firefox.png %{_datadir}/icons/hicolor/32x32/apps/firefox.png
%{_datadir}/icons/hicolor/48x48/apps/firefox.png %{_datadir}/icons/hicolor/48x48/apps/firefox.png
%{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/firefox-symbolic.svg
%{mozappdir}/webapprt-stub
%dir %{mozappdir}/webapprt
%{mozappdir}/webapprt/omni.ja
%{mozappdir}/webapprt/webapprt.ini
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
%{mozappdir}/crashreporter %{mozappdir}/crashreporter
%{mozappdir}/crashreporter.ini %{mozappdir}/crashreporter.ini

24
mozilla-1282843.patch Normal file
View File

@ -0,0 +1,24 @@
Add ability to specify system paths to @old_configure_options
--- a/build/moz.configure/old.configure 2016-07-04 12:03:37.503301144 -0400
+++ b/build/moz.configure/old.configure 2016-07-04 12:04:33.443147224 -0400
@@ -149,16 +149,19 @@
def all_options(help):
return list(options)
return depends(prepare_configure, extra_old_configure_args, all_options,
*options)
@old_configure_options(
+ '--libdir',
+ '--includedir',
+ '--datadir',
'--cache-file',
'--enable-accessibility',
'--enable-address-sanitizer',
'--enable-alsa',
'--enable-android-omx',
'--enable-android-resource-constrained',
'--enable-approximate-location',
'--enable-b2g-bt',